mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-23 10:38:45 +02:00
migration symfony 5 4 (#300)
* symfony 5.4 (diff dev) * symfony 5.4 (working) * symfony 5.4 (update autoload) * symfony 5.4 (remove swiftmailer mailer implementation) * symfony 5.4 (php doc and split Global accessor class) ### Impacted packages: composer require php:">=7.2.5 <8.0.0" symfony/console:5.4.* symfony/dotenv:5.4.* symfony/framework-bundle:5.4.* symfony/twig-bundle:5.4.* symfony/yaml:5.4.* --update-with-dependencies composer require symfony/stopwatch:5.4.* symfony/web-profiler-bundle:5.4.* --dev --update-with-dependencies
This commit is contained in:
@@ -24,10 +24,8 @@ class AnnotatedRouteControllerLoader extends AnnotationClassLoader
|
||||
{
|
||||
/**
|
||||
* Configures the _controller default parameter of a given Route instance.
|
||||
*
|
||||
* @param mixed $annot The annotation class instance
|
||||
*/
|
||||
protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot)
|
||||
protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot)
|
||||
{
|
||||
if ('__invoke' === $method->getName()) {
|
||||
$route->setDefault('_controller', $class->getName());
|
||||
@@ -43,14 +41,12 @@ class AnnotatedRouteControllerLoader extends AnnotationClassLoader
|
||||
*/
|
||||
protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method)
|
||||
{
|
||||
return preg_replace([
|
||||
'/(bundle|controller)_/',
|
||||
'/action(_\d+)?$/',
|
||||
'/__/',
|
||||
], [
|
||||
'_',
|
||||
'\\1',
|
||||
'_',
|
||||
], parent::getDefaultRouteName($class, $method));
|
||||
$name = preg_replace('/(bundle|controller)_/', '_', parent::getDefaultRouteName($class, $method));
|
||||
|
||||
if (str_ends_with($method->name, 'Action') || str_ends_with($method->name, '_action')) {
|
||||
$name = preg_replace('/action(_\d+)?$/', '\\1', $name);
|
||||
}
|
||||
|
||||
return str_replace('__', '_', $name);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user