Merge pull request #53 from SymfonyTest/merge-1.x

Merge branch 1.x into master
SymfonyTest · Aug 20, 2021 · d7cbc75 · d7cbc75
2 parents 1c1922b + d0abf94
commit d7cbc75
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 14 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,12 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
 
+## 1.8.1
+
+### Fixed
+
+- Symfony 6 compatibility issues
+
 ## 1.8.0
 
 ### Added

diff --git a/psalm.baseline.xml b/psalm.baseline.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="4.8.1@f73f2299dbc59a3e6c4d66cff4605176e728ee69">
+  <file src="src/AppKernel.php">
+    <InvalidReturnStatement occurrences="1">
+      <code>$bundles</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>iterable</code>
+    </InvalidReturnType>
+    <ReservedWord occurrences="1">
+      <code>$loader-&gt;getResolver()-&gt;resolve($file, 'php')</code>
+    </ReservedWord>
+    <UndefinedClass occurrences="1">
+      <code>RouteCollectionBuilder</code>
+    </UndefinedClass>
+  </file>
   <file src="src/BaseBundleTestCase.php">
     <UndefinedClass occurrences="1">
       <code>ResettableContainerInterface</code>

diff --git a/src/AppKernel.php b/src/AppKernel.php
@@ -8,6 +8,9 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+use Symfony\Component\Routing\Loader\PhpFileLoader as RoutingPhpFileLoader;
+use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RouteCollectionBuilder;
 
 /**
@@ -79,17 +82,17 @@ public function addConfigFile($configFile)
         $this->configFiles[] = $configFile;
     }
 
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return sys_get_temp_dir().'/NyholmBundleTest/'.$this->cachePrefix;
     }
 
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return sys_get_temp_dir().'/NyholmBundleTest/log';
     }
 
-    public function getProjectDir()
+    public function getProjectDir(): string
     {
         if (null === $this->fakedProjectDir) {
             return realpath(__DIR__.'/../../../../');
@@ -114,7 +117,7 @@ public function setProjectDir($projectDir)
         $this->fakedProjectDir = $projectDir;
     }
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         $this->bundlesToRegister = array_unique($this->bundlesToRegister);
         $bundles = [];
@@ -169,21 +172,40 @@ public function registerContainerConfiguration(LoaderInterface $loader)
      */
     public function loadRoutes(LoaderInterface $loader)
     {
-        $routes = new RouteCollectionBuilder($loader);
+        if (class_exists(RoutingConfigurator::class)) {
+            $file = (new \ReflectionObject($this))->getFileName();
+            /** @var RoutingPhpFileLoader $kernelLoader */
+            $kernelLoader = $loader->getResolver()->resolve($file, 'php');
+            $kernelLoader->setCurrentDir(\dirname($file));
+
+            $collection = new RouteCollection();
+            $configurator = new RoutingConfigurator($collection, $kernelLoader, $file, $file, $this->getEnvironment());
+
+            if ($this->routingFile) {
+                $configurator->import($this->routingFile);
+            } else {
+                $configurator->import(__DIR__.'/config/routing.yml');
+            }
 
-        if ($this->routingFile) {
-            $routes->import($this->routingFile);
+            return $collection;
         } else {
-            $routes->import(__DIR__.'/config/routing.yml');
-        }
+            // Legacy
+            $routes = new RouteCollectionBuilder($loader);
 
-        return $routes->build();
+            if ($this->routingFile) {
+                $routes->import($this->routingFile);
+            } else {
+                $routes->import(__DIR__.'/config/routing.yml');
+            }
+
+            return $routes->build();
+        }
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function buildContainer()
+    protected function buildContainer(): ContainerBuilder
     {
         $container = parent::buildContainer();
 

diff --git a/tests/Functional/BundleConfigurationTest.php b/tests/Functional/BundleConfigurationTest.php
@@ -6,13 +6,14 @@
 use Nyholm\BundleTest\Tests\Fixtures\ConfigurationBundle\ConfigurationBundle;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\KernelInterface;
 
 /**
  * @author Laurent VOULLEMIER <[email protected]>
  */
 final class BundleConfigurationTest extends KernelTestCase
 {
-    protected static function createKernel(array $options = [])
+    protected static function createKernel(array $options = []): KernelInterface
     {
         KernelTestCase::$class = AppKernel::class;
 

diff --git a/tests/Functional/BundleInitializationTest.php b/tests/Functional/BundleInitializationTest.php
@@ -5,13 +5,14 @@
 use Nyholm\BundleTest\AppKernel;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\HttpKernel\KernelInterface;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 class BundleInitializationTest extends KernelTestCase
 {
-    protected static function createKernel(array $options = [])
+    protected static function createKernel(array $options = []): KernelInterface
     {
         KernelTestCase::$class = AppKernel::class;
 

diff --git a/tests/Functional/BundleRoutingTest.php b/tests/Functional/BundleRoutingTest.php
@@ -5,11 +5,12 @@
 use Nyholm\BundleTest\AppKernel;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Routing\RouterInterface;
 
 class BundleRoutingTest extends KernelTestCase
 {
-    protected static function createKernel(array $options = [])
+    protected static function createKernel(array $options = []): KernelInterface
     {
         KernelTestCase::$class = AppKernel::class;