Merge pull request #167 from symfony-cmf/generic-intermediate-node-fixes

Fixes and changelog

Author: dantleech

Adapter/PhpcrOdmAdapter.php

@@ -213,14 +213,10 @@ public function getReferringAutoRoutes($contentDocument)
      */
     public function findRouteForUri($uri, UriContext $uriContext)
     {
-        $path = $this->getPathFromUri($uri);
-        $document = $this->dm->find(null, $path);
-
-        if ($document instanceof AutoRouteInterface) {
-            return $document;
-        }
-
-        return null;
+        return $this->dm->find(
+            'Symfony\Cmf\Component\RoutingAuto\Model\AutoRouteInterface', 
+            $this->getPathFromUri($uri)
+        );
     }
 
     private function getPathFromUri($uri)

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+dev-master
+----------
+
+* Convert non-managed intermediate nodes into AutoRoute documents #165
+
 1.0.0
 -----
 

Tests/Unit/Adapter/PhpcrOdmAdapterTest.php

@@ -184,7 +184,7 @@ public function provideCompareRouteContent()
     public function testCompareRouteContent($isMatch)
     {
         $this->route->getContent()->willReturn($this->contentDocument);
-        $content = $isMatch ? $this->contentDocument : $this->contentDocument2;
+        $isMatch ? $this->contentDocument : $this->contentDocument2;
 
         $this->adapter->compareAutoRouteContent($this->route->reveal(), $this->contentDocument);
     }
@@ -203,17 +203,9 @@ public function testFindRouteForUri()
         $uri = '/this/is/uri';
         $expectedRoute = $this->route->reveal();
 
-        $this->dm->find(null, $this->baseRoutePath . $uri)->willReturn($expectedRoute);
+        $this->dm->find('Symfony\Cmf\Component\RoutingAuto\Model\AutoRouteInterface', $this->baseRoutePath . $uri)->willReturn($expectedRoute);
 
         $res = $this->adapter->findRouteForUri($uri, $this->uriContext->reveal());
         $this->assertSame($expectedRoute, $res);
     }
-
-    public function testFindRouteForUriShouldReturnNullWhenNodeAtGivenPathIsNotAnAutoRoute()
-    {
-        $uri = '/this/is/uri';
-        $genericNode = $this->prophesize('Doctrine\ODM\PHPCR\Document\Generic');
-        $this->dm->find(null, $this->baseRoutePath . $uri)->willReturn($genericNode);
-        $this->assertNull($this->adapter->findRouteForUri($uri, $this->uriContext->reveal()));
-    }
 }