Merge pull request #18 from dantleech/routing-bundle

Updated to use RoutingBundle

Author: dantleech

AutoRoute/BuilderContext.php

@@ -2,7 +2,7 @@
 
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute;
 
-use Symfony\Cmf\Bundle\RoutingExtraBundle\Document\Route;
+use Symfony\Cmf\Bundle\RoutingBundle\Document\Route;
 
 /**
  * This class might better be called AutoRouteRequest.

AutoRoute/PathActionInterface.php

@@ -2,7 +2,7 @@
 
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute;
 
-use Symfony\Cmf\Bundle\RoutingExtraBundle\Document\Route;
+use Symfony\Cmf\Bundle\RoutingBundle\Document\Route;
 
 /**
  * The job of classes implementing this interface is to add

AutoRoute/PathNotExists/ThrowException.php

@@ -11,12 +11,6 @@
  */
 class ThrowException implements PathActionInterface
 {
-    protected $routeMaker;
-
-    public function __construct()
-    {
-    }
-
     public function init(array $options)
     {
     }

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\RoutingExtraBundle\Document\Route;
+use Symfony\Cmf\Bundle\RoutingBundle\Document\Route;
 use Doctrine\Common\Collections\ArrayCollection;
 
 /**

AutoRoute/RouteMaker/RouteMaker.php

@@ -7,7 +7,7 @@
 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\RoutingExtraBundle\Document\Route;
+use Symfony\Cmf\Bundle\RoutingBundle\Document\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\RoutingExtraBundle\Document\Route;
+use Symfony\Cmf\Bundle\RoutingBundle\Document\Route;
 
 /**
  * Sub class of Route to enable automatically generated routes

README.md

@@ -1,8 +1,12 @@
 # [WIP] Symfony CMF Routing Auto Route Bundle [![Build Status](https://secure.travis-ci.org/symfony-cmf/RoutingAutoBundle.png)](http://travis-ci.org/symfony-cmf/RoutingAutoBundle)
 
-This bundle is a WIP which automatically creates and manages routes for configured persisted 
+This bundle automatically creates and manages routes for configured persisted 
 document classes.
 
+*WARNING*: This bundle is still experimental. It works, but there may be some
+as-yet unknown issues. The API, however, should not change too much in the
+future.
+
 See the [official documentation](http://symfony.com/doc/master/cmf/bundles/routing-auto.html)
 
 ## Example configuration
@@ -42,7 +46,7 @@ The following is the current functional test configuration:
 ## Restrictions:
 
  * Only documents stored with PHPCR-ODM are supported.
- * You must have the RoutingExtraBundle installed.
+ * You must have the RoutingBundle installed.
 
 ## Installation
 

Tests/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\RoutingExtraBundle\Document\Route')
+        $this->route1 = $this->getMockBuilder('Symfony\Cmf\Bundle\RoutingBundle\Document\Route')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->route2 = $this->getMockBuilder('Symfony\Cmf\Bundle\RoutingExtraBundle\Document\Route')
+        $this->route2 = $this->getMockBuilder('Symfony\Cmf\Bundle\RoutingBundle\Document\Route')
             ->disableOriginalConstructor()
             ->getMock();
 

Tests/AutoRoute/PathProvider/ContentObjectProviderTest.php

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

Tests/AutoRoute/RouteMaker/RouteMakerTest.php

@@ -4,7 +4,7 @@
 
 class RouteMakerTest extends GenericMakerTest
 {
-    protected $routeClass = 'Symfony\Cmf\Bundle\RoutingExtraBundle\Document\Route';
+    protected $routeClass = 'Symfony\Cmf\Bundle\RoutingBundle\Document\Route';
     protected $makerClass = 'Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker\RouteMaker';
 
     public function testMake()
@@ -27,15 +27,15 @@ public function testMake()
                 static $i = 0;
                 $expected = array('/test', '/test/foo');
 
-                $this->assertInstanceOf(
-                    'Symfony\Cmf\Bundle\RoutingExtraBundle\Document\Route', 
+                $test->assertInstanceOf(
+                    'Symfony\Cmf\Bundle\RoutingBundle\Document\Route', 
                     $doc
                 );
 
-                $this->assertEquals($expected[$i++], $doc->getId());
+                $test->assertEquals($expected[$i++], $doc->getId());
                 $defaults = $doc->getDefaults();
-                $this->assertTrue(isset($defaults['_controller']));
-                $this->assertEquals('foobar', $defaults['_controller']);
+                $test->assertTrue(isset($defaults['_controller']));
+                $test->assertEquals('foobar', $defaults['_controller']);
             }));
 
         $this->routeMaker->make($this->routeStack);