Merge pull request #29 from delyriand/feature/update_1.12

Update for sylius 1.12

Author: jacquesbh

.github/workflows/recipe.yaml

@@ -14,15 +14,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', '8.0']
-        sylius: ['~1.8.0', '~1.9.0', '~1.10.0', '~1.11.0']
+        php: ['7.4', '8.0', '8.1']
+        sylius: ['~1.8.0', '~1.9.0', '~1.10.0', '~1.11.0', '~1.12.0']
         exclude:
           - php: '8.0'
             sylius: '~1.8.0'
           - php: '8.0'
             sylius: '~1.9.0'
+          - php: '8.1'
+            sylius: '~1.8.0'
+          - php: '8.1'
+            sylius: '~1.9.0'
           - php: '7.4'
             sylius: '~1.11.0'
+          - php: '7.4'
+            sylius: '~1.12.0'
 
     steps:
       - name: Setup PHP

.github/workflows/security.yaml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', '8.0']
+        php: ['7.4', '8.0', '8.1']
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/tests.yaml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.0']
+        php: ['8.0', '8.1']
 
     env:
       SYMFONY_ARGS: --no-tls

.php-version.dist

@@ -1 +1 @@
-8.0
+8.1

Makefile

@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := help
 SHELL=/bin/bash
 APP_DIR=tests/Application
-SYLIUS_VERSION=1.11.0
+SYLIUS_VERSION=1.12.0
 SYMFONY=cd ${APP_DIR} && symfony
 COMPOSER=symfony composer
 CONSOLE=${SYMFONY} console

composer.json

@@ -5,8 +5,8 @@
     "description": "Disable the e-commerce on your Sylius.",
     "license": "MIT",
     "require": {
-        "php": "~7.4|^8.0",
-        "sylius/sylius": ">=1.8 <1.12",
+        "php": "~7.4|~8.0|~8.1",
+        "sylius/sylius": ">=1.8 <1.13",
         "monsieurbiz/sylius-settings-plugin": "^1.0.9"
     },
     "require-dev": {
@@ -71,5 +71,11 @@
                 "flex://defaults"
             ]
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": true,
+            "symfony/flex": true
+        }
     }
 }

dist/src/Kernel.php

@@ -15,62 +15,15 @@
 
 use MonsieurBiz\SyliusNoCommercePlugin\Kernel\SyliusNoCommerceKernelTrait;
 use PSS\SymfonyMockerContainer\DependencyInjection\MockerContainer;
-use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
-use Symfony\Component\Routing\RouteCollectionBuilder;
 
 final class Kernel extends BaseKernel
 {
     use SyliusNoCommerceKernelTrait;
 
-    private const CONFIG_EXTS = '.{php,xml,yaml,yml}';
-
-    public function getCacheDir(): string
-    {
-        return $this->getProjectDir() . '/var/cache/' . $this->environment;
-    }
-
-    public function getLogDir(): string
-    {
-        return $this->getProjectDir() . '/var/log';
-    }
-
-    public function registerBundles(): iterable
-    {
-        $contents = require $this->getProjectDir() . '/config/bundles.php';
-        foreach ($contents as $class => $envs) {
-            if (isset($envs['all']) || isset($envs[$this->environment])) {
-                yield new $class();
-            }
-        }
-    }
-
-    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
-    {
-        $container->addResource(new FileResource($this->getProjectDir() . '/config/bundles.php'));
-        $container->setParameter('container.dumper.inline_class_loader', true);
-        $confDir = $this->getProjectDir() . '/config';
-
-        $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');
-    }
-
-    protected function configureRoutes(RouteCollectionBuilder $routes): void
-    {
-        $confDir = $this->getProjectDir() . '/config';
-
-        $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');
-    }
-
     protected function getContainerBaseClass(): string
     {
-        if ($this->isTestEnvironment()) {
+        if (class_exists(MockerContainer::class) && $this->isTestEnvironment()) {
             return MockerContainer::class;
         }
 
@@ -79,6 +32,6 @@ protected function getContainerBaseClass(): string
 
     private function isTestEnvironment(): bool
     {
-        return 0 === strpos($this->getEnvironment(), 'test');
+        return str_starts_with($this->getEnvironment(), 'test');
     }
 }