Sylius 1.12 support with S5 + S6 (#116)

Author: dsbe-ak

.github/workflows/build.yml

@@ -22,8 +22,8 @@ jobs:
             fail-fast: false
             matrix:
                 php: ["8.1", "8.0"]
-                symfony: ["^5.2"]
-                sylius: ["~1.11.0"]
+                symfony: ["^5.2", "^6.0"]
+                sylius: ["~1.12.0"]
                 node: ["14.x"]
                 mysql: ["8.0"]
 
@@ -85,7 +85,8 @@ jobs:
                 name: Restrict Symfony version
                 if: matrix.symfony != ''
                 run: |
-                    composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^1.10"
+                    composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^2.2"
+                    composer global config --no-plugins allow-plugins.symfony/flex true
                     composer config extra.symfony.require "${{ matrix.symfony }}"
 
             -

composer.json

@@ -8,8 +8,9 @@
         "sylius-plugin"
     ],
     "require": {
-        "sylius/sylius": "^1.11",
-        "xynnn/google-tag-manager-bundle": "^3.0"
+        "sylius/sylius": "^1.12",
+        "sylius/mailer-bundle": "^1.8 || ^v2.0.0-BETA.1",
+        "xynnn/google-tag-manager-bundle": "^3.1 || ^4.0"
     },
     "require-dev": {
         "behat/behat": "^3.6.1",
@@ -23,7 +24,6 @@
         "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": "^2.0.0",
         "lchrusciel/api-test-case": "^5.1",
         "matthiasnoback/symfony-dependency-injection-test": "^4.3",
@@ -35,13 +35,12 @@
         "phpstan/phpstan-symfony": "^1.0",
         "phpstan/phpstan-webmozart-assert": "^1.0",
         "phpunit/phpunit": "^9.5",
-        "sensiolabs/security-checker": "^6.0",
         "sylius-labs/coding-standard": "^4.0",
-        "symfony/browser-kit": "^4.4 || ^5.2",
-        "symfony/debug-bundle": "^4.4 || ^5.2",
-        "symfony/dotenv": "^4.4 || ^5.2",
-        "symfony/intl": "^4.4 || ^5.2",
-        "symfony/web-profiler-bundle": "^4.4 || ^5.2",
+        "symfony/browser-kit": "^5.4 || ^6.0",
+        "symfony/debug-bundle": "^5.4 || ^6.0",
+        "symfony/dotenv": "^5.4 || ^6.0",
+        "symfony/intl": "^5.4 || ^6.0",
+        "symfony/web-profiler-bundle": "^5.4 || ^6.0",
         "vimeo/psalm": "4.23.0"
     },
     "suggest": {

ecs.php

@@ -1,21 +1,16 @@
 <?php
 
 use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
-use PhpCsFixer\Fixer\FunctionNotation\NativeFunctionInvocationFixer;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use Symplify\EasyCodingStandard\ValueObject\Option;
+use PhpCsFixer\Fixer\Operator\BinaryOperatorSpacesFixer;
+use Symplify\EasyCodingStandard\Config\ECSConfig;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $containerConfigurator->import('vendor/sylius-labs/coding-standard/ecs.php');
+return static function (ECSConfig $config): void {
+    $config->import('vendor/sylius-labs/coding-standard/ecs.php');
 
-    $parameters = $containerConfigurator->parameters();
-    $parameters->set(Option::SKIP, [
+    $config->skip([
         VisibilityRequiredFixer::class => ['*Spec.php'],
         'tests/Application/*',
     ]);
 
-    $services = $containerConfigurator->services();
-    $services->set(
-        NativeFunctionInvocationFixer::class
-    )->call('configure', [['include' => ['@all'], 'scope' => 'all', 'strict' => \true]]);
+    $config->ruleWithConfiguration(BinaryOperatorSpacesFixer::class, []);
 };

src/EventListener/AddRouteListener.php

@@ -18,7 +18,7 @@ public function __construct(GoogleTagManagerInterface $googleTagManager)
 
     public function onKernelRequest(RequestEvent $event): void
     {
-        if (!$event->isMasterRequest()) {
+        if (!$event->isMainRequest()) {
             return;
         }
 

src/EventListener/ContextListener.php

@@ -25,7 +25,7 @@ public function __construct(
         GoogleTagManagerInterface $googleTagManager,
         ChannelContextInterface $channelContext,
         LocaleContextInterface $localeContext,
-        CurrencyContextInterface $currencyContext
+        CurrencyContextInterface $currencyContext,
     ) {
         $this->googleTagManager = $googleTagManager;
         $this->channelContext = $channelContext;
@@ -35,7 +35,7 @@ public function __construct(
 
     public function onKernelRequest(RequestEvent $event): void
     {
-        if (!$event->isMasterRequest()) {
+        if (!$event->isMainRequest()) {
             return;
         }
 

src/EventListener/EnvironmentListener.php

@@ -21,7 +21,7 @@ public function __construct(GoogleTagManagerInterface $googleTagManager, string
 
     public function onKernelRequest(RequestEvent $event): void
     {
-        if (!$event->isMasterRequest()) {
+        if (!$event->isMainRequest()) {
             return;
         }
 

tests/Application/Kernel.php

@@ -12,7 +12,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
-use Symfony\Component\Routing\RouteCollectionBuilder;
 
 final class Kernel extends BaseKernel
 {
@@ -58,13 +57,6 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         }
     }
 
-    protected function configureRoutes(RouteCollectionBuilder $routes): void
-    {
-        foreach ($this->getConfigurationDirectories() as $confDir) {
-            $this->loadRoutesConfiguration($routes, $confDir);
-        }
-    }
-
     protected function getContainerBaseClass(): string
     {
         if ($this->isTestEnvironment() && class_exists(MockerContainer::class)) {

tests/Application/config/bootstrap.php

@@ -15,7 +15,7 @@
     throw new RuntimeException('Please run "composer require symfony/dotenv" to load the ".env" files configuring the application.');
 } else {
     // load all the .env files
-    (new Dotenv(true))->loadEnv(dirname(__DIR__) . '/.env');
+    (new Dotenv())->loadEnv(dirname(__DIR__) . '/.env');
 }
 
 $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev';

tests/Application/config/bundles.php

@@ -4,7 +4,6 @@
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
-    Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true],
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
     Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
     Sylius\Bundle\OrderBundle\SyliusOrderBundle::class => ['all' => true],
@@ -56,4 +55,6 @@
     Sylius\Bundle\ApiBundle\SyliusApiBundle::class => ['all' => true],
     SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true],
     Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true],
+    League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
+    Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
  ];