[Routing][ObjectRouteLoader] Allow invokable route loader services
This commit is contained in:
parent
f551f2daae
commit
5bf7ad44e1
@ -11,6 +11,7 @@ CHANGELOG
|
|||||||
* deprecated implementing `Serializable` for `Route` and `CompiledRoute`; if you serialize them, please
|
* deprecated implementing `Serializable` for `Route` and `CompiledRoute`; if you serialize them, please
|
||||||
ensure your unserialization logic can recover from a failure related to an updated serialization format
|
ensure your unserialization logic can recover from a failure related to an updated serialization format
|
||||||
* exposed `utf8` Route option, defaults "locale" and "format" in configuration loaders and configurators
|
* exposed `utf8` Route option, defaults "locale" and "format" in configuration loaders and configurators
|
||||||
|
* added support for invokable route loader services
|
||||||
|
|
||||||
4.2.0
|
4.2.0
|
||||||
-----
|
-----
|
||||||
|
@ -37,25 +37,25 @@ abstract class ObjectRouteLoader extends Loader
|
|||||||
/**
|
/**
|
||||||
* Calls the service that will load the routes.
|
* Calls the service that will load the routes.
|
||||||
*
|
*
|
||||||
* @param mixed $resource Some value that will resolve to a callable
|
* @param string $resource Some value that will resolve to a callable
|
||||||
* @param string|null $type The resource type
|
* @param string|null $type The resource type
|
||||||
*
|
*
|
||||||
* @return RouteCollection
|
* @return RouteCollection
|
||||||
*/
|
*/
|
||||||
public function load($resource, $type = null)
|
public function load($resource, $type = null)
|
||||||
{
|
{
|
||||||
|
if (!preg_match('/^[^\:]+(?:::?(?:[^\:]+))?$/', $resource)) {
|
||||||
|
throw new \InvalidArgumentException(sprintf('Invalid resource "%s" passed to the "service" route loader: use the format "service::method" or "service" if your service has an "__invoke" method.', $resource));
|
||||||
|
}
|
||||||
|
|
||||||
if (1 === substr_count($resource, ':')) {
|
if (1 === substr_count($resource, ':')) {
|
||||||
$resource = str_replace(':', '::', $resource);
|
$resource = str_replace(':', '::', $resource);
|
||||||
@trigger_error(sprintf('Referencing service route loaders with a single colon is deprecated since Symfony 4.1. Use %s instead.', $resource), E_USER_DEPRECATED);
|
@trigger_error(sprintf('Referencing service route loaders with a single colon is deprecated since Symfony 4.1. Use %s instead.', $resource), E_USER_DEPRECATED);
|
||||||
}
|
}
|
||||||
|
|
||||||
$parts = explode('::', $resource);
|
$parts = explode('::', $resource);
|
||||||
if (2 != \count($parts)) {
|
|
||||||
throw new \InvalidArgumentException(sprintf('Invalid resource "%s" passed to the "service" route loader: use the format "service::method"', $resource));
|
|
||||||
}
|
|
||||||
|
|
||||||
$serviceString = $parts[0];
|
$serviceString = $parts[0];
|
||||||
$method = $parts[1];
|
$method = $parts[1] ?? '__invoke';
|
||||||
|
|
||||||
$loaderObject = $this->getServiceObject($serviceString);
|
$loaderObject = $this->getServiceObject($serviceString);
|
||||||
|
|
||||||
|
@ -70,7 +70,7 @@ class ObjectRouteLoaderTest extends TestCase
|
|||||||
* @expectedException \InvalidArgumentException
|
* @expectedException \InvalidArgumentException
|
||||||
* @dataProvider getBadResourceStrings
|
* @dataProvider getBadResourceStrings
|
||||||
*/
|
*/
|
||||||
public function testExceptionWithoutSyntax($resourceString)
|
public function testExceptionWithoutSyntax(string $resourceString): void
|
||||||
{
|
{
|
||||||
$loader = new ObjectRouteLoaderForTest();
|
$loader = new ObjectRouteLoaderForTest();
|
||||||
$loader->load($resourceString);
|
$loader->load($resourceString);
|
||||||
@ -79,8 +79,12 @@ class ObjectRouteLoaderTest extends TestCase
|
|||||||
public function getBadResourceStrings()
|
public function getBadResourceStrings()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
['Foo'],
|
|
||||||
['Foo:Bar:baz'],
|
['Foo:Bar:baz'],
|
||||||
|
['Foo::Bar::baz'],
|
||||||
|
['Foo:'],
|
||||||
|
['Foo::'],
|
||||||
|
[':Foo'],
|
||||||
|
['::Foo'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user