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

Apply Doctrine CS v5
doctrine · Sep 26, 2018 · cfaa5a0 · cfaa5a0
2 parents 762772a + 170b5df
commit cfaa5a0
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 50 deletions.
diff --git a/Command/MigrationsDiffDoctrineCommand.php b/Command/MigrationsDiffDoctrineCommand.php
@@ -25,8 +25,7 @@ protected function configure() : void
             ->setName('doctrine:migrations:diff')
             ->addOption('db', null, InputOption::VALUE_REQUIRED, 'The database connection to use for this command.')
             ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command.')
-            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.')
-        ;
+            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output) : void

diff --git a/Command/MigrationsDumpSchemaDoctrineCommand.php b/Command/MigrationsDumpSchemaDoctrineCommand.php
@@ -24,8 +24,7 @@ protected function configure() : void
             ->setName('doctrine:migrations:dump-schema')
             ->addOption('db', null, InputOption::VALUE_REQUIRED, 'The database connection to use for this command.')
             ->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command.')
-            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.')
-        ;
+            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output) : void

diff --git a/Command/MigrationsExecuteDoctrineCommand.php b/Command/MigrationsExecuteDoctrineCommand.php
@@ -24,8 +24,7 @@ protected function configure() : void
             ->setName('doctrine:migrations:execute')
             ->addOption('db', null, InputOption::VALUE_REQUIRED, 'The database connection to use for this command.')
             ->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command.')
-            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.')
-        ;
+            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output) : void

diff --git a/Command/MigrationsGenerateDoctrineCommand.php b/Command/MigrationsGenerateDoctrineCommand.php
@@ -24,8 +24,7 @@ protected function configure() : void
             ->setName('doctrine:migrations:generate')
             ->addOption('db', null, InputOption::VALUE_REQUIRED, 'The database connection to use for this command.')
             ->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command.')
-            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.')
-        ;
+            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output) : void

diff --git a/Command/MigrationsLatestDoctrineCommand.php b/Command/MigrationsLatestDoctrineCommand.php
@@ -24,8 +24,7 @@ protected function configure() : void
             ->setName('doctrine:migrations:latest')
             ->addOption('db', null, InputOption::VALUE_REQUIRED, 'The database connection to use for this command.')
             ->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command.')
-            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.')
-        ;
+            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output) : void

diff --git a/Command/MigrationsMigrateDoctrineCommand.php b/Command/MigrationsMigrateDoctrineCommand.php
@@ -24,8 +24,7 @@ protected function configure() : void
             ->setName('doctrine:migrations:migrate')
             ->addOption('db', null, InputOption::VALUE_REQUIRED, 'The database connection to use for this command.')
             ->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command.')
-            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.')
-        ;
+            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output) : void

diff --git a/Command/MigrationsRollupDoctrineCommand.php b/Command/MigrationsRollupDoctrineCommand.php
@@ -24,8 +24,7 @@ protected function configure() : void
             ->setName('doctrine:migrations:rollup')
             ->addOption('db', null, InputOption::VALUE_REQUIRED, 'The database connection to use for this command.')
             ->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command.')
-            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.')
-        ;
+            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output) : void

diff --git a/Command/MigrationsStatusDoctrineCommand.php b/Command/MigrationsStatusDoctrineCommand.php
@@ -24,8 +24,7 @@ protected function configure() : void
             ->setName('doctrine:migrations:status')
             ->addOption('db', null, InputOption::VALUE_REQUIRED, 'The database connection to use for this command.')
             ->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command.')
-            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.')
-        ;
+            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output) : void

diff --git a/Command/MigrationsUpToDateDoctrineCommand.php b/Command/MigrationsUpToDateDoctrineCommand.php
@@ -24,8 +24,7 @@ protected function configure() : void
             ->setName('doctrine:migrations:up-to-date')
             ->addOption('db', null, InputOption::VALUE_REQUIRED, 'The database connection to use for this command.')
             ->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command.')
-            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.')
-        ;
+            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output) : void

diff --git a/Command/MigrationsVersionDoctrineCommand.php b/Command/MigrationsVersionDoctrineCommand.php
@@ -24,8 +24,7 @@ protected function configure() : void
             ->setName('doctrine:migrations:version')
             ->addOption('db', null, InputOption::VALUE_REQUIRED, 'The database connection to use for this command.')
             ->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command.')
-            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.')
-        ;
+            ->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output) : void

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -4,6 +4,7 @@
 
 namespace Doctrine\Bundle\MigrationsBundle\DependencyInjection;
 
+use ReflectionClass;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use function constant;
@@ -45,7 +46,7 @@ public function getConfigTreeBuilder() : TreeBuilder
                 ->scalarNode('organize_migrations')->defaultValue(false)
                     ->info('Organize migrations mode. Possible values are: "BY_YEAR", "BY_YEAR_AND_MONTH", false')
                     ->validate()
-                        ->ifTrue(function ($v) use ($organizeMigrationModes) {
+                        ->ifTrue(static function ($v) use ($organizeMigrationModes) {
                             if ($v === false) {
                                 return false;
                             }
@@ -60,13 +61,12 @@ public function getConfigTreeBuilder() : TreeBuilder
                     ->end()
                     ->validate()
                         ->ifString()
-                            ->then(function ($v) {
+                            ->then(static function ($v) {
                                 return constant('Doctrine\Migrations\Configuration\Configuration::VERSIONS_ORGANIZATION_' . strtoupper($v));
                             })
                         ->end()
                     ->end()
-            ->end()
-        ;
+            ->end();
 
         return $treeBuilder;
     }
@@ -81,7 +81,7 @@ private function getOrganizeMigrationsModes() : array
     {
         $constPrefix = 'VERSIONS_ORGANIZATION_';
         $prefixLen   = strlen($constPrefix);
-        $refClass    = new \ReflectionClass('Doctrine\Migrations\Configuration\Configuration');
+        $refClass    = new ReflectionClass('Doctrine\Migrations\Configuration\Configuration');
         $constsArray = $refClass->getConstants();
         $namesArray  = [];
 

diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
     "require-dev": {
         "phpunit/phpunit": "^5.7|^6.4|^7.0",
         "mikey179/vfsStream": "^1.6",
-        "doctrine/coding-standard": "^4.0",
+        "doctrine/coding-standard": "^5.0",
         "phpstan/phpstan": "^0.9.2",
         "phpstan/phpstan-strict-rules": "^0.9"
     },

diff --git a/composer.lock b/composer.lock