Merge pull request #50 from chives/dev

Allowed symfony ^6.0 components

Author: rn0

.travis.yml

@@ -7,9 +7,11 @@ matrix:
       - php: 7.4
         env:
           - COMPOSER_FLAGS="--prefer-lowest"
+      - php: 7.4
       - php: 8.0
       - php: 8.1
       - php: 8.2
+      - php: 8.3
 
 env:
   global:

composer.json

@@ -15,7 +15,7 @@
         "twig/twig": "^3.3",
         "symfony/asset": "^4.4|^5.4|^6.0",
         "symfony/options-resolver": "^4.4|^5.4|^6.0",
-        "symfony/framework-bundle" : "^4.4|^5.4",
+        "symfony/framework-bundle" : "^4.4|^5.4|^6.0",
         "symfony/twig-bundle": "^4.4|^5.4|^6.0",
         "symfony/form" : "^4.4|^5.4|^6.0",
         "symfony/validator": "^4.4|^5.4|^6.0"
@@ -26,7 +26,6 @@
         "behat/mink-selenium2-driver": "^1.4",
         "friends-of-behat/mink-browserkit-driver": "^1.6.1",
         "friends-of-behat/mink-debug-extension": "^2.1",
-        "friends-of-behat/mink-browserkit-driver": "^1.5",
         "friends-of-behat/mink-extension": "^2.6",
         "friends-of-behat/symfony-extension": "^2.2",
         "phpspec/phpspec": "^7.1",
@@ -39,7 +38,7 @@
         "symfony/css-selector": "^4.4|^5.4|^6.0",
         "symfony/debug-bundle": "^4.4|^5.4|^6.0",
         "symfony/http-foundation": "^4.4|^5.4|^6.0",
-        "symfony/routing": "^4.4|^5.4",
+        "symfony/routing": "^4.4|^5.4|^6.0",
         "symfony/var-dumper": "^4.4|^5.4|^6.0",
         "symfony/phpunit-bridge": "^6.3"
     },

features/fixtures/project/src/Kernel.php

@@ -18,6 +18,7 @@
 use Symfony\Component\HttpFoundation\Session\SessionFactoryInterface;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 use Symfony\Component\Routing\RouteCollectionBuilder;
 
 use function dirname;
@@ -68,12 +69,21 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         }
     }
 
-    protected function configureRoutes(RouteCollectionBuilder $routes): void
+    /**
+     * @param RoutingConfigurator|RouteCollectionBuilder $routes
+     */
+    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');
+        if (true === $routes instanceof RoutingConfigurator) {
+            $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');
+        } elseif (true === $routes instanceof RouteCollectionBuilder) {
+            $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');
+        }
     }
 }

phpstan.neon

@@ -11,3 +11,8 @@ parameters:
         - '%currentWorkingDirectory%/spec'
         - '%currentWorkingDirectory%/vendor'
         - '%currentWorkingDirectory%/features/fixtures/project/var/cache'
+    reportUnmatchedIgnoredErrors: false
+    ignoreErrors:
+        -
+            message: '#.*Symfony\\Component\\Routing\\RouteCollectionBuilder.*#'
+            path: '%currentWorkingDirectory%/features/fixtures/project/src/Kernel.php'