Factory fixed

Author: dantleech

AutoRoute/Factory.php

@@ -3,6 +3,9 @@
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStack\Builder;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStack\BuilderUnitChain;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStack\BuilderUnit;
 
 /**
  * @author Daniel Leech <[email protected]>
@@ -24,7 +27,7 @@ class Factory
     protected $container;
     protected $builder;
 
-    public function __construct(ContainerInterface $container, RouteStackBuilder $builder)
+    public function __construct(ContainerInterface $container, Builder $builder)
     {
         $this->container = $container;
         $this->builder = $builder;
@@ -44,7 +47,7 @@ public function registerAlias($type, $alias, $id)
         $this->serviceIds[$type][$alias] = $id;
     }
 
-    public function getRouteStackBuilderChain($classFqn)
+    public function getRouteStackBuilderUnitChain($classFqn)
     {
         if (!isset($this->routeStackChains[$classFqn])) {
             $this->routeStackChains[$classFqn] = $this->generateRouteStackChain($classFqn);
@@ -69,23 +72,23 @@ protected function generateRouteStackChain($classFqn)
     {
         $mapping = $this->getMapping($classFqn);
 
-        $routeStackChain = new RouteStackBuilderUnitChain($this->builder);
+        $routeStackChain = new BuilderUnitChain($this->builder);
 
         foreach ($mapping['content_path'] as $builderName => $builderConfig) {
             $builderUnit = $this->generateBuilderUnit($builderConfig);
-            $routeStackChain->addRouteStackBuilderUnit($builderName, $builderUnit);
+            $routeStackChain->addBuilderUnit($builderName, $builderUnit);
         }
 
         return $routeStackChain;
     }
 
     protected function generateBuilderUnit($config)
     {
-        $pathProvider = $this->getBuilderService($builderConfig, 'provider', 'name');
-        $existsAction = $this->getBuilderService($builderConfig, 'exists_action', 'strategy');
-        $notExistsAction = $this->getBuilderService($builderConfig, 'not_exists_action', 'strategy');
+        $pathProvider = $this->getBuilderService($config, 'provider', 'name');
+        $existsAction = $this->getBuilderService($config, 'exists_action', 'strategy');
+        $notExistsAction = $this->getBuilderService($config, 'not_exists_action', 'strategy');
 
-        $builderUnit = new RouteStackBuilderUnit(
+        $builderUnit = new BuilderUnit(
             $pathProvider,
             $existsAction,
             $notExistsAction

Tests/AutoRoute/FactoryTest.php

@@ -10,7 +10,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->builder = $this->getMockBuilder(
-            'Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStackBuilder'
+            'Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStack\Builder'
         )->disableOriginalConstructor()->getMock();
 
         $this->container = $this->getMock(
@@ -44,7 +44,7 @@ public function setUp()
      */
     public function testClassNotMappedException()
     {
-        $this->bucf->getChain('FooBar');
+        $this->bucf->getRouteStackBuilderUnitChain('FooBar');
     }
 
     public function provideTestGetChain()
@@ -106,6 +106,6 @@ public function testGetChain($config, $assertOptions)
         }
 
         $this->bucf->registerMapping('FooBar/Class', $config);
-        $this->bucf->getChain('FooBar/Class');
+        $this->bucf->getRouteStackBuilderUnitChain('FooBar/Class');
     }
 }