MAGE-1364 Apply type fixes for PHP 8.4

Author: cammonro

Helper/ConfigHelper.php

@@ -763,7 +763,7 @@ public function getCategoryPageIdAttributeName($storeId = null): string
     /**
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function getCurrencyCode(int $storeId = null): string
+    public function getCurrencyCode(?int $storeId = null): string
     {
         /** @var \Magento\Store\Model\Store $store */
         $store = $this->storeManager->getStore($storeId);

Model/Indexer/ProductObserver.php

@@ -13,27 +13,19 @@ class ProductObserver
     /** @var Product */
     private $indexer;
 
-    /** @var ConfigHelper */
-    private $configHelper;
-
-    /**
-     * @param IndexerRegistry $indexerRegistry
-     * @param ConfigHelper $configHelper
-     */
-    public function __construct(IndexerRegistry $indexerRegistry, ConfigHelper $configHelper)
+    public function __construct(IndexerRegistry $indexerRegistry)
     {
         $this->indexer = $indexerRegistry->get('algolia_products');
-        $this->configHelper = $configHelper;
     }
 
     /**
      * @param ProductResource $productResource
      * @param ProductResource $result
      * @param ProductModel $product
      *
-     * @return ProductModel[]
+     * @return ProductResource
      */
-    public function afterSave(ProductResource $productResource, ProductResource $result, ProductModel $product)
+    public function afterSave(ProductResource $productResource, ProductResource $result, ProductModel $product): ProductResource
     {
         $productResource->addCommitCallback(function () use ($product) {
             if (!$this->indexer->isScheduled()) {
@@ -49,9 +41,9 @@ public function afterSave(ProductResource $productResource, ProductResource $res
      * @param ProductResource $result
      * @param ProductModel $product
      *
-     * @return ProductModel[]
+     * @return ProductResource
      */
-    public function afterDelete(ProductResource $productResource, ProductResource $result, ProductModel $product)
+    public function afterDelete(ProductResource $productResource, ProductResource $result, ProductModel $product): ProductResource
     {
         $productResource->addCommitCallback(function () use ($product) {
             if (!$this->indexer->isScheduled()) {
@@ -69,7 +61,7 @@ public function afterDelete(ProductResource $productResource, ProductResource $r
      *
      * @return Action
      */
-    public function afterUpdateAttributes(Action $subject, Action $result, $productIds)
+    public function afterUpdateAttributes(Action $subject, Action $result, array $productIds): Action
     {
         if (!$this->indexer->isScheduled()) {
             $this->indexer->reindexList(array_unique($productIds));
@@ -80,17 +72,15 @@ public function afterUpdateAttributes(Action $subject, Action $result, $productI
 
     /**
      * @param Action $subject
-     * @param Action $result
+     * @param null $result
      * @param array $productIds
      *
-     * @return mixed
+     * @return void
      */
-    public function afterUpdateWebsites(Action $subject, Action $result, array $productIds)
+    public function afterUpdateWebsites(Action $subject, null $result, array $productIds): void
     {
         if (!$this->indexer->isScheduled()) {
             $this->indexer->reindexList(array_unique($productIds));
         }
-
-        return $result;
     }
 }

Plugin/StockItemObserver.php

@@ -38,9 +38,9 @@ public function beforeSave(
 
     /**
      * @param \Magento\CatalogInventory\Model\ResourceModel\Stock\Item $stockItemResource
-     * @param \Magento\CatalogInventory\Model\ResourceModel\Stock\Item|null $result
+     * @param \Magento\CatalogInventory\Model\ResourceModel\Stock\Item $result
      * @param \Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem
-     * @return \Magento\CatalogInventory\Model\ResourceModel\Stock\Item|null
+     * @return \Magento\CatalogInventory\Model\ResourceModel\Stock\Item
      */
     public function afterDelete(
         \Magento\CatalogInventory\Model\ResourceModel\Stock\Item $stockItemResource,