Drop support for Sylius 1.8

.github/workflows/build.yml

@@ -18,19 +18,16 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [7.4, 7.3]
+                php: [7.3, 7.4]
                 symfony: [^4.4, ^5.2]
-                sylius: [~1.8.0, ~1.9.0]
+                sylius: [~1.9.0]
                 node: [10.x]
                 mysql: [5.7, 8.0]
 
                 exclude:
                     -
                         php: 7.3
                         mysql: 8.0
-                    -
-                        sylius: ~1.8.0
-                        symfony: ^5.2
 
         env:
             APP_ENV: test
@@ -134,6 +131,10 @@ jobs:
                 name: Load fixtures in test application
                 run: (cd tests/Application && bin/console sylius:fixtures:load -n)
 
+            -
+                name: Run security check
+                run: symfony security:check
+
             -
                 name: Run analysis
                 run: composer analyse

behat.yml.dist

@@ -4,7 +4,7 @@ imports:
 
 default:
     extensions:
-        Lakion\Behat\MinkDebugExtension:
+        FriendsOfBehat\MinkDebugExtension:
             directory: etc/build
             clean_start: false
             screenshot: true

composer.json

@@ -10,7 +10,7 @@
         "ramsey/uuid": "^3.9",
         "sylius/grid-bundle": "^1.7",
         "sylius/resource-bundle": "^1.6",
-        "sylius/sylius": "^1.8",
+        "sylius/sylius": "^1.9",
         "symfony/config": "^4.4 || ^5.2",
         "symfony/dependency-injection": "^4.4 || ^5.2",
         "symfony/form": "^4.4 || ^5.2",
@@ -26,13 +26,13 @@
         "behat/mink-selenium2-driver": "^1.4",
         "friends-of-behat/mink": "^1.8",
         "friends-of-behat/mink-browserkit-driver": "^1.3",
+        "friends-of-behat/mink-debug-extension": "^2.0",
         "friends-of-behat/mink-extension": "^2.3",
         "friends-of-behat/page-object-extension": "^0.3",
         "friends-of-behat/suite-settings-extension": "^1.0",
         "friends-of-behat/symfony-extension": "^2.1",
         "friends-of-behat/variadic-extension": "^1.3",
         "friendsofsymfony/oauth-server-bundle": "^1.6 || >2.0.0-alpha.0 ^2.0@dev",
-        "lakion/mink-debug-extension": "^1.2.3",
         "matthiasnoback/symfony-config-test": "^4.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "phpspec/phpspec": "^7.0",

tests/Application/config/bundles.php

@@ -57,4 +57,6 @@
     FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true, 'test_cached' => true],
     Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
     SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true],
+    BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true],
+    SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true],
 ];

tests/Application/config/packages/security.yaml

@@ -1,10 +1,3 @@
-parameters:
-    sylius.security.admin_regex: "^/%sylius_admin.path_name%"
-    sylius.security.api_regex: "^/api"
-    sylius.security.shop_regex: "^/(?!%sylius_admin.path_name%|new-api|api/.*|api$|media/.*)[^/]++"
-    sylius.security.new_api_route: "/new-api"
-    sylius.security.new_api_regex: "^%sylius.security.new_api_route%"
-
 security:
     always_authenticate_before_granting: true
     providers:
@@ -16,9 +9,6 @@ security:
             id: sylius.shop_user_provider.email_or_name_based
         sylius_api_shop_user_provider:
             id: sylius.shop_user_provider.email_or_name_based
-        sylius_api_chain_provider:
-            chain:
-                providers: [sylius_api_shop_user_provider, sylius_api_admin_user_provider]
 
     encoders:
         Sylius\Component\User\Model\UserInterface: argon2i
@@ -55,12 +45,12 @@ security:
             security: false
 
         new_api_admin_user:
-            pattern: "%sylius.security.new_api_route%/admin-user-authentication-token"
-            provider: sylius_admin_user_provider
+            pattern: "%sylius.security.new_api_admin_regex%/.*"
+            provider: sylius_api_admin_user_provider
             stateless: true
             anonymous: true
             json_login:
-                check_path: "%sylius.security.new_api_route%/admin-user-authentication-token"
+                check_path: "%sylius.security.new_api_admin_route%/authentication-token"
                 username_path: email
                 password_path: password
                 success_handler: lexik_jwt_authentication.handler.authentication_success
@@ -70,12 +60,12 @@ security:
                     - lexik_jwt_authentication.jwt_token_authenticator
 
         new_api_shop_user:
-            pattern: "%sylius.security.new_api_route%/shop-user-authentication-token"
-            provider: sylius_shop_user_provider
+            pattern: "%sylius.security.new_api_shop_regex%/.*"
+            provider: sylius_api_shop_user_provider
             stateless: true
             anonymous: true
             json_login:
-                check_path: "%sylius.security.new_api_route%/shop-user-authentication-token"
+                check_path: "%sylius.security.new_api_shop_route%/authentication-token"
                 username_path: email
                 password_path: password
                 success_handler: lexik_jwt_authentication.handler.authentication_success
@@ -84,15 +74,6 @@ security:
                 authenticators:
                     - lexik_jwt_authentication.jwt_token_authenticator
 
-        new_api:
-            pattern: "%sylius.security.new_api_regex%/*"
-            provider: sylius_api_chain_provider
-            stateless: true
-            anonymous: lazy
-            guard:
-                authenticators:
-                    - lexik_jwt_authentication.jwt_token_authenticator
-
         api:
             pattern: "%sylius.security.api_regex%/.*"
             provider: sylius_admin_user_provider
@@ -150,3 +131,9 @@ security:
         - { path: "%sylius.security.admin_regex%", role: ROLE_ADMINISTRATION_ACCESS }
         - { path: "%sylius.security.api_regex%/.*", role: ROLE_API_ACCESS }
         - { path: "%sylius.security.shop_regex%/account", role: ROLE_USER }
+
+        - { path: "%sylius.security.new_api_admin_regex%/.*", role: ROLE_API_ACCESS }
+        - { path: "%sylius.security.new_api_admin_route%/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: "%sylius.security.new_api_user_account_regex%/.*", role: ROLE_USER }
+        - { path: "%sylius.security.new_api_shop_route%/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: "%sylius.security.new_api_shop_regex%/.*", role: IS_AUTHENTICATED_ANONYMOUSLY }

tests/Application/config/routes/sylius_admin.yaml

@@ -1,3 +1,3 @@
 sylius_admin:
     resource: "@SyliusAdminBundle/Resources/config/routing.yml"
-    prefix: /admin
+    prefix: '/%sylius_admin.path_name%'

tests/Application/src/Kernel.php

@@ -44,15 +44,15 @@ public function getLogDir(): string
 
     public function registerBundles(): iterable
     {
-        foreach ($this->getConfigurationDirectories() as $confDir) {
-            yield from $this->registerBundlesFromFile($confDir . '/bundles.php');
+        foreach ($this->getBundleListFiles() as $file) {
+            yield from $this->registerBundlesFromFile($file);
         }
     }
 
     protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
     {
-        foreach ($this->getConfigurationDirectories() as $confDir) {
-            $container->addResource(new FileResource($confDir . '/bundles.php'));
+        foreach ($this->getBundleListFiles() as $file) {
+            $container->addResource(new FileResource($file));
         }
 
         $container->setParameter('container.dumper.inline_class_loader', true);
@@ -128,12 +128,29 @@ private function registerBundlesFromFile(string $bundlesFile): iterable
         }
     }
 
+    private function getBundleListFiles(): array
+    {
+        return array_filter(
+            array_map(
+                static function (string $directory): string {
+                    return $directory . '/bundles.php';
+                },
+                $this->getConfigurationDirectories()
+            ),
+            'file_exists'
+        );
+    }
+
     /**
      * @return string[]
      */
-    private function getConfigurationDirectories(): iterable
+    private function getConfigurationDirectories(): array
     {
-        yield $this->getProjectDir() . '/config';
-        yield $this->getProjectDir() . '/config/sylius/' . SyliusKernel::MAJOR_VERSION . '.' . SyliusKernel::MINOR_VERSION;
+        $directories = [
+            $this->getProjectDir() . '/config',
+            $this->getProjectDir() . '/config/sylius/' . SyliusKernel::MAJOR_VERSION . '.' . SyliusKernel::MINOR_VERSION,
+        ];
+
+        return array_filter($directories, 'file_exists');
     }
 }