Skip to content

fix passing route object parameter to generator #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 27, 2020
Merged

fix passing route object parameter to generator #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f614584
fix passing route object parameter to generator
gseidel May 27, 2020
fd728fe
fix code style
gseidel May 27, 2020
61d2d4d
only unset route object parameter if it is used before
gseidel May 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/ProviderBasedGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
22 changes: 21 additions & 1 deletion tests/Unit/Routing/ProviderBasedGeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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
*
Expand Down Expand Up @@ -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;
}
}

Expand All @@ -188,3 +203,8 @@ public function getContent(): ?object
return null;
}
}

class Proxy extends SymfonyRoute
{
public $__isInitialized__ = true;
}