Merge pull request #193 from symfony-cmf/analysis-XWDLEj

Apply fixes from StyleCI

Author: wouterj

src/Adapter/PhpcrOdmAdapter.php

@@ -3,20 +3,20 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 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\RoutingAutoBundle\Adapter;
 
-use Doctrine\ODM\PHPCR\DocumentManager;
-use Doctrine\ODM\PHPCR\Document\Generic;
 use Doctrine\Common\Util\ClassUtils;
+use Doctrine\ODM\PHPCR\Document\Generic;
+use Doctrine\ODM\PHPCR\DocumentManager;
+use Symfony\Cmf\Component\RoutingAuto\AdapterInterface;
 use Symfony\Cmf\Component\RoutingAuto\Model\AutoRouteInterface;
 use Symfony\Cmf\Component\RoutingAuto\UriContext;
-use Symfony\Cmf\Component\RoutingAuto\AdapterInterface;
 
 /**
  * Adapter for PHPCR-ODM.
@@ -58,7 +58,7 @@ public function getLocales($contentDocument)
             return $this->dm->getLocalesFor($contentDocument);
         }
 
-        return array();
+        return [];
     }
 
     /**

src/CmfRoutingAutoBundle.php

@@ -3,19 +3,19 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 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\RoutingAutoBundle;
 
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass;
-use Symfony\Cmf\Bundle\RoutingAutoBundle\DependencyInjection\Compiler\ServicePass;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\DependencyInjection\Compiler\AdapterPass;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\DependencyInjection\Compiler\ServicePass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class CmfRoutingAutoBundle extends Bundle
 {
@@ -46,12 +46,12 @@ private function buildPhpcrCompilerPass(ContainerBuilder $container)
         if (isset($bundles['CmfRoutingBundle'])) {
             $container->addCompilerPass(
                 DoctrinePhpcrMappingsPass::createXmlMappingDriver(
-                    array(
+                    [
                         realpath(__DIR__.'/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingAutoBundle\Model',
-                    ),
-                    array('cmf_routing_auto.persistence.phpcr.manager_name'),
+                    ],
+                    ['cmf_routing_auto.persistence.phpcr.manager_name'],
                     false,
-                    array('CmfRoutingAutoBundle' => 'Symfony\Cmf\Bundle\RoutingAutoBundle\Model')
+                    ['CmfRoutingAutoBundle' => 'Symfony\Cmf\Bundle\RoutingAutoBundle\Model']
                 )
             );
         }

src/Command/RefreshCommand.php

@@ -3,20 +3,20 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 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\RoutingAutoBundle\Command;
 
+use Doctrine\Bundle\PHPCRBundle\Command\DoctrineCommandHelper;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Cmf\Component\RoutingAuto\UriContextCollection;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Doctrine\Bundle\PHPCRBundle\Command\DoctrineCommandHelper;
-use Symfony\Cmf\Component\RoutingAuto\UriContextCollection;
+use Symfony\Component\Console\Output\OutputInterface;
 
 class RefreshCommand extends ContainerAwareCommand
 {
@@ -75,7 +75,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         );
 
         if ($class) {
-            $mapping = array($class => $class);
+            $mapping = [$class => $class];
         } else {
             $mapping = iterator_to_array($factory->getIterator());
         }

src/Controller/RedirectController.php

@@ -3,16 +3,16 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 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\RoutingAutoBundle\Controller;
 
-use Symfony\Cmf\Component\RoutingAuto\Model\AutoRouteInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Cmf\Component\RoutingAuto\Model\AutoRouteInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\Routing\RouterInterface;
 

src/DependencyInjection/CmfRoutingAutoExtension.php

@@ -3,20 +3,20 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 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\RoutingAutoBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\Definition\Processor;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class CmfRoutingAutoExtension extends Extension
 {
@@ -35,7 +35,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         $config = $processor->processConfiguration($configuration, $configs);
 
-        $resources = array();
+        $resources = [];
 
         // auto mapping
         if ($config['auto_mapping']) {
@@ -79,14 +79,14 @@ public function load(array $configs, ContainerBuilder $container)
 
     protected function findMappingFiles($bundles)
     {
-        $resources = array();
+        $resources = [];
         foreach ($bundles as $bundle) {
             $refl = new \ReflectionClass($bundle);
             $bundlePath = dirname($refl->getFileName());
-            foreach (array('xml', 'yml') as $extension) {
+            foreach (['xml', 'yml'] as $extension) {
                 $path = $bundlePath.'/Resources/config/cmf_routing_auto.'.$extension;
                 if (file_exists($path)) {
-                    $resources[] = array('path' => $path, 'type' => null);
+                    $resources[] = ['path' => $path, 'type' => null];
                 }
             }
         }

src/DependencyInjection/Compiler/AdapterPass.php

@@ -3,16 +3,16 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 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\RoutingAutoBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * @author Daniel Leech <[email protected]>
@@ -29,7 +29,7 @@ public function process(ContainerBuilder $container)
 
         $adapter = $container->getParameter('cmf_routing_auto.adapter_name');
         $adapterId = null;
-        $adapterNames = array();
+        $adapterNames = [];
         $ids = $container->findTaggedServiceIds('cmf_routing_auto.adapter');
 
         foreach ($ids as $id => $attributes) {

src/DependencyInjection/Compiler/ServicePass.php

@@ -3,16 +3,16 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 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\RoutingAutoBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
@@ -32,11 +32,11 @@ public function process(ContainerBuilder $container)
             'cmf_routing_auto.service_registry'
         );
 
-        $types = array(
+        $types = [
             'token_provider' => 'registerTokenProvider',
             'defunct_route_handler' => 'registerDefunctRouteHandler',
             'conflict_resolver' => 'registerConflictResolver',
-        );
+        ];
 
         foreach ($types as $type => $registerMethod) {
             $ids = $container->findTaggedServiceIds('cmf_routing_auto.'.$type);
@@ -51,7 +51,7 @@ public function process(ContainerBuilder $container)
 
                 $builderUnitChainFactory->addMethodCall(
                     $registerMethod,
-                    array($attributes[0]['alias'], new Reference($id))
+                    [$attributes[0]['alias'], new Reference($id)]
                 );
             }
         }

src/DependencyInjection/Configuration.php

@@ -3,16 +3,16 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 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\RoutingAutoBundle\DependencyInjection;
 
-use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 class Configuration implements ConfigurationInterface
 {
@@ -37,7 +37,7 @@ public function getConfigTreeBuilder()
                                 ->beforeNormalization()
                                     ->ifString()
                                     ->then(function ($v) {
-                                        return array('path' => $v);
+                                        return ['path' => $v];
                                     })
                                 ->end()
                                 ->children()

src/Doctrine/Phpcr/AutoRouteListener.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,10 +13,10 @@
 
 use Doctrine\Common\Persistence\Event\ManagerEventArgs;
 use Doctrine\ODM\PHPCR\DocumentManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRoute;
-use Symfony\Cmf\Component\RoutingAuto\UriContextCollection;
 use Symfony\Cmf\Component\RoutingAuto\Mapping\Exception\ClassNotMappedException;
+use Symfony\Cmf\Component\RoutingAuto\UriContextCollection;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Doctrine PHPCR ODM listener for maintaining automatic routes.

src/Model/AutoRoute.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.