EZP-27249: Fix routerpass to use defined class (ezsystems#88)

* Fix routerpass to use defined class * Use FQCN as string, since legacy bridge still supports PHP 5.4. * Simplify routing pass
ezpublishlegacy · Apr 13, 2017 · e66c3df · e66c3df
1 parent 1b060ab
commit e66c3df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/bundle/DependencyInjection/Compiler/RoutingPass.php b/bundle/DependencyInjection/Compiler/RoutingPass.php
@@ -23,10 +23,11 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        $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%']
+            );
     }
 }
diff --git 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