Merge pull request #59 from WouterJ/issue_13

Removed feature string -> path feature

Author: dantleech

AutoRoute/PathProvider/ContentDateTimeProvider.php

@@ -54,9 +54,17 @@ public function providePath(RouteStack $routeStack)
             throw new \RuntimeException(sprintf('Method %s:%s must return an instance of DateTime.'));
         }
 
-        $string = $date->format($this->dateFormat);
-        $pathElements = $this->normalizePathElements($string);
+        $dateString = $date->format($this->dateFormat);
+        $pathElements = $this->normalizePathElements($dateString);
 
         $routeStack->addPathElements($pathElements);
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function normalizePathElements($elements)
+    {
+        return parent::normalizePathElements(explode('/', $elements));
+    }
 }

AutoRoute/PathProvider/ContentMethodProvider.php

@@ -83,7 +83,7 @@ protected function normalizePathElements($pathElements)
                 throw new \RuntimeException('Path must not be absolute.');
             }
 
-            $pathElements = explode('/', $pathElements);
+            $pathElements = array($pathElements);
         }
 
         if (!is_array($pathElements)) {

Tests/Unit/AutoRoute/PathProvider/ContentMethodProviderTest.php

@@ -97,6 +97,9 @@ public function testProvideMethodNoSlugify()
     public function testProvideMethodWithString()
     {
         $this->setupTest();
+        $this->routeStack->expects($this->once())
+            ->method('addPathElements')
+            ->with(array('this/is/a/path'));
 
         $this->provider->init(array('method' => 'getStringSlug'));
         $this->provider->providePath($this->routeStack);