Merge pull request #855 from carusogabriel/doctrine-cs-v5

Apply Doctrine CS v5
doctrine · Oct 29, 2018 · 11539a0 · 11539a0
2 parents 3ed47e7 + 2d95620
commit 11539a0
Show file tree

Hide file tree

Showing 36 changed files with 302 additions and 295 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -63,7 +63,7 @@ jobs:
       env: CODING_STANDARDS
       php: 7.1
       install:
-        - travis_retry composer require -n --prefer-dist --dev doctrine/coding-standard:^4.0
+        - travis_retry composer require -n --prefer-dist --dev doctrine/coding-standard:^5.0
       script:
         - ./vendor/bin/phpcs
 

diff --git a/Command/CreateDatabaseDoctrineCommand.php b/Command/CreateDatabaseDoctrineCommand.php
@@ -3,6 +3,8 @@
 namespace Doctrine\Bundle\DoctrineBundle\Command;
 
 use Doctrine\DBAL\DriverManager;
+use Exception;
+use InvalidArgumentException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -75,7 +77,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $hasPath = isset($params['path']);
         $name    = $hasPath ? $params['path'] : (isset($params['dbname']) ? $params['dbname'] : false);
         if (! $name) {
-            throw new \InvalidArgumentException("Connection does not contain a 'path' or 'dbname' parameter and cannot be created.");
+            throw new InvalidArgumentException("Connection does not contain a 'path' or 'dbname' parameter and cannot be created.");
         }
         // Need to get rid of _every_ occurrence of dbname from connection configuration and we have already extracted all relevant info from url
         unset($params['dbname'], $params['path'], $params['url']);
@@ -97,7 +99,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $tmpConnection->getSchemaManager()->createDatabase($name);
                 $output->writeln(sprintf('<info>Created database <comment>%s</comment> for connection named <comment>%s</comment></info>', $name, $connectionName));
             }
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $output->writeln(sprintf('<error>Could not create database <comment>%s</comment> for connection named <comment>%s</comment></error>', $name, $connectionName));
             $output->writeln(sprintf('<error>%s</error>', $e->getMessage()));
             $error = true;

diff --git a/Command/DoctrineCommand.php b/Command/DoctrineCommand.php
@@ -6,6 +6,7 @@
 use Doctrine\DBAL\Sharding\PoolingShardConnection;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\EntityGenerator;
+use LogicException;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 
 /**
@@ -35,7 +36,7 @@ protected function getEntityGenerator()
      * Get a doctrine entity manager by symfony name.
      *
      * @param string   $name
-     * @param null|int $shardId
+     * @param int|null $shardId
      *
      * @return EntityManager
      */
@@ -45,7 +46,7 @@ protected function getEntityManager($name, $shardId = null)
 
         if ($shardId) {
             if (! $manager->getConnection() instanceof PoolingShardConnection) {
-                throw new \LogicException(sprintf("Connection of EntityManager '%s' must implement shards configuration.", $name));
+                throw new LogicException(sprintf("Connection of EntityManager '%s' must implement shards configuration.", $name));
             }
 
             $manager->getConnection()->connect($shardId);

diff --git a/Command/DropDatabaseDoctrineCommand.php b/Command/DropDatabaseDoctrineCommand.php
@@ -3,6 +3,8 @@
 namespace Doctrine\Bundle\DoctrineBundle\Command;
 
 use Doctrine\DBAL\DriverManager;
+use Exception;
+use InvalidArgumentException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -80,7 +82,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $name = isset($params['path']) ? $params['path'] : (isset($params['dbname']) ? $params['dbname'] : false);
         if (! $name) {
-            throw new \InvalidArgumentException("Connection does not contain a 'path' or 'dbname' parameter and cannot be dropped.");
+            throw new InvalidArgumentException("Connection does not contain a 'path' or 'dbname' parameter and cannot be dropped.");
         }
         unset($params['dbname'], $params['url']);
 
@@ -112,7 +114,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             } else {
                 $output->writeln(sprintf('<info>Database <comment>%s</comment> for connection named <comment>%s</comment> doesn\'t exist. Skipped.</info>', $name, $connectionName));
             }
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $output->writeln(sprintf('<error>Could not drop database <comment>%s</comment> for connection named <comment>%s</comment></error>', $name, $connectionName));
             $output->writeln(sprintf('<error>%s</error>', $e->getMessage()));
 

diff --git a/Command/GenerateEntitiesDoctrineCommand.php b/Command/GenerateEntitiesDoctrineCommand.php
@@ -4,6 +4,8 @@
 
 use Doctrine\Bundle\DoctrineBundle\Mapping\DisconnectedMetadataFactory;
 use Doctrine\ORM\Tools\EntityRepositoryGenerator;
+use InvalidArgumentException;
+use RuntimeException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -86,7 +88,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             $output->writeln(sprintf('Generating entities for bundle "<info>%s</info>"', $bundle->getName()));
             $metadata = $manager->getBundleMetadata($bundle);
-        } catch (\InvalidArgumentException $e) {
+        } catch (InvalidArgumentException $e) {
             $name = strtr($input->getArgument('name'), '/', '\\');
             $pos  = strpos($name, ':');
 
@@ -117,7 +119,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             // Getting the metadata for the entity class once more to get the correct path if the namespace has multiple occurrences
             try {
                 $entityMetadata = $manager->getClassMetadata($m->getName(), $input->getOption('path'));
-            } catch (\RuntimeException $e) {
+            } catch (RuntimeException $e) {
                 // fall back to the bundle metadata when no entity class could be found
                 $entityMetadata = $metadata;
             }

diff --git a/Command/ImportMappingDoctrineCommand.php b/Command/ImportMappingDoctrineCommand.php
@@ -6,6 +6,7 @@
 use Doctrine\ORM\Tools\Console\MetadataFilter;
 use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory;
 use Doctrine\ORM\Tools\Export\ClassMetadataExporter;
+use InvalidArgumentException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -89,7 +90,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $namespace = $namespaceOrBundle;
             $destPath  = $input->getOption('path');
             if ($destPath === null) {
-                throw new \InvalidArgumentException('The --path option is required when passing a namespace (e.g. --path=src). If you intended to pass a bundle name, check your spelling.');
+                throw new InvalidArgumentException('The --path option is required when passing a namespace (e.g. --path=src). If you intended to pass a bundle name, check your spelling.');
             }
         }
 

diff --git a/Command/Proxy/DelegateCommand.php b/Command/Proxy/DelegateCommand.php
@@ -3,6 +3,7 @@
 namespace Doctrine\Bundle\DoctrineBundle\Command\Proxy;
 
 use Doctrine\ORM\Version;
+use RuntimeException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -53,7 +54,7 @@ public function isEnabled()
     protected function wrapCommand($entityManagerName)
     {
         if (! $this->isVersionCompatible()) {
-            throw new \RuntimeException(sprintf('"%s" requires doctrine-orm "%s" or newer', $this->getName(), $this->getMinimalVersion()));
+            throw new RuntimeException(sprintf('"%s" requires doctrine-orm "%s" or newer', $this->getName(), $this->getMinimalVersion()));
         }
 
         DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $entityManagerName);

diff --git a/ConnectionFactory.php b/ConnectionFactory.php
@@ -74,8 +74,8 @@ public function createConnection(array $params, Configuration $config = null, Ev
      * and the platform version is unknown.
      * For details have a look at DoctrineBundle issue #673.
      *
-     *
      * @return AbstractPlatform
+     *
      * @throws DBALException
      */
     private function getDatabasePlatform(Connection $connection)

diff --git a/Controller/ProfilerController.php b/Controller/ProfilerController.php
@@ -4,6 +4,8 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Platforms\SQLServerPlatform;
+use Exception;
+use PDO;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Response;
@@ -61,7 +63,7 @@ public function explainAction($token, $connectionName, $query)
             } else {
                 $results = $this->explainOtherPlatform($connection, $query);
             }
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             return new Response('This query cannot be explained.');
         }
 
@@ -87,7 +89,7 @@ private function explainSQLServerPlatform(Connection $connection, $query)
 
         $stmt = $connection->executeQuery($sql, $params, $query['types']);
         $stmt->nextRowset();
-        return $stmt->fetchAll(\PDO::FETCH_ASSOC);
+        return $stmt->fetchAll(PDO::FETCH_ASSOC);
     }
 
     private function explainOtherPlatform(Connection $connection, $query)
@@ -99,6 +101,6 @@ private function explainOtherPlatform(Connection $connection, $query)
         }
 
         return $connection->executeQuery('EXPLAIN ' . $query['sql'], $params, $query['types'])
-            ->fetchAll(\PDO::FETCH_ASSOC);
+            ->fetchAll(PDO::FETCH_ASSOC);
     }
 }
diff --git a/DataCollector/DoctrineDataCollector.php b/DataCollector/DoctrineDataCollector.php
@@ -11,6 +11,7 @@
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\Tools\SchemaValidator;
 use Doctrine\ORM\Version;
+use Exception;
 use Symfony\Bridge\Doctrine\DataCollector\DoctrineDataCollector as BaseCollector;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -39,7 +40,7 @@ public function __construct(ManagerRegistry $registry)
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, Exception $exception = null)
     {
         parent::collect($request, $response, $exception);
 
@@ -227,11 +228,11 @@ public function getGroupedQueries()
                 $connectionGroupedQueries[$key]['count']++;
                 $totalExecutionMS += $query['executionMS'];
             }
-            usort($connectionGroupedQueries, function ($a, $b) {
+            usort($connectionGroupedQueries, static function ($a, $b) {
                 if ($a['executionMS'] === $b['executionMS']) {
                     return 0;
                 }
-                return ($a['executionMS'] < $b['executionMS']) ? 1 : -1;
+                return $a['executionMS'] < $b['executionMS'] ? 1 : -1;
             });
             $this->groupedQueries[$connection] = $connectionGroupedQueries;
         }

diff --git a/DependencyInjection/Compiler/ServiceRepositoryCompilerPass.php b/DependencyInjection/Compiler/ServiceRepositoryCompilerPass.php
@@ -32,7 +32,7 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        $repoReferences = array_map(function ($id) {
+        $repoReferences = array_map(static function ($id) {
             return new Reference($id);
         }, $repoServiceIds);