Merge pull request #50 from brefphp/symfony-6

Symfony 6 compatibility
brefphp · Dec 28, 2021 · d06e657 · d06e657
2 parents bd40727 + b9f815d
commit d06e657
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,8 +10,14 @@ jobs:
       max-parallel: 10
       fail-fast: false
       matrix:
-        php: ['7.3', '7.4', '8.0']
-        sf_version: ['4.4.*', '5.0.*', '5.2.*']
+        php: ['7.3', '7.4', '8.0', '8.1']
+        sf_version: ['4.4.*', '5.0.*', '5.2.*', '5.4.*', '6.0.*']
+        exclude:
+          - php: 7.3
+            sf_version: 6.0.*
+
+          - php: 7.4
+            sf_version: 6.0.*
 
     steps:
       - name: Set up PHP

diff --git a/composer.json b/composer.json
@@ -21,17 +21,21 @@
     "require": {
         "php": ">=7.3",
         "bref/bref": "^1.0",
-        "symfony/filesystem": "^4.4|^5.0",
-        "symfony/http-kernel": "^4.4|^5.0"
+        "symfony/filesystem": "^4.4|^5.0|^6.0",
+        "symfony/http-kernel": "^4.4|^5.0|^6.0"
     },
     "require-dev": {
         "mnapoli/hard-mode": "^0.3.0",
         "phpunit/phpunit": "^8.0",
-        "symfony/config": "^4.4|^5.0",
-        "symfony/dependency-injection": "^4.4|^5.0",
-        "symfony/process": "^4.4|^5.0"
+        "symfony/config": "^4.4|^5.0|^6.0",
+        "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+        "symfony/process": "^4.4|^5.0|^6.0"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "symfony/runtime": false
+        }
     }
 }
diff --git a/src/BrefKernel.php b/src/BrefKernel.php
@@ -3,6 +3,7 @@
 namespace Bref\SymfonyBridge;
 
 use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Kernel;
 
@@ -13,10 +14,7 @@ public function isLambda(): bool
         return getenv('LAMBDA_TASK_ROOT') !== false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         if ($this->isLambda()) {
             return '/tmp/cache/' . $this->environment;
@@ -25,10 +23,7 @@ public function getCacheDir()
         return parent::getCacheDir();
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function getLogDir()
+    public function getLogDir(): string
     {
         if ($this->isLambda()) {
             return '/tmp/log/';
@@ -46,7 +41,7 @@ public function getLogDir()
      *
      * @see https://github.com/brefphp/symfony-bridge/pull/37
      */
-    public function handle($request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
+    public function handle($request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true): Response
     {
         $this->prepareCacheDir(parent::getCacheDir(), $this->getCacheDir());
 

diff --git a/tests/Functional/App/.gitignore b/tests/Functional/App/.gitignore
@@ -1,6 +1,7 @@
 composer.lock
 symfony.lock
 tmp/
+config/preload.php
 
 ###> symfony/framework-bundle ###
 /.env.local

diff --git a/tests/Functional/App/src/Kernel.php b/tests/Functional/App/src/Kernel.php
@@ -8,7 +8,6 @@
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Routing\RouteCollectionBuilder;
 
 class Kernel extends BrefKernel
 {
@@ -44,13 +43,13 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         $loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob');
     }
 
-    protected function configureRoutes(RouteCollectionBuilder $routes): void
+    protected function configureRoutes($routes): void
     {
         $confDir = $this->getProjectDir().'/config';
 
         $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, '/', 'glob');
+        $routes->import($confDir.'/routes.yaml');
     }
 
     /**

diff --git a/tests/Functional/FunctionalTest.php b/tests/Functional/FunctionalTest.php
@@ -36,7 +36,7 @@ abstract public function test Symfony works(): void;
     protected function composerInstall(): void
     {
         $symfonyRequirement = getenv('SYMFONY_REQUIRE');
-        $symfonyRequirement = $symfonyRequirement === false ? '4.4.*' : $symfonyRequirement;
+        $symfonyRequirement = $symfonyRequirement === false ? '6.0.*' : $symfonyRequirement;
 
         $composerInstall = new Process([
             'composer',
@@ -128,7 +128,7 @@ private function runInDockerProcess(array $command): Process
     {
         $projectRoot = dirname(__DIR__, 2);
         $phpVersion = getenv('PHP_VERSION');
-        $phpVersion = $phpVersion === false ? '74' : str_replace('.', '', $phpVersion);
+        $phpVersion = $phpVersion === false ? '81' : str_replace('.', '', $phpVersion);
 
         $baseCommand = [
             'docker',