Apply fixes from StyleCI

[ci skip] [skip ci]

Author: wouterj

src/CmfMenuBundle.php

@@ -11,11 +11,11 @@
 
 namespace Symfony\Cmf\Bundle\MenuBundle;
 
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass;
 use Symfony\Cmf\Bundle\MenuBundle\DependencyInjection\Compiler\DecorateMenuFactoryPass;
 use Symfony\Cmf\Bundle\MenuBundle\DependencyInjection\Compiler\ValidationPass;
-use Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class CmfMenuBundle extends Bundle
 {
@@ -29,13 +29,13 @@ public function build(ContainerBuilder $container)
         if (class_exists('Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass')) {
             $container->addCompilerPass(
                 DoctrinePhpcrMappingsPass::createXmlMappingDriver(
-                    array(
+                    [
                         realpath(__DIR__.'/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\MenuBundle\Model',
                         realpath(__DIR__.'/Resources/config/doctrine-phpcr') => 'Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr',
-                    ),
-                    array('cmf_menu.manager_name'),
+                    ],
+                    ['cmf_menu.manager_name'],
                     false,
-                    array('CmfMenuBundle' => 'Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr')
+                    ['CmfMenuBundle' => 'Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr']
                 )
             );
         }

src/DependencyInjection/CmfMenuExtension.php

@@ -11,11 +11,11 @@
 
 namespace Symfony\Cmf\Bundle\MenuBundle\DependencyInjection;
 
+use Symfony\Cmf\Bundle\RoutingBundle\Routing\DynamicRouter;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Cmf\Bundle\RoutingBundle\Routing\DynamicRouter;
 
 class CmfMenuExtension extends Extension
 {
@@ -71,14 +71,14 @@ public function loadVoters($config, XmlFileLoader $loader, ContainerBuilder $con
 
     public function loadPhpcr($config, XmlFileLoader $loader, ContainerBuilder $container)
     {
-        $keys = array(
+        $keys = [
             'menu_document_class' => 'menu_document.class',
             'node_document_class' => 'node_document.class',
             'menu_basepath' => 'menu_basepath',
             'content_basepath' => 'content_basepath',
             'manager_name' => 'manager_name',
             'prefetch' => 'prefetch',
-        );
+        ];
 
         foreach ($keys as $sourceKey => $targetKey) {
             $container->setParameter(

src/DependencyInjection/Compiler/DecorateMenuFactoryPass.php

@@ -12,8 +12,8 @@
 namespace Symfony\Cmf\Bundle\MenuBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Alias;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class DecorateMenuFactoryPass implements CompilerPassInterface
 {

src/DependencyInjection/Compiler/ValidationPass.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Cmf\Bundle\MenuBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * Register validation files only if their persistence layer is enabled.

src/DependencyInjection/Configuration.php

@@ -59,7 +59,7 @@ public function getConfigTreeBuilder()
                     ->addDefaultsIfNotSet()
                     ->children()
                         ->enumNode('enabled')
-                            ->values(array(true, false, 'auto'))
+                            ->values([true, false, 'auto'])
                             ->defaultValue('auto')
                         ->end()
                     ->end()

src/Extension/ContentExtension.php

@@ -47,11 +47,11 @@ public function __construct(UrlGeneratorInterface $contentRouter)
      */
     public function buildOptions(array $options)
     {
-        $options = array_merge(array(
+        $options = array_merge([
             'content' => null,
             'linkType' => null,
-            'extras' => array(),
-        ), $options);
+            'extras' => [],
+        ], $options);
 
         if (null === $options['linkType']) {
             $options['linkType'] = $this->determineLinkType($options);
@@ -66,7 +66,7 @@ public function buildOptions(array $options)
 
             $options['uri'] = $this->contentRouter->generate(
                 $options['content'],
-                isset($options['routeParameters']) ? $options['routeParameters'] : array(),
+                isset($options['routeParameters']) ? $options['routeParameters'] : [],
                 (isset($options['routeAbsolute']) && $options['routeAbsolute']) ? UrlGeneratorInterface::ABSOLUTE_URL : UrlGeneratorInterface::ABSOLUTE_PATH
             );
         }
@@ -121,7 +121,7 @@ protected function determineLinkType($options)
      */
     protected function validateLinkType($linkType)
     {
-        $linkTypes = array('uri', 'route', 'content');
+        $linkTypes = ['uri', 'route', 'content'];
         if (!in_array($linkType, $linkTypes)) {
             throw new \InvalidArgumentException(sprintf(
                 'Invalid link type "%s", expected: "%s"',

src/Model/MenuNode.php

@@ -12,9 +12,9 @@
 namespace Symfony\Cmf\Bundle\MenuBundle\Model;
 
 use Symfony\Cmf\Bundle\CoreBundle\Model\ChildInterface;
-use Symfony\Cmf\Bundle\CoreBundle\Translatable\TranslatableInterface;
-use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishTimePeriodInterface;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishableInterface;
+use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishTimePeriodInterface;
+use Symfony\Cmf\Bundle\CoreBundle\Translatable\TranslatableInterface;
 
 /**
  * This is the standard CMF MenuNode implementation.
@@ -149,10 +149,10 @@ public function getOptions()
     {
         $options = parent::getOptions();
 
-        return array_merge($options, array(
+        return array_merge($options, [
             'linkType' => $this->linkType,
             'content' => $this->getContent(),
-        ));
+        ]);
     }
 
     /**

src/Model/MenuNodeBase.php

@@ -71,7 +71,7 @@ class MenuNodeBase implements NodeInterface
      *
      * @var array
      */
-    protected $attributes = array();
+    protected $attributes = [];
 
     /**
      * HTML attributes to add to the children list element.
@@ -80,7 +80,7 @@ class MenuNodeBase implements NodeInterface
      *
      * @var array
      */
-    protected $childrenAttributes = array();
+    protected $childrenAttributes = [];
 
     /**
      * HTML attributes to add to items link.
@@ -89,7 +89,7 @@ class MenuNodeBase implements NodeInterface
      *
      * @var array
      */
-    protected $linkAttributes = array();
+    protected $linkAttributes = [];
 
     /**
      * HTML attributes to add to the items label.
@@ -98,14 +98,14 @@ class MenuNodeBase implements NodeInterface
      *
      * @var array
      */
-    protected $labelAttributes = array();
+    protected $labelAttributes = [];
 
     /**
      * Hashmap for extra stuff associated to the node.
      *
      * @var array
      */
-    protected $extras = array();
+    protected $extras = [];
 
     /**
      * Parameters to use when generating the route.
@@ -114,7 +114,7 @@ class MenuNodeBase implements NodeInterface
      *
      * @var array
      */
-    protected $routeParameters = array();
+    protected $routeParameters = [];
 
     /**
      * Set to false to not render.
@@ -351,7 +351,7 @@ public function setChildrenAttributes(array $attributes)
      */
     public function getChildren()
     {
-        $children = array();
+        $children = [];
         foreach ($this->children as $child) {
             if (!$child instanceof NodeInterface) {
                 continue;
@@ -575,7 +575,7 @@ public function isDisplayable()
      */
     public function getOptions()
     {
-        return array(
+        return [
             'uri' => $this->getUri(),
             'route' => $this->getRoute(),
             'label' => $this->getLabel(),
@@ -587,6 +587,6 @@ public function getOptions()
             'routeAbsolute' => $this->getRouteAbsolute(),
             'linkAttributes' => $this->getLinkAttributes(),
             'labelAttributes' => $this->getLabelAttributes(),
-        );
+        ];
     }
 }

src/Provider/PhpcrMenuProvider.php

@@ -13,16 +13,16 @@
 
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\PHPCR\DocumentManager;
-use Knp\Menu\Loader\NodeLoader;
-use PHPCR\RepositoryException;
-use Symfony\Component\HttpFoundation\Request;
-use PHPCR\PathNotFoundException;
-use PHPCR\Util\PathHelper;
 use Jackalope\Session;
 use Knp\Menu\FactoryInterface;
 use Knp\Menu\ItemInterface;
+use Knp\Menu\Loader\NodeLoader;
 use Knp\Menu\NodeInterface;
 use Knp\Menu\Provider\MenuProviderInterface;
+use PHPCR\PathNotFoundException;
+use PHPCR\RepositoryException;
+use PHPCR\Util\PathHelper;
+use Symfony\Component\HttpFoundation\Request;
 
 class PhpcrMenuProvider implements MenuProviderInterface
 {
@@ -165,7 +165,7 @@ public function setRequest(Request $request = null)
      *
      * @throws \InvalidArgumentException if the menu can not be found
      */
-    public function get($name, array $options = array())
+    public function get($name, array $options = [])
     {
         $menu = $this->find($name, $options, true);
 
@@ -189,7 +189,7 @@ public function get($name, array $options = array())
      *
      * @return bool Whether a menu with this name can be loaded by this provider
      */
-    public function has($name, array $options = array())
+    public function has($name, array $options = [])
     {
         return $this->find($name, $options, false) instanceof NodeInterface;
     }

src/PublishWorkflow/CreateMenuItemFromNodeListener.php

@@ -11,9 +11,9 @@
 
 namespace Symfony\Cmf\Bundle\MenuBundle\PublishWorkflow;
 
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Cmf\Bundle\MenuBundle\Event\CreateMenuItemFromNodeEvent;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
+use Symfony\Cmf\Bundle\MenuBundle\Event\CreateMenuItemFromNodeEvent;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
 /**
  * Listener for the CREATE_ITEM_FROM_NODE event that skips the node if it is