Refactored AutoRouteMaker

Author: dantleech

AutoRoute/RouteMaker/AutoRouteMaker.php

@@ -1,10 +1,11 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker;
 
 use Doctrine\ODM\PHPCR\DocumentManager;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMakerInterface;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Document\AutoRoute;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStack;
 
 /**
  * This class is responsible for creating and updating the actual
@@ -23,7 +24,7 @@ public function __construct(DocumentManager $dm)
 
     public function make(RouteStack $routeStack)
     {
-        $context = $autoRouteStack->getContext();
+        $context = $routeStack->getContext();
         $content = $context->getContent();
 
         $autoRoute = $this->getAutoRouteForDocument($content);
@@ -34,9 +35,9 @@ public function make(RouteStack $routeStack)
             $autoRoute->setRouteContent($content);
         }
 
-        $autoRoute->setName($autoRouteStack->getPath());
+        $autoRoute->setName($routeStack->getPath());
 
-        $autoRouteStack->addRoute($autoRoute);
+        $routeStack->addRoute($autoRoute);
     }
 
     protected function getAutoRouteForDocument($document)

Tests/AutoRoute/AutoRouteMakerTest.php renamed to Tests/AutoRoute/RouteMaker/AutoRouteMakerTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute\RouteMaker;
 
-use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\AutoRouteMaker;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker\AutoRouteMaker;
 use Doctrine\Common\Collections\ArrayCollection;
 
 class AutoRouteMakerTest extends \PHPUnit_Framework_TestCase
@@ -85,7 +85,7 @@ public function testCreateOrUpdateAutoRouteForExisting()
             ->method('addRoute')
             ->with($this->autoRoute1);
 
-        $this->arm->createOrUpdateAutoRoute($this->autoRouteStack);
+        $this->arm->make($this->autoRouteStack);
     }
 
     public function testCreateOrUpdateAutoRouteForNew()
@@ -108,6 +108,6 @@ public function testCreateOrUpdateAutoRouteForNew()
                 $testCase->assertInstanceOf('Symfony\Cmf\Bundle\RoutingAutoBundle\Document\AutoRoute', $route);
             }));
 
-        $this->arm->createOrUpdateAutoRoute($this->autoRouteStack);
+        $this->arm->make($this->autoRouteStack);
     }
 }