Implemented format option

Author: wouterj

AutoRoute/PathExists/AutoIncrementPath.php

@@ -16,6 +16,7 @@ class AutoIncrementPath implements PathActionInterface
 {
     protected $dm;
     protected $routeMaker;
+    protected $format = '%s-%d';
 
     public function __construct(DocumentManager $dm, RouteMakerInterface $routeMaker)
     {
@@ -25,6 +26,9 @@ public function __construct(DocumentManager $dm, RouteMakerInterface $routeMaker
 
     public function init(array $options)
     {
+        if (isset($options['format'])) {
+            $this->format = '%s'.$options['format'];
+        }
     }
 
     public function execute(RouteStack $routeStack)
@@ -42,7 +46,7 @@ public function execute(RouteStack $routeStack)
         }
 
         do {
-            $newPath = sprintf('%s-%d', $path, $inc++);
+            $newPath = sprintf($this->format, $path, $inc++);
         } while (null !== $this->dm->find(null, $newPath));
 
         $routeStack->replaceLastPathElement(PathHelper::getNodeName($newPath));

Tests/Unit/AutoRoute/PathExists/AutoIncrementPathTest.php

@@ -124,19 +124,19 @@ public function testFormatOption()
 
         $this->dm->expects($this->at(1))
             ->method('find')
-            ->with(null, '/foo/bar/1')
+            ->with(null, '/foo/bar1')
             ->will($this->returnValue(null));
 
         $this->routeStack->expects($this->once())
             ->method('replaceLastPathElement')
-            ->with('bar/2');
+            ->with('bar1');
 
         $this->routeMaker->expects($this->once())
             ->method('make')
             ->with($this->routeStack);
 
         $aiPath = new AutoIncrementPath($this->dm, $this->routeMaker);
-        $aiPath->init(array('format' => '/%d'));
+        $aiPath->init(array('format' => '%d'));
         $aiPath->execute($this->routeStack);
     }
 }