From 419511e323111cb5d5fc8ef3adce76a0f9c02f8d Mon Sep 17 00:00:00 2001 From: Daniel Gohlke Date: Fri, 21 Feb 2025 16:20:22 +0100 Subject: [PATCH 1/3] [TASK] Make extension compatible to extcode/cart v10.0.0 Resolves: #97 --- Classes/Domain/Finisher/Form/AddToCartFinisher.php | 1 - Classes/EventListener/RetrieveProductsFromRequest.php | 1 - composer.json | 2 +- ext_emconf.php | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Classes/Domain/Finisher/Form/AddToCartFinisher.php b/Classes/Domain/Finisher/Form/AddToCartFinisher.php index 2ec31e8b..d0247251 100644 --- a/Classes/Domain/Finisher/Form/AddToCartFinisher.php +++ b/Classes/Domain/Finisher/Form/AddToCartFinisher.php @@ -124,7 +124,6 @@ protected function getProductBackendVariant( BeVariant::class, PriceCategory::class . '-' . $this->priceCategory->getUid(), $product, - null, $this->priceCategory->getTitle(), $this->priceCategory->getSku(), 1, diff --git a/Classes/EventListener/RetrieveProductsFromRequest.php b/Classes/EventListener/RetrieveProductsFromRequest.php index 9f2ae7d2..a2cc3147 100644 --- a/Classes/EventListener/RetrieveProductsFromRequest.php +++ b/Classes/EventListener/RetrieveProductsFromRequest.php @@ -196,7 +196,6 @@ protected function getProductBackendVariant( BeVariant::class, PriceCategory::class . '-' . $this->priceCategory->getUid(), $product, - null, $this->priceCategory->getTitle(), $this->priceCategory->getSku(), 1, diff --git a/composer.json b/composer.json index fbb562cf..6db69d21 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "php": "^8.1", "ext-json": "*", "ext-pdo": "*", - "extcode/cart": "^9.0", + "extcode/cart": "^10.0", "typo3/cms-core": "^12.4", "typo3/cms-extbase": "^12.4", "typo3/cms-fluid": "^12.4" diff --git a/ext_emconf.php b/ext_emconf.php index a7a4906e..3b443248 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -13,7 +13,7 @@ 'constraints' => [ 'depends' => [ 'typo3' => '12.4.0-12.4.99', - 'cart' => '9.0.0', + 'cart' => '10.0.0', ], 'conflicts' => [], 'suggests' => [], From fe3b3622b97c66b0a60e0891e3149e354dfc25c8 Mon Sep 17 00:00:00 2001 From: Daniel Gohlke Date: Fri, 21 Feb 2025 16:23:26 +0100 Subject: [PATCH 2/3] [BUGFIX] Use self::createStub in unit test --- Tests/Unit/Domain/Model/SpecialPriceTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Unit/Domain/Model/SpecialPriceTest.php b/Tests/Unit/Domain/Model/SpecialPriceTest.php index 04e4285c..0e11f647 100644 --- a/Tests/Unit/Domain/Model/SpecialPriceTest.php +++ b/Tests/Unit/Domain/Model/SpecialPriceTest.php @@ -83,7 +83,7 @@ public function getFrontendUserGroupReturnsInitialValueNull(): void #[Test] public function setFrontendUserGroupSetsFrontendUserGroup(): void { - $frontendUserGroup = $this->createStub( + $frontendUserGroup = self::createStub( FrontendUserGroup::class ); $this->specialPrice->setFrontendUserGroup($frontendUserGroup); From 0b0e332a2c081b2865b2ebd08c0a543c92225466 Mon Sep 17 00:00:00 2001 From: Daniel Gohlke Date: Fri, 21 Feb 2025 16:29:48 +0100 Subject: [PATCH 3/3] [BUGFIX] Kill geckodriver after acceptance test finished --- shell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/shell.nix b/shell.nix index 767318a0..07667f9c 100644 --- a/shell.nix +++ b/shell.nix @@ -111,6 +111,7 @@ let ./vendor/bin/codecept run pgrep -f "php -S" | xargs -r kill + pgrep -f "geckodriver" | xargs -r kill ''; };