bump routing

Author: dbu

composer.json

@@ -16,16 +16,16 @@
     ],
     "require": {
         "php": "^8.1",
-        "symfony-cmf/routing": "^3.0",
+        "symfony-cmf/routing": "^3.0.3",
         "symfony/framework-bundle": "^6.4 || ^7.0"
     },
     "require-dev": {
         "doctrine/data-fixtures": "^1.0.0",
-        "doctrine/doctrine-bundle": "^2.0",
+        "doctrine/doctrine-bundle": "^2.8",
         "doctrine/orm": "^2.9 || ^3.0",
         "doctrine/phpcr-bundle": "^3.0",
         "doctrine/phpcr-odm": "^2.0",
-        "jackalope/jackalope-doctrine-dbal": "^1.3 || ^2.0",
+        "jackalope/jackalope-doctrine-dbal": "^2.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1.0 || ^5.1.0",
         "matthiasnoback/symfony-config-test": "^4.1.0 || ^5.1.0",
         "symfony/phpunit-bridge": "^7.0.3",
@@ -36,7 +36,7 @@
         "symfony/translation": "^6.4 || ^7.0",
         "symfony/validator": "^6.4 || ^7.0",
         "symfony/twig-bundle": "^6.4 || ^7.0",
-        "symfony-cmf/testing": "dev-sf7 as 4.2.0",
+        "symfony-cmf/testing": "dev-fix-test-kernel as 5.0.2",
         "twig/twig": "^2.4.4 || ^3.0"
     },
     "suggest": {
@@ -69,6 +69,5 @@
         "allow-plugins": {
             "composer/package-versions-deprecated": true
         }
-    },
-    "minimum-stability": "dev"
+    }
 }

phpunit.xml.dist

@@ -1,36 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit
     colors="true"
     bootstrap="vendor/symfony-cmf/testing/bootstrap/bootstrap.php"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
 >
-
     <testsuites>
         <testsuite name="unit tests">
             <directory>./tests/Unit</directory>
         </testsuite>
-
         <testsuite name="functional tests with phpcr">
             <directory>./tests/Functional</directory>
             <exclude>./tests/Functional/Doctrine/Orm</exclude>
         </testsuite>
-
         <testsuite name="functional tests with orm">
             <directory>./tests/Functional/Doctrine/Orm</directory>
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
+    <coverage includeUncoveredFiles="true">
+        <include>
             <directory>src/</directory>
-            <exclude>
-                <directory>Resources/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+        </include>
+        <exclude>
+            <directory>src/Resources/</directory>
+        </exclude>
+    </coverage>
 
     <php>
-	    <env name="KERNEL_CLASS" value="\Symfony\Cmf\Bundle\RoutingBundle\Tests\Fixtures\App\Kernel" />
+        <env name="KERNEL_CLASS" value="\Symfony\Cmf\Bundle\RoutingBundle\Tests\Fixtures\App\Kernel"/>
     </php>
 </phpunit>

src/Doctrine/Orm/RedirectRoute.php

@@ -17,16 +17,11 @@
  * {@inheritdoc}
  *
  * Provides a redirect route stored in the Doctrine ORM and used as content for generic route to provide redirects
+ *
+ * @property int $id
  */
 class RedirectRoute extends RedirectRouteModel
 {
-    /**
-     * Unique id of this route.
-     *
-     * @var int
-     */
-    protected $id;
-
     protected string $serialisedParameters;
 
     /**

tests/Fixtures/App/Kernel.php

@@ -17,7 +17,7 @@
 
 class Kernel extends TestKernel
 {
-    public function configure()
+    public function configure(): void
     {
         $this->requireBundleSet('default');
 
@@ -39,7 +39,7 @@ public function configure()
         }
     }
 
-    public function registerContainerConfiguration(LoaderInterface $loader)
+    public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load(__DIR__.'/config/config_'.$this->environment.'.php');
     }

tests/Functional/Doctrine/Orm/RedirectRouteTest.php

@@ -14,25 +14,21 @@
 use Symfony\Cmf\Bundle\RoutingBundle\Controller\RedirectController;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\RedirectRoute;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\Route;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 
 class RedirectRouteTest extends OrmTestCase
 {
-    private $repository;
-
-    private $controller;
+    private RedirectController $controller;
 
     public function setUp(): void
     {
         parent::setUp();
         $this->clearDb(Route::class);
         $this->clearDb(RedirectRoute::class);
 
-        $this->repository = $this->getContainer()->get('cmf_routing.route_provider');
         $this->controller = new RedirectController($this->getContainer()->get('router'));
     }
 
-    public function testRedirectDoctrine()
+    public function testRedirectDoctrine(): void
     {
         $route = $this->createRoute('route1', '/test');
 
@@ -52,7 +48,6 @@ public function testRedirectDoctrine()
 
         $response = $this->controller->redirectAction($redirectRoute->getContent());
 
-        $this->assertInstanceOf(RedirectResponse::class, $response);
         $this->assertSame(301, $response->getStatusCode());
         $this->assertSame('http://localhost/test', $response->getTargetUrl());
     }