Merge pull request #179 from javer/symfony6

Yozhef · web-flow · commit 9b8f75e4f327 · 2021-12-13T14:53:35.000+02:00
Add Symfony 6 support and bump PHP to 7.4
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,56 +1,56 @@
 name: Build
 
 on:
-    push: ~
-    pull_request: ~
-    release:
-        types: [created]
-    schedule:
-        -
-            cron: "0 1 * * 6" # Run at 1am every Saturday
+    push:
+    pull_request:
+        types: [opened, synchronize, edited, reopened]
 
 jobs:
-    tests:
-        runs-on: ubuntu-latest
-        name: "PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}"
+    test:
+        name: PHP ${{ matrix.php-version }} + Symfony ${{ matrix.symfony-version }}
+        runs-on: ubuntu-20.04
+        continue-on-error: false
         strategy:
             fail-fast: false
             matrix:
-                php: ["7.3", "7.4", "8.0", "8.1"]
-                symfony: ["4.4.*", "5.1.*"]
-
+                php-version:
+                    - '7.4'
+                    - '8.0'
+                    - '8.1'
+                symfony-version:
+                    - '4.4.*'
+                    - '5.4.*'
+                    - '6.0.*'
+                exclude:
+                    - php-version: '7.4'
+                      symfony-version: '6.0.*'
         steps:
-            -
-                uses: actions/checkout@v2
-
-            -
-                name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: "${{ matrix.php }}"
-                    coverage: none
-
-            -
-                name: Update Symfony version
-                if: matrix.symfony != ''
-                run: |
-                    composer require symfony/dependency-injection:${{ matrix.symfony }} --no-update --no-scripts
-                    composer require symfony/http-kernel:${{ matrix.symfony }} --no-update --no-scripts
-                    composer require symfony/proxy-manager-bridge:${{ matrix.symfony }} --no-update --no-scripts
-
-                    composer require --dev symfony/browser-kit:${{ matrix.symfony }} --no-update --no-scripts
-                    composer require --dev symfony/framework-bundle:${{ matrix.symfony }} --no-update --no-scripts
-                    composer require --dev symfony/process:${{ matrix.symfony }} --no-update --no-scripts
-                    composer require --dev symfony/yaml:${{ matrix.symfony }} --no-update --no-scripts
-
-            -
-                name: Install dependencies
-                run: composer update
-
-            -
-                name: Run analysis
-                run: composer analyse
-
-            -
-                name: Run tests
-                run: composer test
+            - name: Checkout
+              uses: actions/checkout@v2
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  coverage: none
+                  ini-values: "memory_limit=-1"
+                  php-version: ${{ matrix.php-version }}
+                  tools: composer:v2, flex
+
+            - name: Validate composer.json
+              run: composer validate --no-check-lock
+
+            - name: Remove analysis dependencies
+              run: composer remove --dev --no-update sylius-labs/coding-standard vimeo/psalm
+              if: matrix.symfony-version == '6.0.*'
+
+            - name: Install dependencies
+              run: composer install --prefer-dist --no-progress
+              env:
+                  SYMFONY_REQUIRE: "${{ matrix.symfony-version }}"
+
+            - name: Run analysis
+              run: composer analyse
+              if: matrix.symfony-version != '6.0.*'
+
+            - name: Run tests
+              run: composer test
diff --git a/composer.json b/composer.json
@@ -11,11 +11,11 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "behat/behat": "^3.6.1",
-        "symfony/dependency-injection": "^4.4 || ^5.1",
-        "symfony/http-kernel": "^4.4 || ^5.1",
-        "symfony/proxy-manager-bridge": "^4.4 || ^5.1"
+        "symfony/dependency-injection": "^4.4 || ^5.1 || ^6.0",
+        "symfony/http-kernel": "^4.4 || ^5.1 || ^6.0",
+        "symfony/proxy-manager-bridge": "^4.4 || ^5.1 || ^6.0"
     },
     "require-dev": {
         "behat/mink-selenium2-driver": "^1.3",
@@ -25,10 +25,10 @@
         "friends-of-behat/page-object-extension": "^0.3.2",
         "friends-of-behat/service-container-extension": "^1.1",
         "sylius-labs/coding-standard": "^3.2",
-        "symfony/browser-kit": "^4.4 || ^5.1",
-        "symfony/framework-bundle": "^4.4 || ^5.1",
-        "symfony/process": "^4.4 || ^5.1",
-        "symfony/yaml": "^4.4 || ^5.1",
+        "symfony/browser-kit": "^4.4 || ^5.1 || ^6.0",
+        "symfony/framework-bundle": "^4.4 || ^5.1 || ^6.0",
+        "symfony/process": "^4.4 || ^5.1 || ^6.0",
+        "symfony/yaml": "^4.4 || ^5.1 || ^6.0",
         "vimeo/psalm": "4.4.1"
     },
     "suggest": {
diff --git a/features/configuration/autodiscovering_application_kernel.feature b/features/configuration/autodiscovering_application_kernel.feature
@@ -61,7 +61,6 @@ Feature: Autodiscovering the application kernel
         use Symfony\Component\DependencyInjection\ContainerBuilder;
         use Symfony\Component\HttpFoundation\Response;
         use Symfony\Component\HttpKernel\Kernel as HttpKernel;
-        use Symfony\Component\Routing\RouteCollectionBuilder;
 
         class Kernel extends HttpKernel
         {
@@ -85,7 +84,7 @@ Feature: Autodiscovering the application kernel
                 $loader->load(__DIR__ . '/../config/services.yaml');
             }
 
-            protected function configureRoutes(RouteCollectionBuilder $routes): void {}
+            protected function configureRoutes($routes): void {}
         }
         """
         When I run Behat
@@ -101,7 +100,6 @@ Feature: Autodiscovering the application kernel
         use Symfony\Component\DependencyInjection\ContainerBuilder;
         use Symfony\Component\HttpFoundation\Response;
         use Symfony\Component\HttpKernel\Kernel as HttpKernel;
-        use Symfony\Component\Routing\RouteCollectionBuilder;
 
         class AppKernel extends HttpKernel
         {
@@ -125,7 +123,7 @@ Feature: Autodiscovering the application kernel
                 $loader->load(__DIR__ . '/../config/services.yaml');
             }
 
-            protected function configureRoutes(RouteCollectionBuilder $routes): void {}
+            protected function configureRoutes($routes): void {}
         }
         """
         When I run Behat
@@ -147,7 +145,6 @@ Feature: Autodiscovering the application kernel
         use Symfony\Component\DependencyInjection\ContainerBuilder;
         use Symfony\Component\HttpFoundation\Response;
         use Symfony\Component\HttpKernel\Kernel as HttpKernel;
-        use Symfony\Component\Routing\RouteCollectionBuilder;
 
         class Kernel extends HttpKernel
         {
@@ -171,7 +168,7 @@ Feature: Autodiscovering the application kernel
                 $loader->load(__DIR__ . '/../config/services.yaml');
             }
 
-            protected function configureRoutes(RouteCollectionBuilder $routes): void {}
+            protected function configureRoutes($routes): void {}
         }
         """
         And a kernel file "app/AppKernel.php" containing:
@@ -183,7 +180,6 @@ Feature: Autodiscovering the application kernel
         use Symfony\Component\DependencyInjection\ContainerBuilder;
         use Symfony\Component\HttpFoundation\Response;
         use Symfony\Component\HttpKernel\Kernel as HttpKernel;
-        use Symfony\Component\Routing\RouteCollectionBuilder;
 
         class AppKernel extends HttpKernel
         {
@@ -207,7 +203,7 @@ Feature: Autodiscovering the application kernel
                 $loader->load(__DIR__ . '/../config/services.yaml');
             }
 
-            protected function configureRoutes(RouteCollectionBuilder $routes): void {}
+            protected function configureRoutes($routes): void {}
         }
         """
         When I run Behat
diff --git a/features/configuration/loading_configured_application_kernel.feature b/features/configuration/loading_configured_application_kernel.feature
@@ -66,7 +66,6 @@ Feature: Loading configured application kernel
         use Symfony\Component\DependencyInjection\ContainerBuilder;
         use Symfony\Component\HttpFoundation\Response;
         use Symfony\Component\HttpKernel\Kernel as HttpKernel;
-        use Symfony\Component\Routing\RouteCollectionBuilder;
 
         class Kernel extends HttpKernel
         {
@@ -90,7 +89,7 @@ Feature: Loading configured application kernel
                 $loader->load(__DIR__ . '/../../config/services.yaml');
             }
 
-            protected function configureRoutes(RouteCollectionBuilder $routes): void {}
+            protected function configureRoutes($routes): void {}
         }
         """
         When I run Behat
@@ -115,7 +114,6 @@ Feature: Loading configured application kernel
         use Symfony\Component\DependencyInjection\ContainerBuilder;
         use Symfony\Component\HttpFoundation\Response;
         use Symfony\Component\HttpKernel\Kernel as HttpKernel;
-        use Symfony\Component\Routing\RouteCollectionBuilder;
 
         class AppKernel extends HttpKernel
         {
@@ -139,7 +137,7 @@ Feature: Loading configured application kernel
                 $loader->load(__DIR__ . '/../../config/services.yaml');
             }
 
-            protected function configureRoutes(RouteCollectionBuilder $routes): void {}
+            protected function configureRoutes($routes): void {}
         }
         """
         When I run Behat
diff --git a/psalm.xml b/psalm.xml
@@ -19,7 +19,13 @@
             <errorLevel type="suppress">
                 <referencedClass name="Symfony\Component\BrowserKit\AbstractBrowser" />
                 <referencedClass name="Symfony\Component\BrowserKit\Client" />
+                <referencedClass name="Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator" />
             </errorLevel>
         </UndefinedClass>
+        <InvalidAttribute>
+            <errorLevel type="suppress">
+                <file name="src/Mink/MinkParameters.php" />
+            </errorLevel>
+        </InvalidAttribute>
     </issueHandlers>
 </psalm>
diff --git a/tests/Behat/Context/TestContext.php b/tests/Behat/Context/TestContext.php
@@ -100,7 +100,7 @@ class: App\Kernel
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel as HttpKernel;
-use Symfony\Component\Routing\RouteCollectionBuilder;
+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
 class Kernel extends HttpKernel
 {
@@ -125,9 +125,16 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         $loader->load(__DIR__ . '/../config/services.yaml');
     }
     
-    protected function configureRoutes(RouteCollectionBuilder $routes): void
+    protected function configureRoutes($routes): void
     {
-        $routes->add('/hello-world', 'App\Controller:helloWorld');
+        if ($routes instanceof RoutingConfigurator) { // available since Symfony 5.1
+            $routes
+                ->add('app_hello', '/hello-world')
+                ->controller('App\Controller::helloWorld')
+            ;
+        } else { // support Symfony 4.4  
+            $routes->add('/hello-world', 'App\Controller:helloWorld');
+        }
     }
 }
 CON

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ Feature: Autodiscovering the application kernel`
`61`	`61`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`62`	`62`	`use Symfony\Component\HttpFoundation\Response;`
`63`	`63`	`use Symfony\Component\HttpKernel\Kernel as HttpKernel;`
`64`		`- use Symfony\Component\Routing\RouteCollectionBuilder;`
`65`	`64`
`66`	`65`	`class Kernel extends HttpKernel`
`67`	`66`	`{`
`@@ -85,7 +84,7 @@ Feature: Autodiscovering the application kernel`
`85`	`84`	`$loader->load(__DIR__ . '/../config/services.yaml');`
`86`	`85`	`}`
`87`	`86`
`88`		`- protected function configureRoutes(RouteCollectionBuilder $routes): void {}`
	`87`	`+ protected function configureRoutes($routes): void {}`
`89`	`88`	`}`
`90`	`89`	`"""`
`91`	`90`	`When I run Behat`
`@@ -101,7 +100,6 @@ Feature: Autodiscovering the application kernel`
`101`	`100`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`102`	`101`	`use Symfony\Component\HttpFoundation\Response;`
`103`	`102`	`use Symfony\Component\HttpKernel\Kernel as HttpKernel;`
`104`		`- use Symfony\Component\Routing\RouteCollectionBuilder;`
`105`	`103`
`106`	`104`	`class AppKernel extends HttpKernel`
`107`	`105`	`{`
`@@ -125,7 +123,7 @@ Feature: Autodiscovering the application kernel`
`125`	`123`	`$loader->load(__DIR__ . '/../config/services.yaml');`
`126`	`124`	`}`
`127`	`125`
`128`		`- protected function configureRoutes(RouteCollectionBuilder $routes): void {}`
	`126`	`+ protected function configureRoutes($routes): void {}`
`129`	`127`	`}`
`130`	`128`	`"""`
`131`	`129`	`When I run Behat`
`@@ -147,7 +145,6 @@ Feature: Autodiscovering the application kernel`
`147`	`145`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`148`	`146`	`use Symfony\Component\HttpFoundation\Response;`
`149`	`147`	`use Symfony\Component\HttpKernel\Kernel as HttpKernel;`
`150`		`- use Symfony\Component\Routing\RouteCollectionBuilder;`
`151`	`148`
`152`	`149`	`class Kernel extends HttpKernel`
`153`	`150`	`{`
`@@ -171,7 +168,7 @@ Feature: Autodiscovering the application kernel`
`171`	`168`	`$loader->load(__DIR__ . '/../config/services.yaml');`
`172`	`169`	`}`
`173`	`170`
`174`		`- protected function configureRoutes(RouteCollectionBuilder $routes): void {}`
	`171`	`+ protected function configureRoutes($routes): void {}`
`175`	`172`	`}`
`176`	`173`	`"""`
`177`	`174`	`And a kernel file "app/AppKernel.php" containing:`
`@@ -183,7 +180,6 @@ Feature: Autodiscovering the application kernel`
`183`	`180`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`184`	`181`	`use Symfony\Component\HttpFoundation\Response;`
`185`	`182`	`use Symfony\Component\HttpKernel\Kernel as HttpKernel;`
`186`		`- use Symfony\Component\Routing\RouteCollectionBuilder;`
`187`	`183`
`188`	`184`	`class AppKernel extends HttpKernel`
`189`	`185`	`{`
`@@ -207,7 +203,7 @@ Feature: Autodiscovering the application kernel`
`207`	`203`	`$loader->load(__DIR__ . '/../config/services.yaml');`
`208`	`204`	`}`
`209`	`205`
`210`		`- protected function configureRoutes(RouteCollectionBuilder $routes): void {}`
	`206`	`+ protected function configureRoutes($routes): void {}`
`211`	`207`	`}`
`212`	`208`	`"""`
`213`	`209`	`When I run Behat`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,6 @@ Feature: Loading configured application kernel`
`66`	`66`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`67`	`67`	`use Symfony\Component\HttpFoundation\Response;`
`68`	`68`	`use Symfony\Component\HttpKernel\Kernel as HttpKernel;`
`69`		`- use Symfony\Component\Routing\RouteCollectionBuilder;`
`70`	`69`
`71`	`70`	`class Kernel extends HttpKernel`
`72`	`71`	`{`
`@@ -90,7 +89,7 @@ Feature: Loading configured application kernel`
`90`	`89`	`$loader->load(__DIR__ . '/../../config/services.yaml');`
`91`	`90`	`}`
`92`	`91`
`93`		`- protected function configureRoutes(RouteCollectionBuilder $routes): void {}`
	`92`	`+ protected function configureRoutes($routes): void {}`
`94`	`93`	`}`
`95`	`94`	`"""`
`96`	`95`	`When I run Behat`
`@@ -115,7 +114,6 @@ Feature: Loading configured application kernel`
`115`	`114`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`116`	`115`	`use Symfony\Component\HttpFoundation\Response;`
`117`	`116`	`use Symfony\Component\HttpKernel\Kernel as HttpKernel;`
`118`		`- use Symfony\Component\Routing\RouteCollectionBuilder;`
`119`	`117`
`120`	`118`	`class AppKernel extends HttpKernel`
`121`	`119`	`{`
`@@ -139,7 +137,7 @@ Feature: Loading configured application kernel`
`139`	`137`	`$loader->load(__DIR__ . '/../../config/services.yaml');`
`140`	`138`	`}`
`141`	`139`
`142`		`- protected function configureRoutes(RouteCollectionBuilder $routes): void {}`
	`140`	`+ protected function configureRoutes($routes): void {}`
`143`	`141`	`}`
`144`	`142`	`"""`
`145`	`143`	`When I run Behat`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ class: App\Kernel`
`100`	`100`	`use Symfony\Component\Config\Loader\LoaderInterface;`
`101`	`101`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`102`	`102`	`use Symfony\Component\HttpKernel\Kernel as HttpKernel;`
`103`		`-use Symfony\Component\Routing\RouteCollectionBuilder;`
	`103`	`+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;`
`104`	`104`
`105`	`105`	`class Kernel extends HttpKernel`
`106`	`106`	`{`
`@@ -125,9 +125,16 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa`
`125`	`125`	`$loader->load(__DIR__ . '/../config/services.yaml');`
`126`	`126`	`}`
`127`	`127`
`128`		`- protected function configureRoutes(RouteCollectionBuilder $routes): void`
	`128`	`+ protected function configureRoutes($routes): void`
`129`	`129`	`{`
`130`		`- $routes->add('/hello-world', 'App\Controller:helloWorld');`
	`130`	`+ if ($routes instanceof RoutingConfigurator) { // available since Symfony 5.1`
	`131`	`+ $routes`
	`132`	`+ ->add('app_hello', '/hello-world')`
	`133`	`+ ->controller('App\Controller::helloWorld')`
	`134`	`+ ;`
	`135`	`+ } else { // support Symfony 4.4`
	`136`	`+ $routes->add('/hello-world', 'App\Controller:helloWorld');`
	`137`	`+ }`
`131`	`138`	`}`
`132`	`139`	`}`
`133`	`140`	`CON`