From 92a7227997b30baadecb06ad4884a534b7b3bd8a Mon Sep 17 00:00:00 2001 From: Victor Svizev Date: Thu, 18 Sep 2025 11:59:33 +0200 Subject: [PATCH 1/2] PAC-950 Add compatibility with PHP 8.4 --- CHANGELOG.md | 8 ++++++++ src/Observers/AbstractAttributeSetObserver.php | 2 +- src/Observers/AttributeGroupObserver.php | 6 +++--- src/Observers/AttributeSetObserver.php | 6 +++--- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 547a468..2c060a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Version 18.1.0 + +## Features + +### PHP 8.4 Compatibility + +* Add PHP 8.4 support + # Version 18.0.0 ## Features diff --git a/src/Observers/AbstractAttributeSetObserver.php b/src/Observers/AbstractAttributeSetObserver.php index 463d223..1e8d770 100644 --- a/src/Observers/AbstractAttributeSetObserver.php +++ b/src/Observers/AbstractAttributeSetObserver.php @@ -44,7 +44,7 @@ abstract class AbstractAttributeSetObserver extends AbstractObserver * @param \TechDivision\Import\Attribute\Services\AttributeBunchProcessorInterface $attributeSetBunchProcessor The attribute set bunch processor instance * @param \TechDivision\Import\Observers\StateDetectorInterface|null $stateDetector The state detector instance to use */ - public function __construct(AttributeSetBunchProcessorInterface $attributeSetBunchProcessor, StateDetectorInterface $stateDetector = null) + public function __construct(AttributeSetBunchProcessorInterface $attributeSetBunchProcessor, ?StateDetectorInterface $stateDetector = null) { // set the attribute set bunch processor instance diff --git a/src/Observers/AttributeGroupObserver.php b/src/Observers/AttributeGroupObserver.php index 93ce889..a19a24c 100644 --- a/src/Observers/AttributeGroupObserver.php +++ b/src/Observers/AttributeGroupObserver.php @@ -68,9 +68,9 @@ class AttributeGroupObserver extends AbstractAttributeSetObserver implements Dyn */ public function __construct( AttributeSetBunchProcessorInterface $attributeSetBunchProcessor, - AttributeLoaderInterface $attributeLoader = null, - EntityMergerInterface $entityMerger = null, - StateDetectorInterface $stateDetector = null + ?AttributeLoaderInterface $attributeLoader = null, + ?EntityMergerInterface $entityMerger = null, + ?StateDetectorInterface $stateDetector = null ) { // set the attribute loader diff --git a/src/Observers/AttributeSetObserver.php b/src/Observers/AttributeSetObserver.php index 077aead..d5e8936 100644 --- a/src/Observers/AttributeSetObserver.php +++ b/src/Observers/AttributeSetObserver.php @@ -68,9 +68,9 @@ class AttributeSetObserver extends AbstractAttributeSetObserver implements Dynam */ public function __construct( AttributeSetBunchProcessorInterface $attributeSetBunchProcessor, - AttributeLoaderInterface $attributeLoader = null, - EntityMergerInterface $entityMerger = null, - StateDetectorInterface $stateDetector = null + ?AttributeLoaderInterface $attributeLoader = null, + ?EntityMergerInterface $entityMerger = null, + ?StateDetectorInterface $stateDetector = null ) { // set the attribute loader From 05c77c2e5bb125ff0bc76a30748056bd227a8347 Mon Sep 17 00:00:00 2001 From: Victor Svizev Date: Thu, 2 Oct 2025 16:06:35 +0200 Subject: [PATCH 2/2] PAC-950 Update dependencies --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0e8d295..b6e7e90 100755 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "license": "MIT", "require": { "php": "^8.1", - "techdivision/import-attribute": "^23.0.0" + "techdivision/import-attribute": "^23.1" }, "require-dev": { "doctrine/dbal": "^4.0.4",