make sure that we only return route objects from route provider. fix #152

Author: dbu

Doctrine/Phpcr/RouteProvider.php

@@ -110,8 +110,12 @@ public function getRouteByName($name, $parameters = array())
     {
         // $name is the route document path
         $route = $this->getObjectManager()->find($this->className, $name);
+
         if (!$route) {
-            throw new RouteNotFoundException("No route found for path '$name'");
+            throw new RouteNotFoundException(sprintf('No route found for path "%s"', $name));
+        }
+        if (!$route instanceof SymfonyRoute) {
+            throw new RouteNotFoundException(sprintf('Document at path "%s" is no route', $name));
         }
 
         return $route;

Tests/Unit/Doctrine/Phpcr/RouteProviderTest.php

@@ -33,10 +33,12 @@ public function testGetRouteCollectionForRequest()
 
     public function testGetRouteByName()
     {
+
         $this->route
             ->expects($this->any())
             ->method('getPath')
-            ->will($this->returnValue('/cms/routes/test-route'));
+            ->will($this->returnValue('/cms/routes/test-route'))
+        ;
 
         $this->objectManager
             ->expects($this->any())
@@ -60,6 +62,54 @@ public function testGetRouteByName()
         $this->assertEquals('/cms/routes/test-route', $foundRoute->getPath());
     }
 
+    /**
+     * @expectedException \Symfony\Component\Routing\Exception\RouteNotFoundException
+     */
+    public function testGetRouteByNameNotFound()
+    {
+        $this->objectManager
+            ->expects($this->any())
+            ->method('find')
+            ->with(null, '/cms/routes/test-route')
+            ->will($this->returnValue(null))
+        ;
+
+        $this->managerRegistry
+            ->expects($this->any())
+            ->method('getManager')
+            ->will($this->returnValue($this->objectManager))
+        ;
+
+        $routeProvider = new RouteProvider($this->managerRegistry);
+        $routeProvider->setManagerName('default');
+
+        $routeProvider->getRouteByName('/cms/routes/test-route');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Routing\Exception\RouteNotFoundException
+     */
+    public function testGetRouteByNameNoRoute()
+    {
+        $this->objectManager
+            ->expects($this->any())
+            ->method('find')
+            ->with(null, '/cms/routes/test-route')
+            ->will($this->returnValue($this))
+        ;
+
+        $this->managerRegistry
+            ->expects($this->any())
+            ->method('getManager')
+            ->will($this->returnValue($this->objectManager))
+        ;
+
+        $routeProvider = new RouteProvider($this->managerRegistry);
+        $routeProvider->setManagerName('default');
+
+        $routeProvider->getRouteByName('/cms/routes/test-route');
+    }
+
     public function testGetRoutesByNames()
     {
         $this->markTestIncomplete();