Merge pull request #32 from techdivision/PAC-950

Author: svizevv

CHANGELOG.md

@@ -1,3 +1,11 @@
+# Version 26.1.0
+
+## Features
+
+### PHP 8.4 Compatibility
+
+* Add PHP 8.4 support
+
 # Version 26.0.2
 
 ## Bugfixes

composer.json

@@ -4,7 +4,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.1",
-        "techdivision/import-product": "^26.0.0"
+        "techdivision/import-product": "^26.2"
     },
     "require-dev": {
         "doctrine/dbal": "^4.0.4",
@@ -40,4 +40,4 @@
             ]
         }
     }
-}
+}

src/Observers/CleanUpVariantProductRelationObserver.php

@@ -46,11 +46,11 @@ class CleanUpVariantProductRelationObserver extends AbstractProductImportObserve
      * Initialize the observer with the passed product variant processor instance.
      *
      * @param \TechDivision\Import\Product\Variant\Services\ProductVariantProcessorInterface $productVariantProcessor The product variant processor instance
-     * @param StateDetectorInterface|null                                                    $stateDetector           The state detector instance to use
+     * @param StateDetectorInterface|null $stateDetector           The state detector instance to use
      */
     public function __construct(
         ProductVariantProcessorInterface $productVariantProcessor,
-        StateDetectorInterface $stateDetector = null
+        ?StateDetectorInterface $stateDetector = null
     ) {
 
         // pass the state detector to the parent constructor

src/Observers/VariantSuperAttributeObserver.php

@@ -108,9 +108,9 @@ class VariantSuperAttributeObserver extends AbstractProductImportObserver implem
      */
     public function __construct(
         ProductVariantProcessorInterface $productVariantProcessor,
-        AttributeLoaderInterface $attributeLoader = null,
-        Collection $entityMergers = null,
-        StateDetectorInterface $stateDetector = null
+        ?AttributeLoaderInterface $attributeLoader = null,
+        ?Collection $entityMergers = null,
+        ?StateDetectorInterface $stateDetector = null
     ) {
 
         // initialize the product variant processor and the attribute loader instance

src/Services/ProductVariantProcessor.php

@@ -660,7 +660,7 @@ public function deleteProductSuperAttribute(array $row, $name = null)
      *
      * @return void
      */
-    public function deleteProductRelation(array $row, string $name = null): void
+    public function deleteProductRelation(array $row, ?string $name = null): void
     {
         $this->getProductRelationAction()->delete($row, $name);
     }

src/Services/ProductVariantProcessorInterface.php

@@ -218,5 +218,5 @@ public function deleteProductSuperAttribute(array $row, $name = null);
      *
      * @return void
      */
-    public function deleteProductRelation(array $row, string $name = null): void;
+    public function deleteProductRelation(array $row, ?string $name = null): void;
 }