refactor #203 Drop support for Sylius 1.8 (Zales0123)

This PR was merged into the 1.0-dev branch. Discussion ---------- Commits ------- 1271658 Drop support for Sylius 1.8
Sylius · Sep 22, 2021 · 588459d · 588459d
2 parents d2bc75e + 1271658
commit 588459d
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 225 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,15 +22,9 @@ jobs:
                 node: ["10.x"]
                 mysql: ["5.7", "8.0"]
                 symfony: ["^4.4", "^5.2"]
-                sylius: ["~1.8.0", "~1.9.0", "~1.10.0"]
+                sylius: ["~1.9.0", "~1.10.0"]
 
                 exclude:
-                    -
-                        sylius: "~1.8.0"
-                        symfony: "^5.2"
-                    -
-                        php: "8.0"
-                        sylius: "~1.8.0"
                     -
                         php: "8.0"
                         sylius: "~1.9.0"

diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
     "require": {
         "php": "^7.4 || ^8.0",
 
-        "sylius/sylius": "^1.8",
+        "sylius/sylius": "^1.9",
         "phpseclib/phpseclib": "^2.0",
         "sylius-labs/doctrine-migrations-extra-bundle": "^0.1.3",
         "doctrine/doctrine-migrations-bundle": "^3.0"
@@ -25,7 +25,7 @@
         "friends-of-behat/mink-debug-extension": "^2.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",
+        "friendsofsymfony/oauth-server-bundle": ">2.0.0-alpha.0 ^2.0@dev",
         "phpspec/phpspec": "^6.1",
         "phpstan/phpstan": "0.12.98",
         "phpstan/phpstan-doctrine": "0.12.33",

diff --git a/tests/Application/Kernel.php b/tests/Application/Kernel.php
@@ -76,25 +76,6 @@ protected function getContainerBaseClass(): string
         return parent::getContainerBaseClass();
     }
 
-    protected function getContainerLoader(ContainerInterface $container): LoaderInterface
-    {
-        /** @var ContainerBuilder $container */
-        Assert::isInstanceOf($container, ContainerBuilder::class);
-
-        $locator = new FileLocator($this, $this->getProjectDir() . '/Resources');
-        $resolver = new LoaderResolver(array(
-            new XmlFileLoader($container, $locator),
-            new YamlFileLoader($container, $locator),
-            new IniFileLoader($container, $locator),
-            new PhpFileLoader($container, $locator),
-            new GlobFileLoader($container, $locator),
-            new DirectoryLoader($container, $locator),
-            new ClosureLoader($container),
-        ));
-
-        return new DelegatingLoader($resolver);
-    }
-
     private function isTestEnvironment(): bool
     {
         return 0 === strpos($this->getEnvironment(), 'test');

diff --git a/tests/Application/config/routes/sylius_shop.yaml b/tests/Application/config/routes/sylius_shop.yaml
@@ -12,3 +12,11 @@ sylius_shop_default_locale:
     methods: [GET]
     defaults:
         _controller: sylius.controller.shop.locale_switch:switchAction
+
+sylius_shop_request_password_reset_token_redirect:
+    path: /.well-known/change-password
+    methods: [GET]
+    controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction
+    defaults:
+        route: sylius_shop_request_password_reset_token
+        permanent: false
diff --git a/tests/Application/config/sylius/1.10/packages/security.yaml b/tests/Application/config/sylius/1.10/packages/security.yaml
@@ -2,7 +2,7 @@ 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_route: "/api/v2"
     sylius.security.new_api_regex: "^%sylius.security.new_api_route%"
     sylius.security.new_api_admin_route: "%sylius.security.new_api_route%/admin"
     sylius.security.new_api_admin_regex: "^%sylius.security.new_api_admin_route%"

diff --git a/tests/Application/config/sylius/1.8/bundles.php b/tests/Application/config/sylius/1.8/bundles.php
diff --git a/tests/Application/config/sylius/1.8/packages/_sylius.yaml b/tests/Application/config/sylius/1.8/packages/_sylius.yaml
diff --git a/tests/Application/config/sylius/1.8/packages/dev/jms_serializer.yaml b/tests/Application/config/sylius/1.8/packages/dev/jms_serializer.yaml
diff --git a/tests/Application/config/sylius/1.8/packages/framework.yaml b/tests/Application/config/sylius/1.8/packages/framework.yaml
diff --git a/tests/Application/config/sylius/1.8/packages/jms_serializer.yaml b/tests/Application/config/sylius/1.8/packages/jms_serializer.yaml
diff --git a/tests/Application/config/sylius/1.8/packages/prod/jms_serializer.yaml b/tests/Application/config/sylius/1.8/packages/prod/jms_serializer.yaml
diff --git a/tests/Application/config/sylius/1.8/packages/security.yaml b/tests/Application/config/sylius/1.8/packages/security.yaml
diff --git a/tests/Application/config/sylius/1.8/routes/dev/twig.yaml b/tests/Application/config/sylius/1.8/routes/dev/twig.yaml
diff --git a/tests/Application/config/sylius/1.8/routes/sylius_admin_api.yaml b/tests/Application/config/sylius/1.8/routes/sylius_admin_api.yaml
diff --git a/tests/Application/config/sylius/1.9/packages/security.yaml b/tests/Application/config/sylius/1.9/packages/security.yaml
@@ -2,7 +2,7 @@ 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_route: "/api/v2"
     sylius.security.new_api_regex: "^%sylius.security.new_api_route%"
     sylius.security.new_api_admin_route: "%sylius.security.new_api_route%/admin"
     sylius.security.new_api_admin_regex: "^%sylius.security.new_api_admin_route%"