From 7fcf137c89d80bb3caeac2d8237c0c125fdac289 Mon Sep 17 00:00:00 2001 From: Douglas Hammond Date: Wed, 12 Apr 2017 16:35:54 -0400 Subject: [PATCH 1/3] Fix routerpass to use defined class --- bundle/DependencyInjection/Compiler/RoutingPass.php | 5 +++++ bundle/Resources/config/services.yml | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bundle/DependencyInjection/Compiler/RoutingPass.php b/bundle/DependencyInjection/Compiler/RoutingPass.php index 8d766d21..ef235588 100644 --- a/bundle/DependencyInjection/Compiler/RoutingPass.php +++ b/bundle/DependencyInjection/Compiler/RoutingPass.php @@ -8,6 +8,7 @@ */ namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler; +use eZ\Bundle\EzPublishLegacyBundle\Routing\DefaultRouter as DefaultRouter; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -22,6 +23,10 @@ public function process(ContainerBuilder $container) return; } + $container + ->findDefinition('router.default') + ->setClass(DefaultRouter::class); + $defaultRouterDef = $container->getDefinition('router.default'); $defaultRouterDef->addMethodCall( 'setLegacyAwareRoutes', diff --git a/bundle/Resources/config/services.yml b/bundle/Resources/config/services.yml index c15070c2..49f4af0f 100644 --- a/bundle/Resources/config/services.yml +++ b/bundle/Resources/config/services.yml @@ -6,7 +6,6 @@ parameters: ezpublish.default_router.legacy_aware_routes: ['_ezpublishLegacyTreeMenu', 'ezpublish_rest_', '_ezpublishPreviewContent', '_wdt', '_profiler', '_assetic'] # Core overrides - router.class: eZ\Bundle\EzPublishLegacyBundle\Routing\DefaultRouter ezpublish.security.login_listener.class: eZ\Bundle\EzPublishLegacyBundle\Security\SecurityListener security.authentication.listener.rememberme.class: eZ\Bundle\EzPublishLegacyBundle\Security\RememberMeListener From 09971d31918dd4d18846fcd21cd514ad4327eb79 Mon Sep 17 00:00:00 2001 From: Douglas Hammond Date: Thu, 13 Apr 2017 09:35:22 -0400 Subject: [PATCH 2/3] Use FQCN as string, since legacy bridge still supports PHP 5.4. --- bundle/DependencyInjection/Compiler/RoutingPass.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bundle/DependencyInjection/Compiler/RoutingPass.php b/bundle/DependencyInjection/Compiler/RoutingPass.php index ef235588..d9859bfc 100644 --- a/bundle/DependencyInjection/Compiler/RoutingPass.php +++ b/bundle/DependencyInjection/Compiler/RoutingPass.php @@ -8,7 +8,6 @@ */ namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler; -use eZ\Bundle\EzPublishLegacyBundle\Routing\DefaultRouter as DefaultRouter; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -25,7 +24,7 @@ public function process(ContainerBuilder $container) $container ->findDefinition('router.default') - ->setClass(DefaultRouter::class); + ->setClass('eZ\Bundle\EzPublishLegacyBundle\Routing\DefaultRouter'); $defaultRouterDef = $container->getDefinition('router.default'); $defaultRouterDef->addMethodCall( From 3f91be378e0161e200cead538034164c851d6de4 Mon Sep 17 00:00:00 2001 From: Douglas Hammond Date: Thu, 13 Apr 2017 10:27:21 -0400 Subject: [PATCH 3/3] Simplify routing pass --- .../DependencyInjection/Compiler/RoutingPass.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/bundle/DependencyInjection/Compiler/RoutingPass.php b/bundle/DependencyInjection/Compiler/RoutingPass.php index d9859bfc..e2c77bd4 100644 --- a/bundle/DependencyInjection/Compiler/RoutingPass.php +++ b/bundle/DependencyInjection/Compiler/RoutingPass.php @@ -22,14 +22,11 @@ public function process(ContainerBuilder $container) return; } - $container - ->findDefinition('router.default') - ->setClass('eZ\Bundle\EzPublishLegacyBundle\Routing\DefaultRouter'); - - $defaultRouterDef = $container->getDefinition('router.default'); - $defaultRouterDef->addMethodCall( - 'setLegacyAwareRoutes', - ['%ezpublish.default_router.legacy_aware_routes%'] - ); + $container->getDefinition('router.default') + ->setClass('eZ\Bundle\EzPublishLegacyBundle\Routing\DefaultRouter') + ->addMethodCall( + 'setLegacyAwareRoutes', + ['%ezpublish.default_router.legacy_aware_routes%'] + ); } }