Merge pull request #222 from colymba/pulls/master/php81

ENH PHP 8.1 compatibility
colymba · Apr 26, 2022 · ece0e20 · ece0e20
2 parents c34bba4 + 81f34cd
commit ece0e20
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/src/BulkManager/BulkAction/ArchiveHandler.php b/src/BulkManager/BulkAction/ArchiveHandler.php
@@ -111,8 +111,8 @@ public function archive(HTTPRequest $request)
                 }
             }
 
-            $doneCount = count($response->getSuccessRecords());
-            $failCount = count($response->getFailedRecords());
+            $doneCount = count($response->getSuccessRecords() ?? []);
+            $failCount = count($response->getFailedRecords() ?? []);
             $message = sprintf(
                 'Archived %1$d of %2$d records.',
                 $doneCount,

diff --git a/src/BulkManager/BulkAction/DeleteHandler.php b/src/BulkManager/BulkAction/DeleteHandler.php
@@ -104,7 +104,7 @@ public function delete(HTTPRequest $request)
                 $record->delete();
             }
 
-            $doneCount = count($response->getSuccessRecords());
+            $doneCount = count($response->getSuccessRecords() ?? []);
             $message = sprintf(
                 'Deleted %1$d records.',
                 $doneCount

diff --git a/src/BulkManager/BulkAction/EditHandler.php b/src/BulkManager/BulkAction/EditHandler.php
@@ -148,7 +148,7 @@ public function bulkEditForm()
         $recordsFieldList = new FieldList();
         $config = $this->component->getConfig();
 
-        $editingCount = count($recordList);
+        $editingCount = count($recordList ?? []);
         $modelClass = $this->gridField->getModelClass();
         $singleton = singleton($modelClass);
         $titleModelClass = (($editingCount > 1) ? $singleton->i18n_plural_name() : $singleton->i18n_singular_name());
@@ -341,7 +341,7 @@ protected function escapeFieldName($recordID, $name)
     protected function unEscapeFieldName($fieldName)
     {
         $parts = array();
-        $match = preg_match('/record_(\d+)_(\w+)/i', $fieldName, $parts);
+        $match = preg_match('/record_(\d+)_(\w+)/i', $fieldName ?? '', $parts);
 
         if (!$match) {
             return false;

diff --git a/src/BulkManager/BulkAction/PublishHandler.php b/src/BulkManager/BulkAction/PublishHandler.php
@@ -111,8 +111,8 @@ public function publish(HTTPRequest $request)
                 }
             }
 
-            $doneCount = count($response->getSuccessRecords());
-            $failCount = count($response->getFailedRecords());
+            $doneCount = count($response->getSuccessRecords() ?? []);
+            $failCount = count($response->getFailedRecords() ?? []);
             $message = sprintf(
                 'Published %1$d of %2$d records.',
                 $doneCount,

diff --git a/src/BulkManager/BulkAction/UnPublishHandler.php b/src/BulkManager/BulkAction/UnPublishHandler.php
@@ -111,8 +111,8 @@ public function unPublish(HTTPRequest $request)
                 }
             }
 
-            $doneCount = count($response->getSuccessRecords());
-            $failCount = count($response->getFailedRecords());
+            $doneCount = count($response->getSuccessRecords() ?? []);
+            $failCount = count($response->getFailedRecords() ?? []);
             $message = sprintf(
                 'UnPublished %1$d of %2$d records.',
                 $doneCount,

diff --git a/src/BulkManager/BulkManager.php b/src/BulkManager/BulkManager.php
@@ -79,7 +79,7 @@ public function __construct($editableFields = null, $defaultActions = true, $def
      */
     public function setConfig($reference, $value)
     {
-        if (!array_key_exists($reference, $this->config)) {
+        if (!array_key_exists($reference, $this->config ?? [])) {
             user_error("Unknown option reference: $reference", E_USER_ERROR);
         }
 
@@ -123,7 +123,7 @@ public function getConfig($reference = false)
      */
     public function addBulkAction($handlerClassName, $action = null)
     {
-        if (!class_exists($handlerClassName)) {
+        if (!class_exists($handlerClassName ?? '')) {
             user_error("Bulk action handler not found: $handlerClassName", E_USER_ERROR);
         }
 
@@ -188,7 +188,7 @@ public function getBulkActions()
      */
     public function augmentColumns($gridField, &$columns)
     {
-        if (!in_array('BulkSelect', $columns)) {
+        if (!in_array('BulkSelect', $columns ?? [])) {
             $columns[] = 'BulkSelect';
         }
     }
@@ -267,7 +267,7 @@ public function getHTMLFragments($gridField)
         Requirements::css('colymba/gridfield-bulk-editing-tools:client/dist/styles/main.css');
         Requirements::add_i18n_javascript('colymba/gridfield-bulk-editing-tools:client/lang');
 
-        if (!count($this->config['actions'])) {
+        if (!count($this->config['actions'] ?? [])) {
             user_error('Trying to use BulkManager without any bulk action.', E_USER_ERROR);
         }
 
@@ -302,7 +302,7 @@ public function getHTMLFragments($gridField)
             'Select' => array(
                 'Label' => _t('GRIDFIELD_BULK_MANAGER.SELECT_ALL_LABEL', 'Select all'),
             ),
-            'Colspan' => (count($gridField->getColumns()) - 1),
+            'Colspan' => (count($gridField->getColumns() ?? []) - 1),
         );
 
         $templateData = new ArrayData($templateData);

diff --git a/src/BulkTools/HTTPBulkToolsResponse.php b/src/BulkTools/HTTPBulkToolsResponse.php
@@ -344,7 +344,7 @@ public function createBody()
             $body['records']['failed'] = $this->failedRecords;
         }
 
-        if (isset($body['records']['success']) && count($body['records']['success']) === 0) {
+        if (isset($body['records']['success']) && count($body['records']['success'] ?? []) === 0) {
             $body['isWarning'] = true;
         }
 

diff --git a/src/BulkUploader/BulkUploadHandler.php b/src/BulkUploader/BulkUploadHandler.php
@@ -121,7 +121,7 @@ public function upload(HTTPRequest $request)
             $bulkToolsResponse = new HTTPBulkToolsResponse(false, $this->gridField);
             $bulkToolsResponse->addSuccessRecord($record);
 
-            $responseData['bulkTools'] = json_decode($bulkToolsResponse->getBody());
+            $responseData['bulkTools'] = json_decode($bulkToolsResponse->getBody() ?? '');
             $uploadResponse->setBody(json_encode(array($responseData)));
         }
 

diff --git a/src/BulkUploader/BulkUploader.php b/src/BulkUploader/BulkUploader.php
@@ -86,7 +86,7 @@ public function __construct($fileRelationName = null, $recordClassName = null, $
      */
     public function setConfig($reference, $value)
     {
-        if (!array_key_exists($reference, $this->config)) {
+        if (!array_key_exists($reference, $this->config ?? [])) {
             user_error("Unknown option reference: $reference", E_USER_ERROR);
         }
 
@@ -291,7 +291,7 @@ public function getHTMLFragments($gridField)
         $uploadField = $this->bulkUploadField($gridField);
 
         $data = ArrayData::create(array(
-            'Colspan' => (count($gridField->getColumns())),
+            'Colspan' => (count($gridField->getColumns() ?? [])),
             'UploadField' => $uploadField->Field() // call ->Field() to get requirements in right order
         ));