Allow Symfony 6

Author: franmomu

.github/workflows/phpunit.yml

@@ -47,6 +47,12 @@ jobs:
             dependencies: highest
             symfony: '5.4.*'
             stability: 'dev'
+
+          # Test Symfony 6.0 dev version
+          - php: '8.0'
+            dependencies: highest
+            symfony: '6.0.*'
+            stability: 'dev'
     steps:
       - name: Checkout
         uses: actions/checkout@v2

composer.json

@@ -25,12 +25,12 @@
         "php": "^7.4|^8.0",
         "ext-mbstring": "*",
         "imagine/imagine": "^1.2.4",
-        "symfony/filesystem": "^4.4|^5.3",
-        "symfony/finder": "^4.4|^5.3",
-        "symfony/framework-bundle": "^3.4.23|^4.4|^5.3",
-        "symfony/mime": "^4.4|^5.3",
-        "symfony/options-resolver": "^4.4|^5.3",
-        "symfony/process": "^4.4|^5.3",
+        "symfony/filesystem": "^4.4|^5.3|^6.0",
+        "symfony/finder": "^4.4|^5.3|^6.0",
+        "symfony/framework-bundle": "^3.4.23|^4.4|^5.3|^6.0",
+        "symfony/mime": "^4.4|^5.3|^6.0",
+        "symfony/options-resolver": "^4.4|^5.3|^6.0",
+        "symfony/process": "^4.4|^5.3|^6.0",
         "twig/twig": "^1.44|^2.9|^3.0"
     },
     "require-dev": {
@@ -42,16 +42,16 @@
         "phpstan/phpstan": "^0.12.64",
         "psr/cache": "^1.0|^2.0|^3.0",
         "psr/log": "^1.0",
-        "symfony/browser-kit": "^4.4|^5.3",
-        "symfony/cache": "^4.4|^5.3",
-        "symfony/console": "^4.4|^5.3",
-        "symfony/dependency-injection": "^4.4|^5.3",
-        "symfony/form": "^4.4|^5.3",
-        "symfony/messenger": "^4.4|^5.3",
+        "symfony/browser-kit": "^4.4|^5.3|^6.0",
+        "symfony/cache": "^4.4|^5.3|^6.0",
+        "symfony/console": "^4.4|^5.3|^6.0",
+        "symfony/dependency-injection": "^4.4|^5.3|^6.0",
+        "symfony/form": "^4.4|^5.3|^6.0",
+        "symfony/messenger": "^4.4|^5.3|^6.0",
         "symfony/phpunit-bridge": "^5.3",
-        "symfony/templating": "^4.4|^5.3",
-        "symfony/validator": "^4.4|^5.3",
-        "symfony/yaml": "^4.4|^5.3"
+        "symfony/templating": "^4.4|^5.3|^6.0",
+        "symfony/validator": "^4.4|^5.3|^6.0",
+        "symfony/yaml": "^4.4|^5.3|^6.0"
     },
     "suggest": {
         "ext-exif": "required to read EXIF metadata from images",

tests/Functional/AbstractWebTestCase.php

@@ -16,20 +16,14 @@
 
 abstract class AbstractWebTestCase extends WebTestCase
 {
-    /**
-     * @return string
-     */
-    public static function getKernelClass()
+    public static function getKernelClass(): string
     {
         require_once __DIR__.'/app/AppKernel.php';
 
         return AppKernel::class;
     }
 
-    /**
-     * @return object
-     */
-    protected function getService(string $name)
+    protected function getService(string $name): ?object
     {
         if (property_exists($this, 'container')) {
             return static::$container->get($name);
@@ -51,11 +45,9 @@ protected function getParameter(string $name)
     }
 
     /**
-     * @param object $object
-     *
      * @return mixed
      */
-    protected function getPrivateProperty($object, string $name)
+    protected function getPrivateProperty(object $object, string $name)
     {
         $r = new \ReflectionObject($object);