Merge pull request #225 from symfony-cmf/avoid-errors-on-menuprovider-has

prevent exceptions on menu names that are not valid node names

Author: dbu

.travis.yml

@@ -20,6 +20,7 @@ matrix:
       env: SYMFONY_VERSION=2.6.*
 
 before_script:
+  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
   - composer self-update
   - composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source
   - vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh

Provider/PhpcrMenuProvider.php

@@ -13,6 +13,7 @@
 
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\PHPCR\DocumentManager;
+use PHPCR\RepositoryException;
 use Symfony\Component\HttpFoundation\Request;
 use PHPCR\PathNotFoundException;
 use PHPCR\Util\PathHelper;
@@ -214,9 +215,20 @@ protected function find($name, array $options, $throw)
             return false;
         }
 
-        $path = PathHelper::absolutizePath($name, $this->getMenuRoot());
         $dm = $this->getObjectManager();
         $session = $dm->getPhpcrSession();
+
+        try {
+            $path = PathHelper::absolutizePath($name, $this->getMenuRoot());
+            PathHelper::assertValidAbsolutePath($path, false, true, $session->getNamespacePrefixes());
+        } catch (RepositoryException $e) {
+            if ($throw) {
+                throw $e;
+            }
+
+            return false;
+        }
+
         if ($this->getPrefetch() > 0) {
             try {
                 if (

Tests/Unit/Provider/PhpcrMenuProviderTest.php

@@ -22,6 +22,10 @@ private function getDmMock($path)
             ->method('getNode')
             ->with($path)
         ;
+        $session->expects($this->once())
+            ->method('getNamespacePrefixes')
+            ->will($this->returnValue(array('jcr', 'nt')))
+        ;
         $dm = $this
             ->getMockBuilder('Doctrine\ODM\PHPCR\DocumentManager')
             ->disableOriginalConstructor()
@@ -90,15 +94,53 @@ public function testHas($menuRoot, $name, $expectedPath)
             $menuRoot
         );
 
-        $provider->has($name);
+        $this->assertTrue($provider->has($name));
+    }
+
+    public function testHasNot()
+    {
+        $session = $this->getMock('PHPCR\SessionInterface');
+        $session->expects($this->never())
+            ->method('getNode')
+        ;
+        $session->expects($this->any())
+            ->method('getNamespacePrefixes')
+            ->will($this->returnValue(array('jcr', 'nt')))
+        ;
+        $objectManager = $this
+            ->getMockBuilder('Doctrine\ODM\PHPCR\DocumentManager')
+            ->disableOriginalConstructor()
+            ->getMock()
+        ;
+        $objectManager->expects($this->any())
+            ->method('getPhpcrSession')
+            ->will($this->returnValue($session))
+        ;
+        $objectManager->expects($this->never())
+            ->method('find')
+        ;
+
+        $managerRegistry = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+        $managerRegistry->expects($this->any())
+            ->method('getManager')
+            ->will($this->returnValue($objectManager));
+
+        $provider = new PhpcrMenuProvider(
+            $this->getMock('Knp\Menu\FactoryInterface'),
+            $managerRegistry,
+            '/foo'
+        );
+
+        $this->assertFalse($provider->has('notavalidnamespace:bar'));
+        $this->assertFalse($provider->has('not:a:valid:name'));
     }
 
     public function getMenuTests()
     {
         return array(
             array('/test/menu', 'foo', '/test/menu/foo'),
             array('/test/menu', '/another/menu/path', '/another/menu/path'),
+            array('/test/menu', 'jcr:namespaced', '/test/menu/jcr:namespaced'),
         );
     }
-
 }