Merge pull request #1785 from algolia/feat/MAGE-1364-php4-nullable-types

MAGE-1364 MAGE-1365 PHP 8.4 implicit nullable types plus 8.2 base refactor

Author: cammonro

Api/Insights/EventProcessorInterface.php

@@ -91,7 +91,7 @@ public function convertAddToCart(
         string $eventName,
         string $indexName,
         Item   $item,
-        string $queryID = null
+        ?string $queryID = null
     ): array;
 
     /**
@@ -123,7 +123,7 @@ public function convertPurchaseForItems(
         string $eventName,
         string $indexName,
         array  $items,
-        string $queryID = null
+        ?string $queryID = null
     ): array;
 
 }

Block/Adminhtml/LandingPage/Edit/AbstractButton.php

@@ -52,7 +52,7 @@ public function getObject()
             $landingPage->getResource()->load($landingPage, $modelId);
 
             return $landingPage;
-        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        } catch (\Magento\Framework\Exception\NoSuchEntityException) {
         }
 
         return null;

Block/Adminhtml/Query/Edit/AbstractButton.php

@@ -52,7 +52,7 @@ public function getObject()
             $query->getResource()->load($query, $modelId);
 
             return $query;
-        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        } catch (\Magento\Framework\Exception\NoSuchEntityException) {
         }
 
         return null;

Block/Adminhtml/Queue/Status.php

@@ -70,20 +70,12 @@ public function isQueueActive()
     public function getQueueRunnerStatus()
     {
         $status = 'unknown';
-        switch ($this->queueRunnerIndexer->getStatus()) {
-            case \Magento\Framework\Indexer\StateInterface::STATUS_VALID:
-                $status = 'Ready';
-
-                break;
-            case \Magento\Framework\Indexer\StateInterface::STATUS_INVALID:
-                $status = 'Reindex required';
-
-                break;
-            case \Magento\Framework\Indexer\StateInterface::STATUS_WORKING:
-                $status = 'Processing';
-
-                break;
-        }
+        $status = match ($this->queueRunnerIndexer->getStatus()) {
+            \Magento\Framework\Indexer\StateInterface::STATUS_VALID => 'Ready',
+            \Magento\Framework\Indexer\StateInterface::STATUS_INVALID => 'Reindex required',
+            \Magento\Framework\Indexer\StateInterface::STATUS_WORKING => 'Processing',
+            default => $status,
+        };
 
         return $status;
     }

Block/Checkout/Conversion.php

@@ -54,7 +54,7 @@ public function getOrderItemsConversionJson()
         /** @var Item $item */
         foreach ($orderItems as $item) {
             if ($item->hasData(InsightsHelper::QUOTE_ITEM_QUERY_PARAM)) {
-                $orderItemsData[$item->getProductId()] = json_decode($item->getData(InsightsHelper::QUOTE_ITEM_QUERY_PARAM));
+                $orderItemsData[$item->getProductId()] = json_decode((string) $item->getData(InsightsHelper::QUOTE_ITEM_QUERY_PARAM));
             }
         }
 

Block/Configuration.php

@@ -57,7 +57,7 @@ protected function initCategoryParentPath(\Magento\Catalog\Model\Category $cat):
      * @param array $arr
      * @return array
      */
-    protected function getChildCategoryUrls(\Magento\Catalog\Model\Category $cat, string $parent = '', array $arr = array()): array {
+    protected function getChildCategoryUrls(\Magento\Catalog\Model\Category $cat, string $parent = '', array $arr = []): array {
         if (!$parent) {
             $parent = $this->initCategoryParentPath($cat);
         }

Block/LandingPage.php

@@ -90,7 +90,7 @@ protected function _prepareLayout()
         $page = $this->getPage();
         $this->pageConfig->addBodyClass('algolia-landingpage-' . $page->getUrlKey());
         $metaTitle = $page->getMetaTitle();
-        $this->pageConfig->getTitle()->set($page->getTitle() ? $page->getTitle() : $metaTitle);
+        $this->pageConfig->getTitle()->set($page->getTitle() ?: $metaTitle);
         $this->pageConfig->setKeywords($page->getMetaKeywords());
         $this->pageConfig->setDescription($page->getMetaDescription());
 

Block/Navigation/Renderer/SliderRenderer.php

@@ -158,6 +158,6 @@ private function getUrlTemplate()
         $regexp = "/({$filter->getRequestVar()})=(-?[0-9A-Z\-\%]+)/";
         $replacement = '${1}=<%- from %>-<%- to %>';
 
-        return preg_replace($regexp, $replacement, $item->getUrl());
+        return preg_replace($regexp, $replacement, (string) $item->getUrl());
     }
 }

Block/System/Form/Field/Select.php

@@ -9,6 +9,6 @@ protected function _toHtml()
         $this->setData('name', $this->getData('input_name'));
         $this->setClass('select');
 
-        return trim(preg_replace('/\s+/', ' ', parent::_toHtml()));
+        return trim((string) preg_replace('/\s+/', ' ', parent::_toHtml()));
     }
 }

Block/Widget/LookingSimilar.php

@@ -51,7 +51,7 @@ public function generateUniqueToken()
      */
     public function getProductIds()
     {
-        return json_encode(explode(",", $this->getData('productIds')));
+        return json_encode(explode(",", (string) $this->getData('productIds')));
     }
 
     /**