Merge pull request #136 from symfony-cmf/event

support event handling for dynamic router

Author: lsmith77

CHANGELOG.md

@@ -1,6 +1,7 @@
 Changelog
 =========
 
+* **2013-07-31**: [EventDispatcher] Added events to the dynamic router at the start of match and matchRequest
 * **2013-07-29**: [DependencyInjection] restructured `phpcr_provider` config into `persistence` -> `phpcr` to match other Bundles
 * **2013-07-28**: [DependencyInjection] added `enabled` flag to `phpcr_provider` config
 * **2013-07-26**: [Model] Removed setRouteContent and getRouteContent, use setContent and getContent instead.

Resources/config/routing-dynamic.xml

@@ -55,6 +55,7 @@
             <argument type="service" id="cmf_routing.nested_matcher" />
             <argument type="service" id="cmf_routing.generator" />
             <argument>%cmf_routing.uri_filter_regexp%</argument>
+            <argument type="service" id="event_dispatcher" on-invalid="ignore"/>
             <call method="setContainer"><argument type="service" id="service_container"/></call>
             <call method="addRouteEnhancer"><argument type="service" id="cmf_routing.enhancer_route_content"/></call>
         </service>

Tests/Unit/Routing/ContentAwareGeneratorTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingBundle\Tests\Routing;
+namespace Symfony\Cmf\Bundle\RoutingBundle\Tests\Unit\Routing;
 
 use Symfony\Component\HttpFoundation\Request;
 

Tests/Unit/Routing/DynamicRouterTest.php

@@ -1,8 +1,11 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingBundle\Tests\Routing;
+namespace Symfony\Cmf\Bundle\RoutingBundle\Tests\Unit\Routing;
 
+use Symfony\Cmf\Component\Routing\Event\Events;
+use Symfony\Cmf\Component\Routing\Event\RouterMatchEvent;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
@@ -20,6 +23,8 @@ class DynamicRouterTest extends CmfUnitTestCase
     protected $context;
     /** @var Request */
     protected $request;
+    /** @var EventDispatcherInterface */
+    protected $eventDispatcher;
     protected $container;
 
     public function setUp()
@@ -36,8 +41,8 @@ public function setUp()
         $this->request = Request::create('/foo');
         $this->container = $this->buildMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');
         $this->context = $this->buildMock('Symfony\\Component\\Routing\\RequestContext');
-
-        $this->router = new DynamicRouter($this->context, $this->matcher, $this->generator);
+        $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);
     }
 
@@ -57,6 +62,11 @@ public function testMatch()
             ->will($this->returnValue($this->request))
         ;
 
+        $this->eventDispatcher->expects($this->once())
+            ->method('dispatch')
+            ->with(Events::PRE_DYNAMIC_MATCH, $this->equalTo(new RouterMatchEvent()))
+        ;
+
         $parameters = $this->router->match('/foo');
         $this->assertEquals(array('foo' => 'bar'), $parameters);
 
@@ -65,10 +75,9 @@ public function testMatch()
 
     public function testMatchRequest()
     {
-        $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_REQUEST, $this->equalTo(new RouterMatchEvent($this->request)))
         ;
 
         $parameters = $this->router->matchRequest($this->request);
@@ -88,6 +97,22 @@ public function testMatchNoRequest()
             ->will($this->returnValue(null))
         ;
 
+        $this->eventDispatcher->expects($this->once())
+            ->method('dispatch')
+            ->with(Events::PRE_DYNAMIC_MATCH, $this->equalTo(new RouterMatchEvent()))
+        ;
+
         $this->router->match('/foo');
     }
+
+    public function testEventOptional()
+    {
+        $router = new DynamicRouter($this->context, $this->matcher, $this->generator);
+
+        $parameters = $router->matchRequest($this->request);
+        $this->assertEquals(array('foo' => 'bar'), $parameters);
+
+        $this->assertRequestAttributes($this->request);
+    }
+
 }