From 81f34cdd7b58cac9e708fee5925f60e3f2ae031e Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 13 Apr 2022 14:08:15 +1200 Subject: [PATCH] ENH PHP 8.1 compatibility --- src/BulkManager/BulkAction/ArchiveHandler.php | 4 ++-- src/BulkManager/BulkAction/DeleteHandler.php | 2 +- src/BulkManager/BulkAction/EditHandler.php | 4 ++-- src/BulkManager/BulkAction/PublishHandler.php | 4 ++-- src/BulkManager/BulkAction/UnPublishHandler.php | 4 ++-- src/BulkManager/BulkManager.php | 10 +++++----- src/BulkTools/HTTPBulkToolsResponse.php | 2 +- src/BulkUploader/BulkUploadHandler.php | 2 +- src/BulkUploader/BulkUploader.php | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/BulkManager/BulkAction/ArchiveHandler.php b/src/BulkManager/BulkAction/ArchiveHandler.php index 70ebaa8..32b4b9d 100644 --- a/src/BulkManager/BulkAction/ArchiveHandler.php +++ b/src/BulkManager/BulkAction/ArchiveHandler.php @@ -111,8 +111,8 @@ class ArchiveHandler extends Handler } } - $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 index fca61ea..4771f63 100644 --- a/src/BulkManager/BulkAction/DeleteHandler.php +++ b/src/BulkManager/BulkAction/DeleteHandler.php @@ -104,7 +104,7 @@ class DeleteHandler extends Handler $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 index b9d766f..9cefc8a 100644 --- a/src/BulkManager/BulkAction/EditHandler.php +++ b/src/BulkManager/BulkAction/EditHandler.php @@ -148,7 +148,7 @@ class EditHandler extends Handler $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 @@ class EditHandler extends Handler 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 index 00e08e0..0afd41e 100644 --- a/src/BulkManager/BulkAction/PublishHandler.php +++ b/src/BulkManager/BulkAction/PublishHandler.php @@ -111,8 +111,8 @@ class PublishHandler extends Handler } } - $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 index cfc8917..7bdec81 100644 --- a/src/BulkManager/BulkAction/UnPublishHandler.php +++ b/src/BulkManager/BulkAction/UnPublishHandler.php @@ -111,8 +111,8 @@ class UnPublishHandler extends Handler } } - $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 index b2ae2e5..e62538c 100644 --- a/src/BulkManager/BulkManager.php +++ b/src/BulkManager/BulkManager.php @@ -79,7 +79,7 @@ class BulkManager implements GridField_HTMLProvider, GridField_ColumnProvider, G */ 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 @@ class BulkManager implements GridField_HTMLProvider, GridField_ColumnProvider, G */ 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 @@ class BulkManager implements GridField_HTMLProvider, GridField_ColumnProvider, G */ public function augmentColumns($gridField, &$columns) { - if (!in_array('BulkSelect', $columns)) { + if (!in_array('BulkSelect', $columns ?? [])) { $columns[] = 'BulkSelect'; } } @@ -267,7 +267,7 @@ class BulkManager implements GridField_HTMLProvider, GridField_ColumnProvider, G 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 @@ class BulkManager implements GridField_HTMLProvider, GridField_ColumnProvider, G '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 index b131dbd..f99a4ea 100644 --- a/src/BulkTools/HTTPBulkToolsResponse.php +++ b/src/BulkTools/HTTPBulkToolsResponse.php @@ -344,7 +344,7 @@ class HTTPBulkToolsResponse extends HTTPResponse $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 index c7b1d92..a5a32f9 100644 --- a/src/BulkUploader/BulkUploadHandler.php +++ b/src/BulkUploader/BulkUploadHandler.php @@ -121,7 +121,7 @@ class BulkUploadHandler extends RequestHandler $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 index 381313a..862e4ff 100644 --- a/src/BulkUploader/BulkUploader.php +++ b/src/BulkUploader/BulkUploader.php @@ -86,7 +86,7 @@ class BulkUploader implements GridField_HTMLProvider, GridField_URLHandler */ 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 @@ class BulkUploader implements GridField_HTMLProvider, GridField_URLHandler $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 ));