Merge pull request #236 from symfony-cmf/synchronized-service

use synchronized service

Author: dbu

CHANGELOG.md

@@ -4,6 +4,7 @@ Changelog
 1.2.0-RC2
 ---------
 
+* **2014-04-14**: DynamicRouter no longer implements the ContainerAwareInterface
 * **2014-04-11**: drop Symfony 2.2 compatibility
 
 1.2.0-RC1

Resources/config/routing-dynamic.xml

@@ -68,7 +68,7 @@
             <argument>%cmf_routing.uri_filter_regexp%</argument>
             <argument type="service" id="event_dispatcher" on-invalid="ignore"/>
             <argument type="service" id="cmf_routing.route_provider"/>
-            <call method="setContainer"><argument type="service" id="service_container"/></call>
+            <call method="setRequest"><argument type="service" id="request" on-invalid="null" strict="false"/></call>
             <call method="addRouteEnhancer">
                 <argument type="service" id="cmf_routing.enhancer.route_content"/>
                 <argument>100</argument>

Routing/DynamicRouter.php

@@ -14,9 +14,6 @@
 
 use Symfony\Component\HttpFoundation\Request;
 
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 
 use Symfony\Cmf\Component\Routing\DynamicRouter as BaseDynamicRouter;
@@ -30,7 +27,7 @@
  * @author Lukas Smith
  * @author Nacho Martìn
  */
-class DynamicRouter extends BaseDynamicRouter implements ContainerAwareInterface
+class DynamicRouter extends BaseDynamicRouter
 {
     /**
      * key for the request attribute that contains the route document
@@ -50,22 +47,9 @@ class DynamicRouter extends BaseDynamicRouter implements ContainerAwareInterface
     const CONTENT_TEMPLATE = 'contentTemplate';
 
     /**
-     * To get the request from, as its not available immediately
-     *
-     * @var ContainerInterface
-     */
-    protected $container;
-
-    /**
-     * TODO: use synchronized service once we up the minimum requirement to symfony 2.3
-     * https://github.com/symfony-cmf/RoutingBundle/issues/177
-     *
-     * @param ContainerInterface $container
+     * @var Request
      */
-    public function setContainer(ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
+    protected $request;
 
     /**
      * Put content and template name into the request attributes instead of the
@@ -124,12 +108,24 @@ protected function cleanDefaults($defaults, Request $request = null)
         return $defaults;
     }
 
+    /**
+     * @param Request $request
+     */
+    public function setRequest(Request $request = null)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * @return Request
+     * @throws \Symfony\Component\Routing\Exception\ResourceNotFoundException
+     */
     public function getRequest()
     {
-        if (!$request = $this->container->get('request')) {
+        if (null === $this->request) {
             throw new ResourceNotFoundException('Request object not available from container');
         }
 
-        return $request;
+        return $this->request;
     }
 }

Tests/Unit/Routing/DynamicRouterTest.php

@@ -49,11 +49,10 @@ public function setUp()
         $this->generator = $this->buildMock('Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface');
 
         $this->request = Request::create('/foo');
-        $this->container = $this->buildMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');
         $this->context = $this->buildMock('Symfony\\Component\\Routing\\RequestContext');
         $this->eventDispatcher = $this->buildMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
         $this->router = new DynamicRouter($this->context, $this->matcher, $this->generator, '', $this->eventDispatcher);
-        $this->router->setContainer($this->container);
+        $this->router->setRequest($this->request);
     }
 
     private function assertRequestAttributes($request)
@@ -66,12 +65,6 @@ private function assertRequestAttributes($request)
 
     public function testMatch()
     {
-        $this->container->expects($this->once())
-            ->method('get')
-            ->with('request')
-            ->will($this->returnValue($this->request))
-        ;
-
         $this->eventDispatcher->expects($this->once())
             ->method('dispatch')
             ->with(Events::PRE_DYNAMIC_MATCH, $this->equalTo(new RouterMatchEvent()))
@@ -101,11 +94,7 @@ public function testMatchRequest()
      */
     public function testMatchNoRequest()
     {
-        $this->container->expects($this->once())
-            ->method('get')
-            ->with('request')
-            ->will($this->returnValue(null))
-        ;
+        $this->router->setRequest(null);
 
         $this->eventDispatcher->expects($this->once())
             ->method('dispatch')