Merge pull request #470 from acrobat/avoid-deprecated-features

Avoid using deprecated feature from symfony-cmf/routing library

Author: dbu

.github/workflows/test-application.yaml

@@ -14,7 +14,6 @@ jobs:
         name: 'PHP ${{ matrix.php-version }}, Symfony ${{ matrix.symfony-version }} ${{ matrix.dependencies}}'
         runs-on: ubuntu-20.04
         env:
-            SYMFONY_PHPUNIT_VERSION: 8
             SYMFONY_DEPRECATIONS_HELPER: weak
             SYMFONY_REQUIRE: ${{ matrix.symfony-version }}
 
@@ -27,7 +26,7 @@ jobs:
                     - php-version: '7.4'
                       symfony-version: '^4.4'
                     - php-version: '7.4'
-                      symfony-version: '5.0.*'
+                      symfony-version: '^5.4'
                     - php-version: '8.0'
 
         steps:

composer.json

@@ -16,7 +16,7 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "symfony-cmf/routing": "^2.3.0",
+        "symfony-cmf/routing": "^2.3.2",
         "symfony/framework-bundle": "^4.4 || ^5.0"
     },
     "require-dev": {

src/Controller/RedirectController.php

@@ -12,6 +12,7 @@
 namespace Symfony\Cmf\Bundle\RoutingBundle\Controller;
 
 use Symfony\Cmf\Component\Routing\RedirectRouteInterface;
+use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
@@ -52,7 +53,7 @@ public function redirectAction(RedirectRouteInterface $contentDocument)
         if (empty($url)) {
             $routeTarget = $contentDocument->getRouteTarget();
             if ($routeTarget) {
-                $url = $this->router->generate($routeTarget, $contentDocument->getParameters(), UrlGeneratorInterface::ABSOLUTE_URL);
+                $url = $this->router->generate(RouteObjectInterface::OBJECT_BASED_ROUTE_NAME, array_merge($contentDocument->getParameters(), [RouteObjectInterface::ROUTE_OBJECT => $routeTarget]), UrlGeneratorInterface::ABSOLUTE_URL);
             } else {
                 $routeName = $contentDocument->getRouteName();
                 $url = $this->router->generate($routeName, $contentDocument->getParameters(), UrlGeneratorInterface::ABSOLUTE_URL);

tests/Functional/Routing/DynamicRouterTest.php

@@ -339,22 +339,22 @@ public function testGenerate()
     {
         $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/testroute/child');
 
-        $url = $this->router->generate($route, ['test' => 'value']);
+        $url = $this->router->generate(RouteObjectInterface::OBJECT_BASED_ROUTE_NAME, ['test' => 'value', RouteObjectInterface::ROUTE_OBJECT => $route]);
         $this->assertEquals('/testroute/child?test=value', $url);
     }
 
     public function testGenerateAbsolute()
     {
         $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/testroute/child');
-        $url = $this->router->generate($route, ['test' => 'value'], UrlGeneratorInterface::ABSOLUTE_URL);
+        $url = $this->router->generate(RouteObjectInterface::OBJECT_BASED_ROUTE_NAME, ['test' => 'value', RouteObjectInterface::ROUTE_OBJECT => $route], UrlGeneratorInterface::ABSOLUTE_URL);
         $this->assertEquals('http://localhost/testroute/child?test=value', $url);
     }
 
     public function testGenerateParameters()
     {
         $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/testroute');
 
-        $url = $this->router->generate($route, ['slug' => 'gen-slug', 'test' => 'value']);
+        $url = $this->router->generate(RouteObjectInterface::OBJECT_BASED_ROUTE_NAME, ['slug' => 'gen-slug', 'test' => 'value', RouteObjectInterface::ROUTE_OBJECT => $route]);
         $this->assertEquals('/testroute/gen-slug?test=value', $url);
     }
 
@@ -363,22 +363,22 @@ public function testGenerateParametersInvalid()
         $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/testroute');
 
         $this->expectException(InvalidParameterException::class);
-        $this->router->generate($route, ['slug' => 'gen-slug', 'id' => 'nonumber']);
+        $this->router->generate(RouteObjectInterface::OBJECT_BASED_ROUTE_NAME, ['slug' => 'gen-slug', 'id' => 'nonumber', RouteObjectInterface::ROUTE_OBJECT => $route]);
     }
 
     public function testGenerateDefaultFormat()
     {
         $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/format');
 
-        $url = $this->router->generate($route, ['id' => 37]);
+        $url = $this->router->generate(RouteObjectInterface::OBJECT_BASED_ROUTE_NAME, ['id' => 37, RouteObjectInterface::ROUTE_OBJECT => $route]);
         $this->assertEquals('/format/37', $url);
     }
 
     public function testGenerateFormat()
     {
         $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/format');
 
-        $url = $this->router->generate($route, ['id' => 37, '_format' => 'json']);
+        $url = $this->router->generate(RouteObjectInterface::OBJECT_BASED_ROUTE_NAME, ['id' => 37, '_format' => 'json', RouteObjectInterface::ROUTE_OBJECT => $route]);
         $this->assertEquals('/format/37.json', $url);
     }
 
@@ -387,6 +387,6 @@ public function testGenerateNoMatchingFormat()
         $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/format');
 
         $this->expectException(InvalidParameterException::class);
-        $this->router->generate($route, ['id' => 37, '_format' => 'xyz']);
+        $this->router->generate(RouteObjectInterface::OBJECT_BASED_ROUTE_NAME, ['id' => 37, '_format' => 'xyz', RouteObjectInterface::ROUTE_OBJECT => $route]);
     }
 }