Added auto-increment conflict resolver

Author: dantleech

AutoRoute/ConflictResolver/AutoIncrementConflictResolver.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\ConflictResolver;
+
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\ConflictResolverInterface;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\UrlContext;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Adapter\AdapterInterface;
+
+/**
+ * This conflict resolver will generate candidate URLs by appending 
+ * a number to the URL. It will keep incrementing this number until
+ * the URL does not exist.
+ *
+ * @author Daniel Leech <[email protected]>
+ */
+class AutoIncrementConflictResolver implements ConflictResolverInterface
+{
+    protected $adapter;
+    protected $inc;
+
+    /**
+     * @param AdapterInterface $adapter
+     */
+    public function __construct(AdapterInterface $adapter)
+    {
+        $this->adapter = $adapter;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function resolveConflict(UrlContext $urlContext)
+    {
+        $this->inc = 0;
+
+        $url = $urlContext->getUrl();
+        $candidateUrl = $this->incrementUrl($url);
+
+        while ($route = $this->adapter->findRouteForUrl($candidateUrl)) {
+            $candidateUrl = $this->incrementUrl($url);
+        }
+
+        return $candidateUrl;
+    }
+
+    protected function incrementUrl($url)
+    {
+        return sprintf('%s-%s', $url, ++$this->inc);
+    }
+}

AutoRoute/ConflictResolver/ThrowExceptionConflictResolver.php

@@ -397,4 +397,8 @@ public function testParentClassMapping()
 
         $this->assertCount(1, $routes);
     }
+
+    public function testConflictResolver()
+    {
+    }
 }

Tests/Functional/EventListener/AutoRouteListenerTest.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute\ConflictResolver;
+
+use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\BaseTestCase;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\ConflictResolver\AutoIncrementConflictResolver;
+
+class AutoIncrementConflictResolverTest extends BaseTestCase
+{
+    protected $adapter;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->adapter = $this->prophesize('Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Adapter\AdapterInterface');
+
+        $this->conflictResolver = new AutoIncrementConflictResolver($this->adapter->reveal());
+        $this->urlContext = $this->prophesize('Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\UrlContext');
+    }
+
+    public function provideResolveConflict()
+    {
+        return array(
+            array(
+                '/foobar/bar',
+                array(
+                    '/foobar/bar-1',
+                ),
+                '/foobar/bar-2'
+            ),
+            array(
+                '/foobar/bar',
+                array(
+                    '/foobar/bar-1',
+                    '/foobar/bar-2',
+                    '/foobar/bar-4',
+                ),
+                '/foobar/bar-3'
+            )
+        );
+    }
+
+    /**
+     * @dataProvider provideResolveConflict
+     */
+    public function testResolveConflict($url, $existingRoutes, $expectedResult)
+    {
+        $this->urlContext->getUrl()->willReturn($url);
+
+        foreach ($existingRoutes as $existingRoute) {
+            $this->adapter->findRouteForUrl($existingRoute)->willReturn(new \stdClass);
+        }
+        $this->adapter->findRouteForUrl($expectedResult)->willReturn(null);
+
+        $url = $this->conflictResolver->resolveConflict($this->urlContext->reveal());
+        $this->assertEquals($expectedResult, $url);
+    }
+}