Fixed everything so that Functional test works

dantleech · dantleech · commit 67c441120e94 · 2013-04-08T09:28:08.000+01:00
diff --git a/AutoRoute/Factory.php b/AutoRoute/Factory.php
@@ -22,6 +22,7 @@ class Factory
         'provider' => array(),
         'exists_action' => array(),
         'not_exists_action' => array(),
+        'route_maker' => array(),
     );
 
     protected $container;
diff --git a/AutoRoute/PathExists/AutoIncrementPath.php b/AutoRoute/PathExists/AutoIncrementPath.php
@@ -6,7 +6,7 @@
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\BuilderContext;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStack;
 use Doctrine\ODM\PHPCR\DocumentManager;
-use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMakerInterface;
 
 /**
  * @author Daniel Leech <daniel@dantleech.com>
@@ -16,7 +16,7 @@ class AutoIncrementPath implements PathActionInterface
     protected $dm;
     protected $routeMaker;
 
-    public function __construct(DocumentManager $dm, RouteMaker $routeMaker)
+    public function __construct(DocumentManager $dm, RouteMakerInterface $routeMaker)
     {
         $this->dm = $dm;
         $this->routeMaker = $routeMaker;
@@ -38,6 +38,6 @@ public function execute(RouteStack $routeStack)
 
         $routeStack->replaceLastPathElement(basename($newPath));
 
-        $this->routeMaker->makeRoutes($routeStack);
+        $this->routeMaker->make($routeStack);
     }
 }
diff --git a/AutoRoute/PathNotExists/CreatePath.php b/AutoRoute/PathNotExists/CreatePath.php
@@ -4,7 +4,7 @@
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathActionInterface;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStack;
-use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMakerInterface;
 
 /**
  * @author Daniel Leech <daniel@dantleech.com>
@@ -13,7 +13,7 @@ class CreatePath implements PathActionInterface
 {
     protected $routeMaker;
 
-    public function __construct(RouteMaker $routeMaker)
+    public function __construct(RouteMakerInterface $routeMaker)
     {
         $this->routeMaker = $routeMaker;
     }
@@ -24,6 +24,6 @@ public function init(array $options)
 
     public function execute(RouteStack $routeStack)
     {
-        $this->routeMaker->makeRoutes($routeStack);
+        $this->routeMaker->make($routeStack);
     }
 }
diff --git a/DependencyInjection/Compiler/AutoRoutePass.php b/DependencyInjection/Compiler/AutoRoutePass.php
@@ -26,7 +26,10 @@ public function process(ContainerBuilder $container)
 
 
         $types = array(
-            'provider', 'exists_action', 'not_exists_action'
+            'provider', 
+            'exists_action', 
+            'not_exists_action', 
+            'route_maker'
         );
 
         foreach ($types as $type) {
@@ -47,5 +50,3 @@ public function process(ContainerBuilder $container)
         }
     }
 }
-
-
diff --git a/DependencyInjection/SymfonyCmfRoutingAutoExtension.php b/DependencyInjection/SymfonyCmfRoutingAutoExtension.php
@@ -24,6 +24,7 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('path_provider.xml');
         $loader->load('exists_action.xml');
         $loader->load('not_exists_action.xml');
+        $loader->load('route_maker.xml');
 
         $config = $processor->processConfiguration($configuration, $configs);
         $chainFactoryDef = $container->getDefinition('symfony_cmf_routing_auto.factory');
diff --git a/Resources/config/auto_route.xml b/Resources/config/auto_route.xml
@@ -10,8 +10,6 @@
         <parameter key="symfony_cmf_routing_auto.factory_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Factory</parameter>
         <parameter key="symfony_cmf_routing_auto.route_stack_builder_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStack\Builder</parameter>
         <parameter key="symfony_cmf_routing_auto.route_patcher_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RoutePatcher\GenericPatcher</parameter>
-        <parameter key="symfony_cmf_routing_auto.route_maker_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker</parameter>
-        <parameter key="symfony_cmf_routing_auto.auto_route_maker_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\AutoRouteMaker</parameter>
 
     </parameters>
 
@@ -50,14 +48,5 @@
             <argument type="service" id="doctrine_phpcr.odm.default_document_manager"/>
         </service>
 
-        <service id="symfony_cmf_routing_auto.auto_route_maker" class="%symfony_cmf_routing_auto.auto_route_maker_class%">
-            <argument type="service" id="doctrine_phpcr.odm.default_document_manager"/>
-        </service>
-
-        <service id="symfony_cmf_routing_auto.route_maker" class="%symfony_cmf_routing_auto.route_maker_class%">
-            <argument type="service" id="symfony_cmf_routing_auto.auto_route_maker"/>
-            <argument type="service" id="symfony_cmf_routing_auto.route_patcher"/>
-        </service>
-
     </services>
 </container>
diff --git a/Resources/config/exists_action.xml b/Resources/config/exists_action.xml
@@ -27,7 +27,7 @@
             scope="prototype"
             >
             <argument type="service" id="doctrine_phpcr.odm.default_document_manager"/>
-            <argument type="service" id="symfony_cmf_routing_auto.route_maker"/>
+            <argument type="service" id="symfony_cmf_routing_auto.route_maker.default"/>
             <tag name="symfony_cmf_routing_auto.exists_action" alias="auto_increment"/>
         </service>
 
diff --git a/Resources/config/not_exists_action.xml b/Resources/config/not_exists_action.xml
@@ -24,7 +24,7 @@
             class="%symfony_cmf_routing_auto.not_exists_action.create_class%"
             scope="prototype"
             >
-            <argument type="service" id="symfony_cmf_routing_auto.route_maker"/>
+            <argument type="service" id="symfony_cmf_routing_auto.route_maker.default"/>
             <tag name="symfony_cmf_routing_auto.not_exists_action" alias="create"/>
         </service>
 
diff --git a/Resources/config/route_maker.xml b/Resources/config/route_maker.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <parameters>
+
+        <parameter key="symfony_cmf_routing_auto.route_maker.default_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker\DefaultMaker</parameter>
+        <parameter key="symfony_cmf_routing_auto.route_maker.auto_route_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker\AutoRouteMaker</parameter>
+        <parameter key="symfony_cmf_routing_auto.route_maker.generic_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker\GenericMaker</parameter>
+        <parameter key="symfony_cmf_routing_auto.route_maker.route_class">Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker\RouteMaker</parameter>
+
+    </parameters>
+
+    <services>
+
+        <service 
+            id="symfony_cmf_routing_auto.route_maker.default" 
+            class="%symfony_cmf_routing_auto.route_maker.default_class%"
+            scope="prototype"
+            >
+            <argument type="service" id="symfony_cmf_routing_auto.route_maker.auto_route"/>
+            <argument type="service" id="symfony_cmf_routing_auto.route_maker.generic"/>
+            <tag name="symfony_cmf_routing_auto.route_maker" alias="default"/>
+        </service>
+
+        <service 
+            id="symfony_cmf_routing_auto.route_maker.auto_route" 
+            class="%symfony_cmf_routing_auto.route_maker.auto_route_class%"
+            scope="prototype"
+            >
+            <argument type="service" id="doctrine_phpcr.odm.default_document_manager"/>
+            <tag name="symfony_cmf_routing_auto.route_maker" alias="auto_route"/>
+        </service>
+
+        <service 
+            id="symfony_cmf_routing_auto.route_maker.generic" 
+            class="%symfony_cmf_routing_auto.route_maker.generic_class%"
+            scope="prototype"
+            >
+            <argument type="service" id="doctrine_phpcr.odm.default_document_manager"/>
+            <tag name="symfony_cmf_routing_auto.route_maker" alias="generic"/>
+        </service>
+
+        <service 
+            id="symfony_cmf_routing_auto.route_maker.route" 
+            class="%symfony_cmf_routing_auto.route_maker.route_class%"
+            scope="prototype"
+            >
+            <argument type="service" id="doctrine_phpcr.odm.default_document_manager"/>
+            <tag name="symfony_cmf_routing_auto.route_maker" alias="route"/>
+        </service>
+
+    </services>
+</container>
+
+
diff --git a/Tests/AutoRoute/PathExists/AutoIncrementPathTest.php b/Tests/AutoRoute/PathExists/AutoIncrementPathTest.php
@@ -8,9 +8,9 @@ class AutoIncrementPathTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        $this->routeMaker = $this->getMockBuilder(
-            'Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker'
-        )->disableOriginalConstructor()->getMock();
+        $this->routeMaker = $this->getMock(
+            'Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMakerInterface'
+        );
 
         $this->dm = $this->getMockBuilder('Doctrine\ODM\PHPCR\DocumentManager')
             ->disableOriginalConstructor()
@@ -44,7 +44,7 @@ public function testAutoIncrement()
             ->with('bar-2');
 
         $this->routeMaker->expects($this->once())
-            ->method('makeRoutes')
+            ->method('make')
             ->with($this->routeStack);
 
         $this->aiPath->execute($this->routeStack);
diff --git a/Tests/AutoRoute/PathNotExists/CreatePathTest.php b/Tests/AutoRoute/PathNotExists/CreatePathTest.php
@@ -8,9 +8,9 @@ class CreatePathTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        $this->routeMaker = $this->getMockBuilder(
-            'Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker'
-        )->disableOriginalConstructor()->getMock();
+        $this->routeMaker = $this->getMock(
+            'Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMakerInterface'
+        );
 
         $this->routeStack = $this->getMockBuilder(
             'Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStack'
@@ -22,7 +22,7 @@ public function setUp()
     public function testCreatePath()
     {
         $this->routeMaker->expects($this->once())
-            ->method('makeRoutes')
+            ->method('make')
             ->with($this->routeStack);
         $this->createPath->execute($this->routeStack);
     }
diff --git a/Tests/AutoRoute/RouteMaker/GenericMakerTest.php b/Tests/AutoRoute/RouteMaker/GenericMakerTest.php
@@ -6,6 +6,9 @@
 
 class GenericMakerTest extends \PHPUnit_Framework_TestCase
 {
+    protected $routeClass = 'Doctrine\ODM\PHPCR\Document\Generic';
+    protected $makerClass = 'Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker\GenericMaker';
+
     public function setUp()
     {
         $this->dm = $this->getMockBuilder(
@@ -20,7 +23,7 @@ public function setUp()
             'Doctrine\ODM\PHPCR\Mapping\ClassMetadata'
         )->disableOriginalConstructor()->getMock();
 
-        $this->routeMaker = new GenericMaker($this->dm);
+        $this->routeMaker = new $this->makerClass($this->dm);
     }
 
     // Note that this tests everything apart from ensuring
@@ -37,7 +40,7 @@ public function testMake()
 
         $this->dm->expects($this->once())
             ->method('getClassMetadata')
-            ->with('Doctrine\ODM\PHPCR\Document\Generic')
+            ->with($this->routeClass)
             ->will($this->returnValue($this->classMetadata));
 
         $this->routeStack->expects($this->exactly(2))
@@ -51,7 +54,7 @@ public function testMake()
                 static $i = 0;
                 $expected = array('/test', '/test/foo');
 
-                $test->assertInstanceOf('Doctrine\ODM\PHPCR\Document\Generic', $doc);
+                $test->assertInstanceOf($this->routeClass, $doc);
                 $test->assertEquals($expected[$i++], $id);
             }));
 
diff --git a/Tests/AutoRoute/RoutePatcher/GenericPatcherTest.php b/Tests/AutoRoute/RoutePatcher/GenericPatcherTest.php

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathActionInterface;`
`6`	`6`	`use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStack;`
`7`		`-use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker;`
	`7`	`+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMakerInterface;`
`8`	`8`
`9`	`9`	`/**`
`10`	`10`	`* @author Daniel Leech <[email protected]>`
`@@ -13,7 +13,7 @@ class CreatePath implements PathActionInterface`
`13`	`13`	`{`
`14`	`14`	`protected $routeMaker;`
`15`	`15`
`16`		`- public function __construct(RouteMaker $routeMaker)`
	`16`	`+ public function __construct(RouteMakerInterface $routeMaker)`
`17`	`17`	`{`
`18`	`18`	`$this->routeMaker = $routeMaker;`
`19`	`19`	`}`
`@@ -24,6 +24,6 @@ public function init(array $options)`
`24`	`24`
`25`	`25`	`public function execute(RouteStack $routeStack)`
`26`	`26`	`{`
`27`		`- $this->routeMaker->makeRoutes($routeStack);`
	`27`	`+ $this->routeMaker->make($routeStack);`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,10 @@ public function process(ContainerBuilder $container)`
`26`	`26`
`27`	`27`
`28`	`28`	`$types = array(`
`29`		`- 'provider', 'exists_action', 'not_exists_action'`
	`29`	`+ 'provider',`
	`30`	`+ 'exists_action',`
	`31`	`+ 'not_exists_action',`
	`32`	`+ 'route_maker'`
`30`	`33`	`);`
`31`	`34`
`32`	`35`	`foreach ($types as $type) {`
`@@ -47,5 +50,3 @@ public function process(ContainerBuilder $container)`
`47`	`50`	`}`
`48`	`51`	`}`
`49`	`52`	`}`
`50`		`-`
`51`		`-`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`scope="prototype"`
`28`	`28`	`>`
`29`	`29`	`<argument type="service" id="doctrine_phpcr.odm.default_document_manager"/>`
`30`		`- <argument type="service" id="symfony_cmf_routing_auto.route_maker"/>`
	`30`	`+ <argument type="service" id="symfony_cmf_routing_auto.route_maker.default"/>`
`31`	`31`	`<tag name="symfony_cmf_routing_auto.exists_action" alias="auto_increment"/>`
`32`	`32`	`</service>`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`class="%symfony_cmf_routing_auto.not_exists_action.create_class%"`
`25`	`25`	`scope="prototype"`
`26`	`26`	`>`
`27`		`- <argument type="service" id="symfony_cmf_routing_auto.route_maker"/>`
	`27`	`+ <argument type="service" id="symfony_cmf_routing_auto.route_maker.default"/>`
`28`	`28`	`<tag name="symfony_cmf_routing_auto.not_exists_action" alias="create"/>`
`29`	`29`	`</service>`
`30`	`30`