findRouteForUri returns false if found node is not an AutoRoute

Author: mmenozzi

Adapter/PhpcrOdmAdapter.php

@@ -190,8 +190,11 @@ public function getReferringAutoRoutes($contentDocument)
     public function findRouteForUri($uri, UriContext $uriContext)
     {
         $path = $this->getPathFromUri($uri);
-
-        return $this->dm->find(null, $path);
+        $node = $this->dm->find(null, $path);
+        if ($node instanceof AutoRouteInterface) {
+            return $node;
+        }
+        return false;
     }
 
     private function getPathFromUri($uri)

Tests/Unit/Adapter/PhpcrOdmAdapterTest.php

@@ -174,11 +174,19 @@ public function testGetReferringRoutes()
     public function testFindRouteForUri()
     {
         $uri = '/this/is/uri';
-        $expectedRoutes = array($this->route->reveal());
+        $expectedRoute = $this->route->reveal();
 
-        $this->dm->find(null, $this->baseRoutePath . $uri)->willReturn($expectedRoutes);
+        $this->dm->find(null, $this->baseRoutePath . $uri)->willReturn($expectedRoute);
 
         $res = $this->adapter->findRouteForUri($uri, $this->uriContext->reveal());
-        $this->assertSame($expectedRoutes, $res);
+        $this->assertSame($expectedRoute, $res);
+    }
+
+    public function testFindRouteForUriShouldReturnFalseWhenNodeAtGivenPathIsNotAnAutoRoute()
+    {
+        $uri = '/this/is/uri';
+        $genericNode = $this->prophesize('Doctrine\ODM\PHPCR\Document\Generic');
+        $this->dm->find(null, $this->baseRoutePath . $uri)->willReturn($genericNode);
+        $this->assertFalse($this->adapter->findRouteForUri($uri, $this->uriContext->reveal()));
     }
 }