OP-550 - Remove php 8.4 and symfony 6.4 support

Author: JanPalen

Diff for: .github/workflows/build.yml

@@ -21,8 +21,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ "8.3" ]
-        symfony: [ "^6.4", "^7.0" ]
+        php: [ "8.2", "8.3" ]
+        symfony: [ "^7.1" ]
         sylius: [ "^2.0" ]
         node: [ "20.x" ]
         mysql: [ "8.0" ]
@@ -159,6 +159,10 @@ jobs:
         name: Run PHPUnit
         run: vendor/bin/phpunit --colors=always
 
+      -
+        name: Cache clear
+        run: (cd tests/Application && rm -rf var/cache)
+
       -
         name: Run Behat
         run: vendor/bin/behat --colors --strict -vvv --no-interaction || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun

Diff for: .github/workflows/coding_standard.yml

@@ -18,8 +18,8 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [ "8.3" ]
-                symfony: [ "^6.4", "^7.0" ]
+                php: [ "8.2", "8.3" ]
+                symfony: [ "^7.1" ]
                 sylius: [ "^2.0" ]
                 node: [ "20.x" ]
 

Diff for: UPGRADE-1.3.md

@@ -5,7 +5,7 @@
     "description": "Product bundle for Sylius.",
     "license": "MIT",
     "require": {
-        "php": "^8.2",
+        "php": "~8.2.0 || ~8.3.0",
         "sylius/sylius": "~2.0.0",
         "dompdf/dompdf": "^2.0",
         "sylius/twig-hooks": "^0.5",
@@ -31,7 +31,7 @@
         "friends-of-behat/symfony-extension": "^2.6",
         "friends-of-behat/variadic-extension": "^1.6",
         "gedmo/doctrine-extensions": "^3.9",
-        "lchrusciel/api-test-case": "^4.1 || ^5.0",
+        "lchrusciel/api-test-case": "^5.3",
         "league/flysystem-bundle": "^3.3",
         "nelmio/alice": "^3.10",
         "nyholm/psr7": "^1.8",
@@ -42,13 +42,13 @@
         "sylius-labs/suite-tags-extension": "~0.2",
         "sylius/mailer-bundle": "^1.8 || ^2.0@beta",
         "sylius/sylius-rector": "^2.0",
-        "symfony/browser-kit": "^6.4 || ^7.1",
-        "symfony/debug-bundle": "^6.4 || ^7.1",
-        "symfony/dependency-injection": "^6.4 || ^7.1",
-        "symfony/dotenv": "^6.4 || ^7.1",
-        "symfony/http-client": "^6.4 || ^7.1",
-        "symfony/intl": "^6.4 || ^7.1",
-        "symfony/web-profiler-bundle": "^6.4 || ^7.1"
+        "symfony/browser-kit": "^7.1",
+        "symfony/debug-bundle": "^7.1",
+        "symfony/dependency-injection": "^7.1",
+        "symfony/dotenv": "^7.1",
+        "symfony/http-client": "^7.1",
+        "symfony/intl": "^7.1",
+        "symfony/web-profiler-bundle": "^7.1"
     },
     "autoload": {
         "psr-4": {

Diff for: UPGRADE-1.4.md

@@ -62,32 +62,32 @@ final class AddToCartFormComponent extends BaseAddToCartFormComponent
      * @param ProductVariantRepositoryInterface<ProductVariantInterface> $productVariantRepository
      */
     public function __construct(
-        protected readonly FormFactoryInterface $formFactory,
-        protected readonly ObjectManager $manager,
-        protected readonly RouterInterface $router,
-        protected readonly RequestStack $requestStack,
-        protected readonly EventDispatcherInterface $eventDispatcher,
-        protected readonly CartContextInterface $cartContext,
-        protected readonly AddToCartCommandFactoryInterface $addToCartCommandFactory,
-        protected readonly CartItemFactoryInterface $cartItemFactory,
-        protected readonly string $formClass,
+        FormFactoryInterface $formFactory,
+        ObjectManager $manager,
+        RouterInterface $router,
+        RequestStack $requestStack,
+        EventDispatcherInterface $eventDispatcher,
+        CartContextInterface $cartContext,
+        AddToCartCommandFactoryInterface $addToCartCommandFactory,
+        CartItemFactoryInterface $cartItemFactory,
+        string $formClass,
         ProductRepositoryInterface $productRepository,
         ProductVariantRepositoryInterface $productVariantRepository,
-        private readonly AddProductBundleToCartDtoFactory $addProductBundleToCartDtoFactory,
+        protected readonly AddProductBundleToCartDtoFactory $addProductBundleToCartDtoFactory,
     ) {
         $this->initializeProduct($productRepository);
         $this->initializeProductVariant($productVariantRepository);
 
         parent::__construct(
-            $this->formFactory,
-            $this->manager,
-            $this->router,
-            $this->requestStack,
-            $this->eventDispatcher,
-            $this->cartContext,
-            $this->addToCartCommandFactory,
-            $this->cartItemFactory,
-            $this->formClass,
+            $formFactory,
+            $manager,
+            $router,
+            $requestStack,
+            $eventDispatcher,
+            $cartContext,
+            $addToCartCommandFactory,
+            $cartItemFactory,
+            $formClass,
             $productRepository,
             $productVariantRepository,
         );

Diff for: composer.json

@@ -14,9 +14,7 @@
             <argument type="service" id="sylius.context.cart" />
             <argument type="service" id="sylius.factory.add_to_cart_command" />
             <argument type="service" id="sylius.factory.order_item" />
-
             <argument>BitBag\SyliusProductBundlePlugin\Form\Type\AddProductBundleToCartType</argument>
-
             <argument type="service" id="sylius.repository.product" />
             <argument type="service" id="sylius.repository.product_variant" />
 

Diff for: src/Component/Product/AddToCartFormComponent.php

@@ -11,19 +11,11 @@
 
 namespace Tests\BitBag\SyliusProductBundlePlugin\Api;
 
-use Composer\InstalledVersions;
-
 abstract class AdminJsonApiTestCase extends JsonApiTestCase
 {
     public function getAuthToken(string $email, string $password): string
     {
-        $syliusVersion = InstalledVersions::getVersion('sylius/sylius');
-
-        if (version_compare($syliusVersion, '1.13.0', '>=')) {
-            $endpoint = '/api/v2/admin/administrators/token';
-        } else {
-            $endpoint = '/api/v2/admin/authentication-token';
-        }
+        $endpoint = '/api/v2/admin/administrators/token';
 
         $this->client->request(
             'POST',

Diff for: src/Resources/config/services/product.xml

@@ -10,7 +10,6 @@
 /node_modules
 
 /config/encryption
-/config/jwt
 
 ###> symfony/framework-bundle ###
 /.env.*.local

Diff for: tests/Api/AdminJsonApiTestCase.php

@@ -112,9 +112,5 @@ private function registerBundlesFromFile(string $bundlesFile): iterable
     private function getConfigurationDirectories(): iterable
     {
         yield $this->getProjectDir() . '/config';
-        $symfonyConfigDir = $this->getProjectDir() . '/config/symfony/' . BaseKernel::MAJOR_VERSION . '.x';
-        if (is_dir($symfonyConfigDir)) {
-            yield $symfonyConfigDir;
-        }
     }
 }

Diff for: tests/Application/.gitignore

@@ -0,0 +1,54 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+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
+-----END ENCRYPTED PRIVATE KEY-----

Diff for: tests/Application/Kernel.php

@@ -1,3 +1,3 @@
 fos_rest:
-    exception:
-        debug: true
+  exception:
+    debug: true