diff --git a/src/ProviderBasedGenerator.php b/src/ProviderBasedGenerator.php index 05a56a9d..a57b3608 100644 --- a/src/ProviderBasedGenerator.php +++ b/src/ProviderBasedGenerator.php @@ -65,6 +65,7 @@ public function generate($name, $parameters = [], $referenceType = self::ABSOLUT && $parameters[RouteObjectInterface::ROUTE_OBJECT] instanceof SymfonyRoute ) { $route = $parameters[RouteObjectInterface::ROUTE_OBJECT]; + unset($parameters[RouteObjectInterface::ROUTE_OBJECT]); } elseif (null === $route = $this->provider->getRouteByName($name)) { throw new RouteNotFoundException(sprintf('Route "%s" does not exist.', $name)); } diff --git a/tests/Unit/Routing/ProviderBasedGeneratorTest.php b/tests/Unit/Routing/ProviderBasedGeneratorTest.php index 529ffea7..fd861238 100644 --- a/tests/Unit/Routing/ProviderBasedGeneratorTest.php +++ b/tests/Unit/Routing/ProviderBasedGeneratorTest.php @@ -21,6 +21,7 @@ use Symfony\Component\Routing\Exception\RouteNotFoundException; use Symfony\Component\Routing\RequestContext; use Symfony\Component\Routing\Route; +use Symfony\Component\Routing\Route as SymfonyRoute; class ProviderBasedGeneratorTest extends TestCase { @@ -106,6 +107,15 @@ public function testGenerateFromRoute(): void $this->assertEquals('result_url', $url); } + public function testRemoveRouteObject(): void + { + $url = $this->generator->generate(RouteObjectInterface::OBJECT_BASED_ROUTE_NAME, [ + RouteObjectInterface::ROUTE_OBJECT => new Proxy('/path'), + ]); + + $this->assertEquals('result_url', $url); + } + /** * @group legacy * @@ -172,7 +182,12 @@ class TestableProviderBasedGenerator extends ProviderBasedGenerator { protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $referenceType, $hostTokens, array $requiredSchemes = []) { - return 'result_url'; + $url = 'result_url'; + if ($parameters && $query = http_build_query($parameters, '', '&', PHP_QUERY_RFC3986)) { + $url .= '?'.$query; + } + + return $url; } } @@ -188,3 +203,8 @@ public function getContent(): ?object return null; } } + +class Proxy extends SymfonyRoute +{ + public $__isInitialized__ = true; +}