Merge pull request #104 from symfony-cmf/release-1.2

prepare release 1.2

Author: dbu

.styleci.yml

@@ -0,0 +1 @@
+preset: symfony

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.2.0
+-----
+
+* Symfony 3 compatibility
+
 1.1.0-RC1
 ---------
 

CmfTreeBrowserBundle.php

@@ -1,12 +1,20 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\TreeBrowserBundle;
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\PassConfig;
+namespace Symfony\Cmf\Bundle\TreeBrowserBundle;
 
 use Symfony\Cmf\Bundle\TreeBrowserBundle\DependencyInjection\Compiler\AddTreesCompilerPass;
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class CmfTreeBrowserBundle extends Bundle
 {
@@ -15,5 +23,4 @@ public function build(ContainerBuilder $container)
         parent::build($container);
         $container->addCompilerPass(new AddTreesCompilerPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION);
     }
-
 }

Controller/TreeBrowserController.php

@@ -1,12 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Cmf\Bundle\TreeBrowserBundle\Controller;
 
+use Symfony\Cmf\Bundle\TreeBrowserBundle\Tree\TreeInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\JsonResponse;
-
-use Symfony\Cmf\Bundle\TreeBrowserBundle\Tree\TreeInterface;
 
 /**
  * Frontend to the TreeInterface, allowing to fetch children, get an edit form
@@ -23,7 +31,7 @@ class TreeBrowserController
     protected $tree;
 
     /**
-     * Create the controller
+     * Create the controller.
      *
      * @param TreeInterface $tree the tree to operate on
      */
@@ -33,13 +41,13 @@ public function __construct(TreeInterface $tree)
     }
 
     /**
-     * Get a json encoded list of children the specified node has
+     * Get a json encoded list of children the specified node has.
      *
      * @param Request $request containing the parameter 'root' for which to get
-     *      the children
+     *                         the children
      *
      * @return Response json encoded list of child nodes of the specified root
-     *      node.
+     *                  node.
      */
     public function childrenAction(Request $request)
     {
@@ -58,10 +66,10 @@ public function childrenAction(Request $request)
      * Should only be configured for POST requests to avoid manipulations.
      *
      * @param Request $request with the parameters dropped and target,
-     *      containing the path to move from resp. to
+     *                         containing the path to move from resp. to
      *
      * @return Response returning a plain text result with the new path of the
-     *      node.
+     *                  node.
      */
     public function moveAction(Request $request)
     {
@@ -77,10 +85,10 @@ public function moveAction(Request $request)
      * Should only be configured for POST requests to avoid manipulations.
      *
      * @param Request $request with the parameters dropped and target,
-     *      containing the path to move from resp. to
+     *                         containing the path to move from resp. to
      *
      * @return Response returning a plain text result with the new path of the
-     *      node.
+     *                  node.
      */
     public function reorderAction(Request $request)
     {

DependencyInjection/CmfTreeBrowserExtension.php

@@ -1,22 +1,30 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Cmf\Bundle\TreeBrowserBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
-  * @author Lukas Kahwe Smith <[email protected]>
-  */
+ * @author Lukas Kahwe Smith <[email protected]>
+ */
 class CmfTreeBrowserExtension extends Extension
 {
     /**
      * Loads the services based on your application configuration.
      *
-     * @param array $configs
+     * @param array            $configs
      * @param ContainerBuilder $container
      */
     public function load(array $configs, ContainerBuilder $container)
@@ -28,7 +36,6 @@ public function load(array $configs, ContainerBuilder $container)
         if (isset($bundles['DoctrinePHPCRBundle'])
             && $config['persistence']['phpcr']['enabled']
         ) {
-
             $loader->load('tree-phpcr.xml');
             $phpcrTree = $container->getDefinition('cmf_tree_browser.phpcr_tree');
             $phpcrTree->replaceArgument(1, $config['persistence']['phpcr']['session_name']);

DependencyInjection/Compiler/AddTreesCompilerPass.php

@@ -1,11 +1,19 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Cmf\Bundle\TreeBrowserBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
-use Symfony\Component\DependencyInjection\Reference;
 
 class AddTreesCompilerPass implements CompilerPassInterface
 {
@@ -33,5 +41,4 @@ public function process(ContainerBuilder $container)
         }
         $container->setParameter('cmf_tree_browser.tree_controllers', $controllers);
     }
-
-}
+}

DependencyInjection/Configuration.php

@@ -1,12 +1,21 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Cmf\Bundle\TreeBrowserBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * This class contains the configuration information for the bundle
+ * This class contains the configuration information for the bundle.
  *
  * This information is solely responsible for how the different configuration
  * sections are normalized, and merged.
@@ -37,8 +46,7 @@ public function getConfigTreeBuilder()
                         ->end()
                     ->end()
                 ->end()
-            ->end()
-        ;
+            ->end();
 
         return $treeBuilder;
     }

Route/TreeControllerRoutesLoader.php

@@ -1,14 +1,23 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Cmf\Bundle\TreeBrowserBundle\Route;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\FileLoader;
-use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
 
 /**
- * Load routes for all existing tree controllers
+ * Load routes for all existing tree controllers.
  */
 class TreeControllerRoutesLoader extends FileLoader
 {
@@ -37,7 +46,7 @@ public function load($resource, $type = null)
         foreach ($this->treeControllers as $controller) {
             foreach ($this->getRoutesDefinitions() as $name => $definition) {
                 $defaults = array(
-                    '_controller' => $controller['id'].':'.$definition['action']
+                    '_controller' => $controller['id'].':'.$definition['action'],
                 );
                 $path = '_cmf_tree/'.$controller['alias'].'/'.$definition['path'];
 
@@ -55,7 +64,7 @@ public function load($resource, $type = null)
      * @param mixed  $resource A resource
      * @param string $type     The resource type
      *
-     * @return Boolean true if this class supports the given resource, false otherwise
+     * @return bool true if this class supports the given resource, false otherwise
      */
     public function supports($resource, $type = null)
     {
@@ -70,19 +79,19 @@ protected function getRoutesDefinitions()
     {
         return array(
             'children' => array(
-                'path'   => 'children',
+                'path' => 'children',
                 'method' => 'GET',
-                'action' => 'childrenAction'
+                'action' => 'childrenAction',
             ),
             'move' => array(
-                'path'   => 'move',
+                'path' => 'move',
                 'method' => 'POST',
-                'action' => 'moveAction'
+                'action' => 'moveAction',
             ),
             'reorder' => array(
-                'path'   => 'reorder',
+                'path' => 'reorder',
                 'method' => 'POST',
-                'action' => 'reorderAction'
+                'action' => 'reorderAction',
             ),
         );
     }

Tests/Functional/PHPCR/PHPCRBrowserTest.php

@@ -1,12 +1,20 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\TreeBrowserBundle\Tests\Functional\PHPCR;
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
+namespace Symfony\Cmf\Bundle\TreeBrowserBundle\Tests\Functional\PHPCR;
 
 use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;
 
 /**
- * Functional test for PHPCRBrowser
+ * Functional test for PHPCRBrowser.
  *
  * @author Jacopo Jakuza Romei <[email protected]>
  */
@@ -49,11 +57,11 @@ public function testGetChildrenListFromInnerNode()
     protected function loadFixtures()
     {
         $session = $this->getContainer()->get('doctrine_phpcr.session');
-        if ($session->nodeExists("/cms")) {
-            $session->getNode("/cms")->remove();
+        if ($session->nodeExists('/cms')) {
+            $session->getNode('/cms')->remove();
         }
-        if ($session->nodeExists("/menus")) {
-            $session->getNode("/menus")->remove();
+        if ($session->nodeExists('/menus')) {
+            $session->getNode('/menus')->remove();
         }
 
         $node = $session->getRootNode()->addNode('cms', 'nt:unstructured');
@@ -66,5 +74,4 @@ protected function loadFixtures()
 
         $session->save();
     }
-
 }

Tests/Resources/app/AppKernel.php

@@ -1,13 +1,23 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 use Symfony\Cmf\Component\Testing\HttpKernel\TestKernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+
 class AppKernel extends TestKernel
 {
     public function configure()
     {
         $this->requireBundleSets(array(
-            'default', 'phpcr_odm'
+            'default', 'phpcr_odm',
         ));
 
         $this->addBundles(array(
@@ -20,4 +30,3 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load(__DIR__.'/config/config.php');
     }
 }
-