Merge pull request #239 from symfony-cmf/merge-1.2

dbu · dbu · commit ee6ace86d753 · 2016-01-03T17:34:28.000+01:00
Merge 1.2
diff --git a/.travis.yml b/.travis.yml
@@ -12,34 +12,33 @@ sudo: false
 
 cache:
   directories:
-    - $HOME/.composer/cache
+    - $HOME/.composer/cache/files
 
 env:
-  - SYMFONY_VERSION=2.7.* SYMFONY_DEPRECATIONS_HELPER=weak
+  global: SYMFONY_DEPRECATIONS_HELPER=533
 
 matrix:
   include:
+    - php: 5.6
+      env: DEPS=dev
     - php: 5.3
       env: SYMFONY_VERSION="^2.3.4" COMPOSER_FLAGS="--prefer-lowest"
     - php: 5.6
-      env: SYMFONY_VERSION=2.3.* SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 5.6
-      env: SYMFONY_VERSION=2.8.*
+      env: SYMFONY_VERSION=2.3.*
     - php: 5.6
-      env: SYMFONY_VERSION=3.0.*
-  allow_failures:
-    - env: SYMFONY_VERSION=2.8.*
-    - env: SYMFONY_VERSION=3.0.*
+      env: SYMFONY_VERSION=2.7.*
   fast_finish: true
 
 before_install:
-  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
+  - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
+  - phpenv config-rm xdebug.ini || true
   - composer self-update
-  - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
+  - if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
 
-install: composer update $COMPOSER_FLAGS --prefer-dist
+install: composer update --prefer-dist $COMPOSER_FLAGS
 
-script: phpunit --coverage-text
+script: phpunit
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
diff --git a/Admin/MenuNodeAdmin.php b/Admin/MenuNodeAdmin.php
@@ -169,6 +169,7 @@ public function buildBreadcrumbs($action, MenuItemInterface $menu = null)
         }
 
         $parentAdmin->setSubject($parentDoc);
+        $parentAdmin->setRequest($this->request);
         $parentEditNode = $parentAdmin->buildBreadcrumbs($action, $menu);
         if ($parentAdmin->isGranted('EDIT' && $parentAdmin->hasRoute('edit'))) {
             $parentEditNode->setUri(
diff --git a/Extension/ContentExtension.php b/Extension/ContentExtension.php
@@ -67,7 +67,7 @@ public function buildOptions(array $options)
             $options['uri'] = $this->contentRouter->generate(
                 $options['content'],
                 isset($options['routeParameters']) ? $options['routeParameters'] : array(),
-                isset($options['routeAbsolute']) ? $options['routeAbsolute'] : false
+                (isset($options['routeAbsolute']) && $options['routeAbsolute']) ? UrlGeneratorInterface::ABSOLUTE_URL : UrlGeneratorInterface::ABSOLUTE_PATH
             );
         }
 
diff --git a/Provider/PhpcrMenuProvider.php b/Provider/PhpcrMenuProvider.php
@@ -13,8 +13,8 @@
 
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\PHPCR\DocumentManager;
-use Knp\Menu\Loader\LoaderInterface;
 use Knp\Menu\Loader\NodeLoader;
+use PHPCR\RepositoryException;
 use Symfony\Component\HttpFoundation\Request;
 use PHPCR\PathNotFoundException;
 use PHPCR\Util\PathHelper;
@@ -27,9 +27,9 @@
 class PhpcrMenuProvider implements MenuProviderInterface
 {
     /**
-     * @var LoaderInterface
+     * @var NodeLoader
      */
-    protected $loader = null;
+    protected $loader;
 
     /**
      * @var Request
@@ -217,9 +217,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 (
diff --git a/Resources/translations/CmfMenuBundle.cs.xliff b/Resources/translations/CmfMenuBundle.cs.xliff
@@ -114,6 +114,26 @@
         <source>form.label_weak</source>
         <target>Slabé propojení</target>
       </trans-unit>
+      <trans-unit id="show.label_id">
+        <source>show.label_id</source>
+        <target>Id</target>
+      </trans-unit>
+      <trans-unit id="show.label_name">
+        <source>show.label_name</source>
+        <target>Název</target>
+      </trans-unit>
+      <trans-unit id="show.label_label">
+        <source>show.label_label</source>
+        <target>Označení</target>
+      </trans-unit>
+      <trans-unit id="show.label_uri">
+        <source>show.label_uri</source>
+        <target>URI</target>
+      </trans-unit>
+      <trans-unit id="show.label_content">
+        <source>show.label_content</source>
+        <target>Obsah</target>
+      </trans-unit>
       <trans-unit id="help.items_help">
         <source>help.items_help</source>
         <target>Klepněte na položku, kterou chcete upravit. Klikněte pravým tlačítkem myši pro přidání nových záznamů.</target>
diff --git a/Resources/translations/CmfMenuBundle.de.xliff b/Resources/translations/CmfMenuBundle.de.xliff
@@ -106,6 +106,26 @@
         <source>form.label_link_type</source>
         <target>Linktyp</target>
       </trans-unit>
+      <trans-unit id="show.label_id">
+        <source>show.label_id</source>
+        <target>Id</target>
+      </trans-unit>
+      <trans-unit id="show.label_name">
+        <source>show.label_name</source>
+        <target>Name</target>
+      </trans-unit>
+      <trans-unit id="show.label_label">
+        <source>show.label_label</source>
+        <target>Beschriftung</target>
+      </trans-unit>
+      <trans-unit id="show.label_uri">
+        <source>show.label_uri</source>
+        <target>URI</target>
+      </trans-unit>
+      <trans-unit id="show.label_content">
+        <source>show.label_content</source>
+        <target>Inhalt</target>
+      </trans-unit>
       <trans-unit id="help.items_help">
         <source>help.items_help</source>
         <target>Klicken Sie auf ein Element, um es zu bearbeiten. Rechtsklick um Einträge hinzuzufügen.</target>
diff --git a/Resources/translations/CmfMenuBundle.en.xliff b/Resources/translations/CmfMenuBundle.en.xliff
@@ -114,6 +114,28 @@
         <source>form.label_weak</source>
         <target>Weak association</target>
       </trans-unit>
+
+      <trans-unit id="show.label_id">
+        <source>show.label_id</source>
+        <target>Id</target>
+      </trans-unit>
+      <trans-unit id="show.label_name">
+        <source>show.label_name</source>
+        <target>Name</target>
+      </trans-unit>
+      <trans-unit id="show.label_label">
+        <source>show.label_label</source>
+        <target>Label</target>
+      </trans-unit>
+      <trans-unit id="show.label_uri">
+        <source>show.label_uri</source>
+        <target>URI</target>
+      </trans-unit>
+      <trans-unit id="show.label_content">
+        <source>show.label_content</source>
+        <target>Content</target>
+      </trans-unit>
+
       <trans-unit id="help.items_help">
         <source>help.items_help</source>
         <target>Click on item to edit, right click to create new items.</target>
diff --git a/Resources/translations/CmfMenuBundle.fr.xliff b/Resources/translations/CmfMenuBundle.fr.xliff
@@ -114,6 +114,28 @@
         <source>form.label_weak</source>
         <target>Association faible</target>
       </trans-unit>
+
+      <trans-unit id="show.label_id">
+        <source>show.label_id</source>
+        <target>Id</target>
+      </trans-unit>
+      <trans-unit id="show.label_name">
+        <source>show.label_name</source>
+        <target>Nom</target>
+      </trans-unit>
+      <trans-unit id="show.label_label">
+        <source>show.label_label</source>
+        <target>Label</target>
+      </trans-unit>
+      <trans-unit id="show.label_uri">
+        <source>show.label_uri</source>
+        <target>URI</target>
+      </trans-unit>
+      <trans-unit id="show.label_content">
+        <source>show.label_content</source>
+        <target>Contenu</target>
+      </trans-unit>
+
       <trans-unit id="help.items_help">
         <source>help.items_help</source>
         <target>Cliquez sur un élément pour le modifier, cliquez avec la touche droite pour ajouter des éléments.</target>
diff --git a/Resources/translations/CmfMenuBundle.sk.xliff b/Resources/translations/CmfMenuBundle.sk.xliff
@@ -114,6 +114,28 @@
         <source>form.label_weak</source>
         <target>Slabé prepojenie</target>
       </trans-unit>
+
+      <trans-unit id="show.label_id">
+        <source>show.label_id</source>
+        <target>Id</target>
+      </trans-unit>
+      <trans-unit id="show.label_name">
+        <source>show.label_name</source>
+        <target>Názov</target>
+      </trans-unit>
+      <trans-unit id="show.label_label">
+        <source>show.label_label</source>
+        <target>Označenie</target>
+      </trans-unit>
+      <trans-unit id="show.label_uri">
+        <source>show.label_uri</source>
+        <target>URI</target>
+      </trans-unit>
+      <trans-unit id="show.label_content">
+        <source>show.label_content</source>
+        <target>Obsah</target>
+      </trans-unit>
+
       <trans-unit id="help.items_help">
         <source>help.items_help</source>
         <target>Kliknite na položku, ktorú chcete upraviť. Kliknite pravým tlačidlom myši pre pridanie nových záznamov.</target>
diff --git a/Resources/translations/CmfMenuBundle.sl.xliff b/Resources/translations/CmfMenuBundle.sl.xliff
@@ -114,6 +114,26 @@
         <source>form.label_weak</source>
         <target>Slaba pridružitev</target>
       </trans-unit>
+      <trans-unit id="show.label_id">
+        <source>show.label_id</source>
+        <target>Id</target>
+      </trans-unit>
+      <trans-unit id="show.label_name">
+        <source>show.label_name</source>
+        <target>Ime</target>
+      </trans-unit>
+      <trans-unit id="show.label_label">
+        <source>show.label_label</source>
+        <target>Oznaka</target>
+      </trans-unit>
+      <trans-unit id="show.label_uri">
+        <source>show.label_uri</source>
+        <target>URI</target>
+      </trans-unit>
+      <trans-unit id="show.label_content">
+        <source>show.label_content</source>
+        <target>Vsebina</target>
+      </trans-unit>
       <trans-unit id="help.items_help">
         <source>help.items_help</source>
         <target>Kliknite na element za urejanje, desni klik za ustvarjanje novih elementov.</target>
diff --git a/Tests/Unit/Extension/ContentExtensionTest.php b/Tests/Unit/Extension/ContentExtensionTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\MenuBundle\Tests\Unit\Extension;
 
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Cmf\Bundle\MenuBundle\Extension\ContentExtension;
 
 class ContentExtensionTest extends \PHPUnit_Framework_TestCase
@@ -76,7 +77,7 @@ public function testContentLinkType($typeSet)
 
         $this->generator->expects($this->once())
                 ->method('generate')
-                ->with('configured_content', array('test' => 'foo'), true)
+                ->with('configured_content', array('test' => 'foo'), UrlGeneratorInterface::ABSOLUTE_URL)
                 ->willReturn('/generated_uri');
 
         $this->assertEquals(
@@ -103,7 +104,7 @@ public function testOptionsAsRemovedWhenLinkTypeIsElse()
 
         $this->generator->expects($this->once())
             ->method('generate')
-            ->with('configured_content', array(), false)
+            ->with('configured_content', array(), UrlGeneratorInterface::ABSOLUTE_PATH)
             ->willReturn('/generated_uri');
 
         $this->assertEquals(
diff --git a/Tests/Unit/Provider/PhpcrMenuProviderTest.php b/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,14 +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->getMockBuilder('Knp\Menu\Loader\NodeLoader')->disableOriginalConstructor()->getMock(),
+            $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'),
         );
     }
 }
diff --git a/composer.json b/composer.json
@@ -11,8 +11,6 @@
             "homepage": "https://github.com/symfony-cmf/MenuBundle/contributors"
         }
     ],
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "require": {
         "php": "^5.3.9|^7.0",
         "symfony/framework-bundle": "^2.3",
@@ -25,7 +23,7 @@
     "require-dev": {
         "symfony/monolog-bundle": "^2.3",
         "symfony-cmf/routing-bundle": "^1.2.0-RC3",
-        "symfony-cmf/testing": "^1.3",
+        "symfony-cmf/testing": "^1.3@dev",
         "symfony-cmf/tree-browser-bundle": "^1.0.0-RC1",
         "doctrine/phpcr-odm": "^1.3",
         "twig/twig": "^1.12.1",

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ public function buildBreadcrumbs($action, MenuItemInterface $menu = null)`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`$parentAdmin->setSubject($parentDoc);`
	`172`	`+ $parentAdmin->setRequest($this->request);`
`172`	`173`	`$parentEditNode = $parentAdmin->buildBreadcrumbs($action, $menu);`
`173`	`174`	`if ($parentAdmin->isGranted('EDIT' && $parentAdmin->hasRoute('edit'))) {`
`174`	`175`	`$parentEditNode->setUri(`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function buildOptions(array $options)`
`67`	`67`	`$options['uri'] = $this->contentRouter->generate(`
`68`	`68`	`$options['content'],`
`69`	`69`	`isset($options['routeParameters']) ? $options['routeParameters'] : array(),`
`70`		`- isset($options['routeAbsolute']) ? $options['routeAbsolute'] : false`
	`70`	`+ (isset($options['routeAbsolute']) && $options['routeAbsolute']) ? UrlGeneratorInterface::ABSOLUTE_URL : UrlGeneratorInterface::ABSOLUTE_PATH`
`71`	`71`	`);`
`72`	`72`	`}`
`73`	`73`