Integrated conflict resolvers

Author: dantleech

AutoRoute/AutoRouteManager.php

@@ -61,7 +61,7 @@ public function buildUrlContextCollection(UrlContextCollection $urlContextCollec
                     $autoRoute = $existingRoute;
                 } else {
                     $url = $urlContext->getUrl();
-                    $url = $this->urlGenerator->resolveConflict($url);
+                    $url = $this->urlGenerator->resolveConflict($urlContext);
                     $urlContext->setUrl($url);
                 }
             }

AutoRoute/Mapping/ClassMetadata.php

@@ -32,9 +32,9 @@ class ClassMetadata extends MergeableClassMetadata
     protected $tokenProviders = array();
 
     /** 
-     * @var null|array
+     * @var array
      */
-    protected $conflictResolver;
+    protected $conflictResolver = array('name' => 'throw_exception', 'options' => array());
 
     /**
      * Defunct route handler, default to remove
@@ -122,17 +122,6 @@ public function getConflictResolver()
         return $this->conflictResolver;
     }
 
-    /**
-     * Return true if a conflict resolver configuration
-     * has been registered.
-     *
-     * @return boolean
-     */
-    public function hasConflictResolver()
-    {
-        return null !== $this->conflictResolver;
-    }
-
     /**
      * Set the defunct route handler configuration.
      *
@@ -155,16 +144,6 @@ public function getDefunctRouteHandler()
         return $this->defunctRouteHandler;
     }
 
-    /**
-     * Return true if a defunct route handler has been set.
-     *
-     * @return boolean
-     */
-    public function hasDefunctRouteHandler()
-    {
-        return null !== $this->defunctRouteHandler;
-    }
-
     /**
      * Extend the metadata of the mapped class with given $name
      *

AutoRoute/UrlGenerator.php

@@ -66,12 +66,15 @@ public function generateUrl(UrlContext $urlContext)
      */
     public function resolveConflict(UrlContext $urlContext)
     {
-        $realClassName = $this->driver->getRealClassName($urlContext->getSubjectObject());
-        $metadata = $this->factory->getMetadataForClass($realClassName);
+        $realClassName = $this->driver->getRealClassName(get_class($urlContext->getSubjectObject()));
+        $metadata = $this->metadataFactory->getMetadataForClass($realClassName);
 
-        list ($name, $config) = $metadata->getConflictResolverConfig();
-        $conflictResolver = $this->serviceRegistry->getConflictResolver($name, $config);
-        $url = $conflictResolver->resolveConflict($url);
+        $conflictResolverConfig = $metadata->getConflictResolver();
+        $conflictResolver = $this->serviceRegistry->getConflictResolver(
+            $conflictResolverConfig['name'], 
+            $conflictResolverConfig['options']
+        );
+        $url = $conflictResolver->resolveConflict($urlContext);
 
         return $url;
     }

Tests/Functional/Command/RefreshCommandTest.php

@@ -32,6 +32,7 @@ protected function createBlog($withPosts = false)
 
         if ($withPosts) {
             $post = new Post;
+            $post->name = 'This is a post title';
             $post->title = 'This is a post title';
             $post->body = 'Test Body';
             $post->blog = $blog;

Tests/Functional/EventListener/AutoRouteListenerTest.php

@@ -32,6 +32,7 @@ protected function createBlog($withPosts = false)
 
         if ($withPosts) {
             $post = new Post;
+            $post->name = 'This is a post title';
             $post->title = 'This is a post title';
             $post->blog = $blog;
             $post->date = new \DateTime('2013/03/21');
@@ -398,7 +399,62 @@ public function testParentClassMapping()
         $this->assertCount(1, $routes);
     }
 
-    public function testConflictResolver()
+    public function testConflictResolverAutoIncrement()
     {
+        $this->createBlog();
+        $blog = $this->getDm()->find(null, '/test/test-blog');
+
+        $post = new Post;
+        $post->name = 'Post 1';
+        $post->title = 'Same Title';
+        $post->blog = $blog;
+        $post->date = new \DateTime('2013/03/21');
+        $this->getDm()->persist($post);
+        $this->getDm()->flush();
+
+        $post = new Post;
+        $post->name = 'Post 2';
+        $post->title = 'Same Title';
+        $post->blog = $blog;
+        $post->date = new \DateTime('2013/03/21');
+        $this->getDm()->persist($post);
+        $this->getDm()->flush();
+
+        $post = new Post;
+        $post->name = 'Post 3';
+        $post->title = 'Same Title';
+        $post->blog = $blog;
+        $post->date = new \DateTime('2013/03/21');
+        $this->getDm()->persist($post);
+        $this->getDm()->flush();
+
+        $expectedRoutes = array(
+            '/test/auto-route/blog/unit-testing-blog/2013/03/21/same-title',
+            '/test/auto-route/blog/unit-testing-blog/2013/03/21/same-title-1',
+            '/test/auto-route/blog/unit-testing-blog/2013/03/21/same-title-2',
+        );
+
+        foreach ($expectedRoutes as $expectedRoute) {
+            $route = $this->getDm()->find('Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRouteInterface', $expectedRoute);
+            $this->assertNotNull($route);
+        }
+    }
+
+    /**
+     * @expectedException Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\ConflictResolver\Exception\ExistingUrlException
+     */
+    public function testConflictResolverDefaultThrowException()
+    {
+        $blog = new Blog;
+        $blog->path = '/test/test-blog';
+        $blog->title = 'Unit testing blog';
+        $this->getDm()->persist($blog);
+        $this->getDm()->flush();
+
+        $blog = new Blog;
+        $blog->path = '/test/test-blog-the-second';
+        $blog->title = 'Unit testing blog';
+        $this->getDm()->persist($blog);
+        $this->getDm()->flush();
     }
 }

Tests/Resources/Document/Post.php

@@ -41,6 +41,11 @@ class Post
     /**
      * @PHPCR\NodeName()
      */
+    public $name;
+
+    /**
+     * @PHPCR\String()
+     */
     public $title;
 
     /**

Tests/Resources/app/config/routing_auto.yml

@@ -5,6 +5,7 @@ Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Blog:
 
 Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Post:
     url_schema: /blog/{blog_title}/{post_date}/{post_title}
+    conflict_resolver: [auto_increment, { }]
     token_providers:
         blog_title: [content_method, { method: getBlogTitle } ]
         post_date: [content_datetime, { method: getDate, date_format: Y/m/d, slugify: false } ]