adjust to routing refactoring

Author: dbu

AutoRoute/BuilderContext.php

@@ -2,8 +2,6 @@
 
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute;
 
-use Symfony\Cmf\Bundle\RoutingBundle\Document\Route;
-
 /**
  * This class might better be called AutoRouteRequest.
  * It holds all the RouteStack objects and the content document.
@@ -16,7 +14,9 @@
  */
 class BuilderContext
 {
+    /** @var RouteStack[] */
     protected $routeStacks = array();
+    /** @var RouteStack */
     protected $stagedRouteStack;
     protected $content;
 
@@ -47,7 +47,7 @@ public function stageRouteStack(RouteStack $routeStack)
     }
 
     /**
-     * As with above. This can probably be replaced with something 
+     * As with above. This can probably be replaced with something
      * simpler.
      */
     public function commitRouteStack()

AutoRoute/PathActionInterface.php

@@ -2,8 +2,6 @@
 
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute;
 
-use Symfony\Cmf\Bundle\RoutingBundle\Document\Route;
-
 /**
  * The job of classes implementing this interface is to add
  * a Route for each path element in the given RouteStack.

AutoRoute/PathProvider/ContentObjectProvider.php

@@ -8,7 +8,7 @@
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStack;
 use Symfony\Cmf\Bundle\CoreBundle\Slugifier\SlugifierInterface;
 use Doctrine\ODM\PHPCR\DocumentManager;
-use Symfony\Cmf\Bundle\RoutingBundle\Document\Route;
+use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
 use Doctrine\Common\Collections\ArrayCollection;
 
 /**
@@ -75,7 +75,7 @@ public function providePath(RouteStack $routeStack)
 
         // Now check to see if there are any scheduled routes
         // I think this should be handled by the ODM ...
-        
+
         $uow = $this->dm->getUnitOfWork();
         $scheduledInserts = $uow->getScheduledInserts();
         $scheduledRoutes = array_filter($scheduledInserts, $routeFilter);

AutoRoute/RouteMaker/RouteMaker.php

@@ -6,8 +6,7 @@
 use Doctrine\ODM\PHPCR\DocumentManager;
 use Doctrine\ODM\PHPCR\Document\Generic;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStack;
-use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Exception\MissingOptionException;
-use Symfony\Cmf\Bundle\RoutingBundle\Document\Route;
+use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
 
 /**
  * This class will make the Route classes using

Document/AutoRoute.php

@@ -2,7 +2,7 @@
 
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Document;
 
-use Symfony\Cmf\Bundle\RoutingBundle\Document\Route;
+use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
 
 /**
  * Sub class of Route to enable automatically generated routes

Tests/Resources/Document/Blog.php

@@ -19,8 +19,8 @@ class Blog
 
     /**
      * @PHPCR\Referrers(
-     *   referringDocument="Symfony\Cmf\Bundle\RoutingBundle\Document\Route", 
-     *   referencedBy="routeContent"
+     *   referringDocument="Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route",
+     *   referencedBy="content"
      * )
      */
     public $routes;

Tests/Resources/Document/Post.php

@@ -19,8 +19,8 @@ class Post
 
     /**
      * @PHPCR\Referrers(
-     *   referringDocument="Symfony\Cmf\Bundle\RoutingBundle\Document\Route", 
-     *   referencedBy="routeContent"
+     *   referringDocument="Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route",
+     *   referencedBy="content"
      * )
      */
     public $routes;

Tests/Unit/AutoRoute/PathExists/AutoIncrementPathTest.php

@@ -23,10 +23,10 @@ public function setUp()
         $this->builderContext = $this->getMock('Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\BuilderContext');
 
         $this->aiPath = new AutoIncrementPath($this->dm, $this->routeMaker);
-        $this->route1 = $this->getMockBuilder('Symfony\Cmf\Bundle\RoutingBundle\Document\Route')
+        $this->route1 = $this->getMockBuilder('Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->route2 = $this->getMockBuilder('Symfony\Cmf\Bundle\RoutingBundle\Document\Route')
+        $this->route2 = $this->getMockBuilder('Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route')
             ->disableOriginalConstructor()
             ->getMock();
 

Tests/Unit/AutoRoute/PathProvider/ContentObjectProviderTest.php

@@ -35,7 +35,7 @@ public function setUp()
             ->getMock();
 
         $this->contentObject = new \stdClass;
-        $this->route1 = $this->getMock('Symfony\Cmf\Bundle\RoutingBundle\Document\Route');
+        $this->route1 = $this->getMock('Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route');
         $this->object = new ContentObjectTestClass($this->contentObject);
 
 

Tests/Unit/AutoRoute/RouteMaker/RouteMakerTest.php

@@ -6,7 +6,7 @@
 
 class RouteMakerTest extends GenericMakerTest
 {
-    protected $routeClass = 'Symfony\Cmf\Bundle\RoutingBundle\Document\Route';
+    protected $routeClass = 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route';
     protected $makerClass = 'Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker\RouteMaker';
 
     public function testMake()
@@ -30,7 +30,7 @@ public function testMake()
                 $expected = array('/test', '/test/foo');
 
                 $test->assertInstanceOf(
-                    'Symfony\Cmf\Bundle\RoutingBundle\Document\Route', 
+                    $this->routeClass,
                     $doc
                 );