Merge pull request #286 from vasilvestre/patch-2

Add symfony 6 compatibility

.github/workflows/build.yml

@@ -21,46 +21,16 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [7.3, 7.4, 8.0, 8.1]
-                symfony: [^4.4, ^5.4]
-                sylius: [~1.8.0, ~1.9.0, ~1.10.0, ~1.11.0, ~1.12.x-dev]
+                php: [8.0, 8.1]
+                symfony: [^5.4, ^6.0]
+                sylius: [~1.11.0, ~1.12.0]
                 node: [14.x]
                 mysql: [5.7]
 
                 exclude:
-                    -
-                        sylius: ~1.8.0
-                        symfony: ^5.4
-                    -
-                        sylius: ~1.12.x-dev
-                        symfony: ^4.4
-                    -
-                        sylius: ~1.8.0
-                        php: 8.0
-                    -
-                        sylius: ~1.9.0
-                        php: 8.0
-                    -
-                        sylius: ~1.8.0
-                        php: 8.1
-                    -
-                        sylius: ~1.9.0
-                        php: 8.1
-                    -
-                        sylius: ~1.10.0
-                        php: 7.3
                     -
                         sylius: ~1.11.0
-                        php: 7.3
-                    -
-                        sylius: ~1.11.0
-                        php: 7.4
-                    -
-                        sylius: ~1.12.x-dev
-                        php: 7.3
-                    -
-                        sylius: ~1.12.x-dev
-                        php: 7.4
+                        symfony: ^6.0
 
         env:
             APP_ENV: test
@@ -139,11 +109,6 @@ jobs:
                 if: matrix.sylius != ''
                 run: composer require "sylius/sylius:${{ matrix.sylius }}" --no-update --no-scripts --no-interaction
 
-            -
-                name: Add Admin API Bundle for Sylius >= 1.10
-                if: matrix.sylius != '~1.8.0' && matrix.sylius != '~1.9.0'
-                run: composer require sylius/admin-api-bundle --no-update --no-scripts --no-interaction
-
             -
                 name: Install PHP dependencies
                 run: composer install --no-interaction

composer.json

@@ -4,10 +4,11 @@
     "description": "import / export plugin for Sylius.",
     "license": "MIT",
     "require": {
-        "sylius/sylius": "^1.8",
+        "php": "^8.0",
+        "sylius/sylius": "~1.11.0 || ~1.12.0",
         "portphp/portphp": "^1.2",
-        "symfony/stopwatch": "^4.4 || ^5.2",
-        "queue-interop/queue-interop": "^0.6.2 || ^0.7 || ^0.8"
+        "queue-interop/queue-interop": "^0.6.2 || ^0.7 || ^0.8",
+        "symfony/stopwatch": "^5.2 || ^6.0"
     },
     "suggest": {
         "portphp/spreadsheet": "To support importing Excel and LibreOffice Calc files, use version ^1.1",
@@ -17,35 +18,32 @@
         "enqueue/sqs" : "To support message queuing via sqs"
     },
     "require-dev": {
-        "behat/behat": "^3.6.1",
-        "behat/mink": "^1.8",
-        "behat/mink-selenium2-driver": "^1.3",
+        "behat/behat": "^3.7",
+        "behat/mink-selenium2-driver": "^1.4",
         "enqueue/redis": "^0.8.23",
-        "friendsofsymfony/oauth-server-bundle": "^1.6 || >2.0.0-alpha.0 ^2.0@dev",
+        "friends-of-behat/mink": "^1.8",
         "friends-of-behat/mink-browserkit-driver": "^1.4",
-        "friends-of-behat/mink-extension": "^2.4",
         "friends-of-behat/mink-debug-extension": "^2.0",
+        "friends-of-behat/mink-extension": "^2.4",
         "friends-of-behat/page-object-extension": "^0.3",
         "friends-of-behat/suite-settings-extension": "^1.0",
-        "friends-of-behat/symfony-extension": "^2.2",
-        "friends-of-behat/variadic-extension": "^1.1",
+        "friends-of-behat/symfony-extension": "^2.1",
+        "friends-of-behat/variadic-extension": "^1.3",
         "phpspec/phpspec": "^7.0",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "0.12.82",
         "phpstan/phpstan-doctrine": "0.12.33",
         "phpstan/phpstan-strict-rules": "^0.12.0",
         "phpstan/phpstan-webmozart-assert": "0.12.12",
         "phpunit/phpunit": "^9.5",
-        "sensiolabs/security-checker": "^6.0",
         "sylius-labs/coding-standard": "^3.2 || ^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/mailer": "^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/mailer": "^5.4 || ^6.0",
         "symfony/webpack-encore-bundle": "^1.15",
-        "symfony/web-profiler-bundle": "^4.4 || ^5.2",
-        "symfony/web-server-bundle": "^4.4 || ^5.2",
+        "symfony/web-profiler-bundle": "^5.4 || ^6.0",
         "portphp/csv": "^1.1.0",
         "portphp/spreadsheet": "^1.0.0-alpha",
         "predis/predis": "^1.1"

src/Controller/ImportDataController.php

@@ -15,6 +15,7 @@
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
 use Twig\Environment;
@@ -35,14 +36,14 @@ final class ImportDataController
 
     public function __construct(
         ServiceRegistryInterface $registry,
-        FlashBagInterface $flashBag,
+        RequestStack $requestStack,
         FormFactoryInterface $formFactory,
         Environment $twig
     ) {
         $this->registry = $registry;
         $this->formFactory = $formFactory;
         $this->twig = $twig;
-        $this->flashBag = $flashBag;
+        $this->flashBag = $requestStack->getCurrentRequest()->getSession()->getFlashBag();
     }
 
     public function importFormAction(Request $request): Response

src/DependencyInjection/ParameterBag/ParameterBag.php

@@ -26,23 +26,23 @@ public function __construct(Container $container)
     /**
      * {@inheritdoc}
      */
-    public function all()
+    public function all(): array
     {
         return $this->container->getParameterBag()->all();
     }
 
     /**
      * {@inheritdoc}
      */
-    public function get($name)
+    public function get($name): array|bool|string|int|float|\UnitEnum|null
     {
         return $this->container->getParameter($name);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function has($name)
+    public function has($name): bool
     {
         return $this->container->hasParameter($name);
     }

src/Resources/config/services.yml

@@ -11,7 +11,7 @@ services:
         class: FriendsOfSylius\SyliusImportExportPlugin\Controller\ImportDataController
         arguments:
             - "@sylius.importers_registry"
-            - "@session.flash_bag"
+            - "@request_stack"
             - "@form.factory"
             - "@twig"
         tags: ['controller.service_arguments']

tests/Application/Kernel.php

@@ -12,7 +12,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
-use Symfony\Component\Routing\RouteCollectionBuilder;
+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
 final class Kernel extends BaseKernel
 {
@@ -41,24 +41,7 @@ public function registerBundles(): iterable
         }
     }
 
-    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
-    {
-        foreach ($this->getConfigurationDirectories() as $confDir) {
-            $bundlesFile = $confDir . '/bundles.php';
-            if (false === is_file($bundlesFile)) {
-                continue;
-            }
-            $container->addResource(new FileResource($bundlesFile));
-        }
-
-        $container->setParameter('container.dumper.inline_class_loader', true);
-
-        foreach ($this->getConfigurationDirectories() as $confDir) {
-            $this->loadContainerConfiguration($loader, $confDir);
-        }
-    }
-
-    protected function configureRoutes(RouteCollectionBuilder $routes): void
+    protected function configureRoutes(RoutingConfigurator $routes): void
     {
         foreach ($this->getConfigurationDirectories() as $confDir) {
             $this->loadRoutesConfiguration($routes, $confDir);
@@ -79,19 +62,11 @@ private function isTestEnvironment(): bool
         return 0 === strpos($this->getEnvironment(), 'test');
     }
 
-    private function loadContainerConfiguration(LoaderInterface $loader, string $confDir): void
-    {
-        $loader->load($confDir . '/{packages}/*' . self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir . '/{packages}/' . $this->environment . '/**/*' . self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir . '/{services}' . self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir . '/{services}_' . $this->environment . self::CONFIG_EXTS, 'glob');
-    }
-
-    private function loadRoutesConfiguration(RouteCollectionBuilder $routes, string $confDir): void
+    private function loadRoutesConfiguration(RoutingConfigurator $routes, string $confDir): void
     {
-        $routes->import($confDir . '/{routes}/*' . self::CONFIG_EXTS, '/', 'glob');
-        $routes->import($confDir . '/{routes}/' . $this->environment . '/**/*' . self::CONFIG_EXTS, '/', 'glob');
-        $routes->import($confDir . '/{routes}' . self::CONFIG_EXTS, '/', 'glob');
+        $routes->import($confDir . '/{routes}/*' . self::CONFIG_EXTS);
+        $routes->import($confDir . '/{routes}/' . $this->environment . '/**/*' . self::CONFIG_EXTS);
+        $routes->import($confDir . '/{routes}' . self::CONFIG_EXTS);
     }
 
     /**

tests/Application/config/bootstrap.php

@@ -13,6 +13,10 @@
     $_ENV += $env;
 } elseif (!class_exists(Dotenv::class)) {
     throw new RuntimeException('Please run "composer require symfony/dotenv" to load the ".env" files configuring the application.');
+} elseif (method_exists(Dotenv::class, 'bootEnv')) {
+    (new Dotenv())->bootEnv(dirname(__DIR__) . '/.env');
+
+    return;
 } else {
     // load all the .env files
     (new Dotenv(true))->loadEnv(dirname(__DIR__) . '/.env');

tests/Application/config/bundles.php

@@ -46,8 +46,6 @@
     Sylius\Bundle\ThemeBundle\SyliusThemeBundle::class => ['all' => true],
     Sylius\Bundle\AdminBundle\SyliusAdminBundle::class => ['all' => true],
     Sylius\Bundle\ShopBundle\SyliusShopBundle::class => ['all' => true],
-    FOS\OAuthServerBundle\FOSOAuthServerBundle::class => ['all' => true],
-    Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle::class => ['all' => true],
     FriendsOfSylius\SyliusImportExportPlugin\FOSSyliusImportExportPlugin::class => ['all' => true],
     Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],

tests/Application/config/packages/_sylius.yaml

@@ -2,7 +2,6 @@ imports:
     - { resource: "@SyliusCoreBundle/Resources/config/app/config.yml" }
 
     - { resource: "@SyliusAdminBundle/Resources/config/app/config.yml" }
-    - { resource: "@SyliusAdminApiBundle/Resources/config/app/config.yml" }
 
     - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }