diff --git a/bin/doctrine-migrations.php b/bin/doctrine-migrations.php
index 4f7f35baaf..e106154cea 100644
--- a/bin/doctrine-migrations.php
+++ b/bin/doctrine-migrations.php
@@ -17,7 +17,7 @@
 use function is_readable;
 use function trigger_error;
 
-(function () : void {
+(static function () : void {
     $autoloadFiles = [
         __DIR__ . '/../vendor/autoload.php',
         __DIR__ . '/../../../autoload.php',
diff --git a/composer.json b/composer.json
index c86b3980be..d9cf727dc6 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
-        "doctrine/coding-standard": "^4.0",
+        "doctrine/coding-standard": "^5.0",
         "doctrine/orm": "^2.6",
         "jdorn/sql-formatter": "^1.1",
         "mikey179/vfsStream": "^1.6",
diff --git a/composer.lock b/composer.lock
index 5f2009214a..289e625eef 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e66c64c5684f5b95ee05d3aed01f5761",
+    "content-hash": "ee6571a46750bfa5da62f2582fdcc4c8",
     "packages": [
         {
             "name": "doctrine/annotations",
@@ -1001,28 +1001,28 @@
         },
         {
             "name": "doctrine/coding-standard",
-            "version": "4.0.0",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/coding-standard.git",
-                "reference": "0469c18a1a4724c278f2879c0dd7b1fa860b52de"
+                "reference": "bb8de042a25c4fb59a2c55c350dc55cc00227a8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/coding-standard/zipball/0469c18a1a4724c278f2879c0dd7b1fa860b52de",
-                "reference": "0469c18a1a4724c278f2879c0dd7b1fa860b52de",
+                "url": "https://api.github.com/repos/doctrine/coding-standard/zipball/bb8de042a25c4fb59a2c55c350dc55cc00227a8c",
+                "reference": "bb8de042a25c4fb59a2c55c350dc55cc00227a8c",
                 "shasum": ""
             },
             "require": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.2",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
                 "php": "^7.1",
-                "slevomat/coding-standard": "^4.5.0",
-                "squizlabs/php_codesniffer": "^3.2.3"
+                "slevomat/coding-standard": "^4.8.0",
+                "squizlabs/php_codesniffer": "^3.3.2"
             },
             "type": "phpcodesniffer-standard",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "5.0.x-dev"
                 }
             },
             "autoload": {
@@ -1044,18 +1044,21 @@
                     "email": "st.mueller@dzh-online.de"
                 }
             ],
-            "description": "Doctrine Coding Standard",
-            "homepage": "http://www.doctrine-project.org",
+            "description": "The Doctrine Coding Standard is a set of PHPCS rules applied to all Doctrine projects.",
+            "homepage": "https://www.doctrine-project.org/projects/coding-standard.html",
             "keywords": [
+                "checks",
                 "code",
                 "coding",
                 "cs",
                 "doctrine",
+                "rules",
                 "sniffer",
+                "sniffs",
                 "standard",
                 "style"
             ],
-            "time": "2018-03-03T23:49:15+00:00"
+            "time": "2018-09-24T19:08:56+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -3469,21 +3472,21 @@
         },
         {
             "name": "slevomat/coding-standard",
-            "version": "4.6.0",
+            "version": "4.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slevomat/coding-standard.git",
-                "reference": "95436f14d4a6fe8638bcba09d3a8e19266846ee4"
+                "reference": "5e878708a16a75ed11a7d9aa02f50c257065d4fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/95436f14d4a6fe8638bcba09d3a8e19266846ee4",
-                "reference": "95436f14d4a6fe8638bcba09d3a8e19266846ee4",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/5e878708a16a75ed11a7d9aa02f50c257065d4fe",
+                "reference": "5e878708a16a75ed11a7d9aa02f50c257065d4fe",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1",
-                "squizlabs/php_codesniffer": "^3.2.3"
+                "squizlabs/php_codesniffer": "^3.3.0"
             },
             "require-dev": {
                 "jakub-onderka/php-parallel-lint": "1.0.0",
@@ -3491,7 +3494,7 @@
                 "phpstan/phpstan": "0.9.2",
                 "phpstan/phpstan-phpunit": "0.9.4",
                 "phpstan/phpstan-strict-rules": "0.9",
-                "phpunit/phpunit": "7.1.5"
+                "phpunit/phpunit": "7.3.5"
             },
             "type": "phpcodesniffer-standard",
             "autoload": {
@@ -3504,20 +3507,20 @@
                 "MIT"
             ],
             "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.",
-            "time": "2018-05-15T21:21:12+00:00"
+            "time": "2018-09-25T06:49:15+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.2.3",
+            "version": "3.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "4842476c434e375f9d3182ff7b89059583aa8b27"
+                "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4842476c434e375f9d3182ff7b89059583aa8b27",
-                "reference": "4842476c434e375f9d3182ff7b89059583aa8b27",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6ad28354c04b364c3c71a34e4a18b629cc3b231e",
+                "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e",
                 "shasum": ""
             },
             "require": {
@@ -3555,7 +3558,7 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2018-02-20T21:35:23+00:00"
+            "time": "2018-09-23T23:08:17+00:00"
         },
         {
             "name": "symfony/finder",
diff --git a/lib/Doctrine/Migrations/Configuration/AbstractFileConfiguration.php b/lib/Doctrine/Migrations/Configuration/AbstractFileConfiguration.php
index b4b63928aa..a52d91bff7 100644
--- a/lib/Doctrine/Migrations/Configuration/AbstractFileConfiguration.php
+++ b/lib/Doctrine/Migrations/Configuration/AbstractFileConfiguration.php
@@ -22,7 +22,6 @@
  */
 abstract class AbstractFileConfiguration extends Configuration
 {
-    /** @var array */
     private const ALLOWED_CONFIGURATION_KEYS = [
         'migrations_namespace',
         'table_name',
@@ -111,7 +110,7 @@ protected function getDirectoryRelativeToFile(string $file, string $input) : str
     {
         $path = realpath(dirname($file) . '/' . $input);
 
-        return ($path !== false) ? $path : $input;
+        return $path !== false ? $path : $input;
     }
 
     /**
diff --git a/lib/Doctrine/Migrations/Configuration/Connection/Loader/ArrayConnectionConfigurationLoader.php b/lib/Doctrine/Migrations/Configuration/Connection/Loader/ArrayConnectionConfigurationLoader.php
index 261aed860a..d380ab8e0e 100644
--- a/lib/Doctrine/Migrations/Configuration/Connection/Loader/ArrayConnectionConfigurationLoader.php
+++ b/lib/Doctrine/Migrations/Configuration/Connection/Loader/ArrayConnectionConfigurationLoader.php
@@ -19,7 +19,7 @@
  */
 class ArrayConnectionConfigurationLoader implements ConnectionLoaderInterface
 {
-    /** @var null|string */
+    /** @var string|null */
     private $filename;
 
     public function __construct(?string $filename)
diff --git a/lib/Doctrine/Migrations/Configuration/Connection/Loader/ConnectionConfigurationLoader.php b/lib/Doctrine/Migrations/Configuration/Connection/Loader/ConnectionConfigurationLoader.php
index f2966e21c0..b5f601e878 100644
--- a/lib/Doctrine/Migrations/Configuration/Connection/Loader/ConnectionConfigurationLoader.php
+++ b/lib/Doctrine/Migrations/Configuration/Connection/Loader/ConnectionConfigurationLoader.php
@@ -16,7 +16,7 @@
  */
 class ConnectionConfigurationLoader implements ConnectionLoaderInterface
 {
-    /** @var null|Configuration */
+    /** @var Configuration|null */
     private $configuration;
 
     public function __construct(?Configuration $configuration = null)
diff --git a/lib/Doctrine/Migrations/DependencyFactory.php b/lib/Doctrine/Migrations/DependencyFactory.php
index 689d51e651..87090c350c 100644
--- a/lib/Doctrine/Migrations/DependencyFactory.php
+++ b/lib/Doctrine/Migrations/DependencyFactory.php
@@ -180,7 +180,7 @@ public function getQueryWriter() : FileQueryWriter
 
     public function getOutputWriter() : OutputWriter
     {
-        return $this->getDependency(OutputWriter::class, function () : OutputWriter {
+        return $this->getDependency(OutputWriter::class, static function () : OutputWriter {
             return new OutputWriter();
         });
     }
@@ -203,7 +203,7 @@ public function getMigrationPlanCalculator() : MigrationPlanCalculator
 
     public function getRecursiveRegexFinder() : RecursiveRegexFinder
     {
-        return $this->getDependency(RecursiveRegexFinder::class, function () : RecursiveRegexFinder {
+        return $this->getDependency(RecursiveRegexFinder::class, static function () : RecursiveRegexFinder {
             return new RecursiveRegexFinder();
         });
     }
@@ -249,7 +249,7 @@ public function getMigrator() : Migrator
 
     public function getStopwatch() : Stopwatch
     {
-        return $this->getDependency(Stopwatch::class, function () : Stopwatch {
+        return $this->getDependency(Stopwatch::class, static function () : Stopwatch {
             $symfonyStopwatch = new SymfonyStopwatch(true);
 
             return new Stopwatch($symfonyStopwatch);
diff --git a/lib/Doctrine/Migrations/FileQueryWriter.php b/lib/Doctrine/Migrations/FileQueryWriter.php
index 030de28856..9bb74144d8 100644
--- a/lib/Doctrine/Migrations/FileQueryWriter.php
+++ b/lib/Doctrine/Migrations/FileQueryWriter.php
@@ -18,7 +18,7 @@
  */
 final class FileQueryWriter implements QueryWriter
 {
-    /** @var null|OutputWriter */
+    /** @var OutputWriter|null */
     private $outputWriter;
 
     /** @var FileBuilder */
@@ -60,8 +60,8 @@ public function write(
     private function buildMigrationFilePath(string $path, DateTimeInterface $now) : string
     {
         if (is_dir($path)) {
-            $path = realpath($path);
-            $path = $path . '/doctrine_migration_' . $now->format('YmdHis') . '.sql';
+            $path  = realpath($path);
+            $path .= '/doctrine_migration_' . $now->format('YmdHis') . '.sql';
         }
 
         return $path;
diff --git a/lib/Doctrine/Migrations/Finder/Finder.php b/lib/Doctrine/Migrations/Finder/Finder.php
index ec828ee5fa..746e931aaa 100644
--- a/lib/Doctrine/Migrations/Finder/Finder.php
+++ b/lib/Doctrine/Migrations/Finder/Finder.php
@@ -84,6 +84,7 @@ protected function loadMigrations(array $files, ?string $namespace) : array
      *
      * @param string[]    $files     The set of files that were `required`
      * @param string|null $namespace If not null only classes in this namespace will be returned
+     *
      * @return ReflectionClass[] the classes in `$files`
      */
     protected function loadMigrationClasses(array $files, ?string $namespace) : array
diff --git a/lib/Doctrine/Migrations/Finder/MigrationFinder.php b/lib/Doctrine/Migrations/Finder/MigrationFinder.php
index 60137efdc4..182f651078 100644
--- a/lib/Doctrine/Migrations/Finder/MigrationFinder.php
+++ b/lib/Doctrine/Migrations/Finder/MigrationFinder.php
@@ -12,6 +12,7 @@ interface MigrationFinder
     /**
      * @param string      $directory The directory which the finder should search
      * @param string|null $namespace If not null only classes in this namespace will be returned
+     *
      * @return string[]
      */
     public function findMigrations(string $directory, ?string $namespace = null) : array;
diff --git a/lib/Doctrine/Migrations/Migrator.php b/lib/Doctrine/Migrations/Migrator.php
index 46378b57f2..18e2fe18b2 100644
--- a/lib/Doctrine/Migrations/Migrator.php
+++ b/lib/Doctrine/Migrations/Migrator.php
@@ -85,9 +85,9 @@ public function writeSqlFile(string $path, ?string $to = null) : bool
     }
 
     /**
-     * @throws MigrationException
-     *
      * @return string[][]
+     *
+     * @throws MigrationException
      */
     public function migrate(
         ?string $to = null,
diff --git a/lib/Doctrine/Migrations/MigratorConfiguration.php b/lib/Doctrine/Migrations/MigratorConfiguration.php
index d63e0523f6..bf4f65af78 100644
--- a/lib/Doctrine/Migrations/MigratorConfiguration.php
+++ b/lib/Doctrine/Migrations/MigratorConfiguration.php
@@ -7,10 +7,10 @@
 /**
  * The MigratorConfiguration class is responsible for defining the configuration for a migration.
  *
+ * @internal
+ *
  * @see Doctrine\Migrations\Migrator
  * @see Doctrine\Migrations\Version\Executor
- *
- * @internal
  */
 class MigratorConfiguration
 {
diff --git a/lib/Doctrine/Migrations/OutputWriter.php b/lib/Doctrine/Migrations/OutputWriter.php
index ac7c6fcb7b..f0d9b29678 100644
--- a/lib/Doctrine/Migrations/OutputWriter.php
+++ b/lib/Doctrine/Migrations/OutputWriter.php
@@ -15,7 +15,7 @@ class OutputWriter
     public function __construct(?callable $callback = null)
     {
         if ($callback === null) {
-            $callback = function ($message) : void {
+            $callback = static function ($message) : void {
             };
         }
 
diff --git a/lib/Doctrine/Migrations/ParameterFormatterInterface.php b/lib/Doctrine/Migrations/ParameterFormatterInterface.php
index 94a04c8687..dc8efc5a26 100644
--- a/lib/Doctrine/Migrations/ParameterFormatterInterface.php
+++ b/lib/Doctrine/Migrations/ParameterFormatterInterface.php
@@ -8,9 +8,9 @@
  * The ParameterFormatterInterface defines the interface for formatting SQL query parameters to a string
  * for display output.
  *
- * @see Doctrine\Migrations\ParameterFormatter
- *
  * @internal
+ *
+ * @see Doctrine\Migrations\ParameterFormatter
  */
 interface ParameterFormatterInterface
 {
diff --git a/lib/Doctrine/Migrations/Provider/LazySchemaDiffProvider.php b/lib/Doctrine/Migrations/Provider/LazySchemaDiffProvider.php
index 49396feadf..f87800c545 100644
--- a/lib/Doctrine/Migrations/Provider/LazySchemaDiffProvider.php
+++ b/lib/Doctrine/Migrations/Provider/LazySchemaDiffProvider.php
@@ -48,7 +48,7 @@ public function createFromSchema() : Schema
 
         return $this->proxyFactory->createProxy(
             Schema::class,
-            function (&$wrappedObject, $proxy, $method, array $parameters, &$initializer) use ($originalSchemaManipulator) {
+            static function (&$wrappedObject, $proxy, $method, array $parameters, &$initializer) use ($originalSchemaManipulator) {
                 $initializer   = null;
                 $wrappedObject = $originalSchemaManipulator->createFromSchema();
 
@@ -64,7 +64,7 @@ public function createToSchema(Schema $fromSchema) : Schema
         if ($fromSchema instanceof LazyLoadingInterface && ! $fromSchema->isProxyInitialized()) {
             return $this->proxyFactory->createProxy(
                 Schema::class,
-                function (& $wrappedObject, $proxy, $method, array $parameters, & $initializer) use ($originalSchemaManipulator, $fromSchema) {
+                static function (& $wrappedObject, $proxy, $method, array $parameters, & $initializer) use ($originalSchemaManipulator, $fromSchema) {
                     $initializer   = null;
                     $wrappedObject = $originalSchemaManipulator->createToSchema($fromSchema);
 
diff --git a/lib/Doctrine/Migrations/Provider/SchemaDiffProvider.php b/lib/Doctrine/Migrations/Provider/SchemaDiffProvider.php
index 221f31c9a7..d97870acfe 100644
--- a/lib/Doctrine/Migrations/Provider/SchemaDiffProvider.php
+++ b/lib/Doctrine/Migrations/Provider/SchemaDiffProvider.php
@@ -14,9 +14,9 @@
  * so that you can manipulate the Schema object. Your manipulated Schema object is then compared to the original Schema
  * object to produce the SQL statements that need to be executed.
  *
- * @see Doctrine\Migrations\Version\Executor
- *
  * @internal
+ *
+ * @see Doctrine\Migrations\Version\Executor
  */
 class SchemaDiffProvider implements SchemaDiffProviderInterface
 {
diff --git a/lib/Doctrine/Migrations/Rollup.php b/lib/Doctrine/Migrations/Rollup.php
index d2b9c3a164..7323ef5cac 100644
--- a/lib/Doctrine/Migrations/Rollup.php
+++ b/lib/Doctrine/Migrations/Rollup.php
@@ -16,9 +16,9 @@
  * The Rollup class is responsible for deleting all previously executed migrations from the versions table
  * and marking the freshly dumped schema migration (that was created with SchemaDumper) as migrated.
  *
- * @see Doctrine\Migrations\SchemaDumper
- *
  * @internal
+ *
+ * @see Doctrine\Migrations\SchemaDumper
  */
 class Rollup
 {
diff --git a/lib/Doctrine/Migrations/SchemaDumper.php b/lib/Doctrine/Migrations/SchemaDumper.php
index ae92bbd483..b8298227df 100644
--- a/lib/Doctrine/Migrations/SchemaDumper.php
+++ b/lib/Doctrine/Migrations/SchemaDumper.php
@@ -16,9 +16,9 @@
  * The SchemaDumper class is responsible for dumping the current state of your database schema to a migration. This
  * is to be used in conjunction with the Rollup class.
  *
- * @see Doctrine\Migrations\Rollup
- *
  * @internal
+ *
+ * @see Doctrine\Migrations\Rollup
  */
 class SchemaDumper
 {
diff --git a/lib/Doctrine/Migrations/Tools/BooleanStringFormatter.php b/lib/Doctrine/Migrations/Tools/BooleanStringFormatter.php
index 6aaff9db31..4e12fbb987 100644
--- a/lib/Doctrine/Migrations/Tools/BooleanStringFormatter.php
+++ b/lib/Doctrine/Migrations/Tools/BooleanStringFormatter.php
@@ -10,9 +10,9 @@
  * The BooleanStringFormatter class is responsible for formatting a string boolean representation to a PHP boolean value.
  * It is used in the XmlConfiguration class to convert the string XML boolean value to a PHP boolean value.
  *
- * @see Doctrine\Migrations\Configuration\XmlConfiguration
- *
  * @internal
+ *
+ * @see Doctrine\Migrations\Configuration\XmlConfiguration
  */
 class BooleanStringFormatter
 {
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/AbstractCommand.php b/lib/Doctrine/Migrations/Tools/Console/Command/AbstractCommand.php
index 44956d392c..059e2f4330 100644
--- a/lib/Doctrine/Migrations/Tools/Console/Command/AbstractCommand.php
+++ b/lib/Doctrine/Migrations/Tools/Console/Command/AbstractCommand.php
@@ -123,7 +123,7 @@ protected function getMigrationConfiguration(
             $this->migrationConfiguration = $configHelper->getMigrationConfig($input);
 
             $this->migrationConfiguration->getOutputWriter()->setCallback(
-                function (string $message) use ($output) : void {
+                static function (string $message) use ($output) : void {
                     $output->writeln($message);
                 }
             );
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/DiffCommand.php b/lib/Doctrine/Migrations/Tools/Console/Command/DiffCommand.php
index 822657197c..665418f586 100644
--- a/lib/Doctrine/Migrations/Tools/Console/Command/DiffCommand.php
+++ b/lib/Doctrine/Migrations/Tools/Console/Command/DiffCommand.php
@@ -20,7 +20,7 @@
  */
 class DiffCommand extends AbstractCommand
 {
-    /** @var null|SchemaProviderInterface */
+    /** @var SchemaProviderInterface|null */
     protected $schemaProvider;
 
     public function __construct(?SchemaProviderInterface $schemaProvider = null)
@@ -72,8 +72,7 @@ protected function configure() : void
                 InputOption::VALUE_OPTIONAL,
                 'Max line length of unformatted lines.',
                 120
-            )
-        ;
+            );
     }
 
     /**
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/DumpSchemaCommand.php b/lib/Doctrine/Migrations/Tools/Console/Command/DumpSchemaCommand.php
index afc45c09b1..1f51d2e02c 100644
--- a/lib/Doctrine/Migrations/Tools/Console/Command/DumpSchemaCommand.php
+++ b/lib/Doctrine/Migrations/Tools/Console/Command/DumpSchemaCommand.php
@@ -53,8 +53,7 @@ protected function configure() : void
                 InputOption::VALUE_OPTIONAL,
                 'Max line length of unformatted lines.',
                 120
-            )
-        ;
+            );
     }
 
     /**
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/ExecuteCommand.php b/lib/Doctrine/Migrations/Tools/Console/Command/ExecuteCommand.php
index 22810b9ba9..2c170756db 100644
--- a/lib/Doctrine/Migrations/Tools/Console/Command/ExecuteCommand.php
+++ b/lib/Doctrine/Migrations/Tools/Console/Command/ExecuteCommand.php
@@ -101,7 +101,7 @@ public function execute(InputInterface $input, OutputInterface $output) : ?int
         $version = $this->migrationRepository->getVersion($version);
 
         if ($path !== false) {
-            $path = $path === null ? getcwd() : $path;
+            $path = $path ?? getcwd();
 
             $version->writeSqlFile($path, $direction);
 
@@ -118,8 +118,7 @@ public function execute(InputInterface $input, OutputInterface $output) : ?int
 
         $migratorConfiguration = (new MigratorConfiguration())
             ->setDryRun($dryRun)
-            ->setTimeAllQueries($timeAllQueries)
-        ;
+            ->setTimeAllQueries($timeAllQueries);
 
         $version->execute($direction, $migratorConfiguration);
 
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/LatestCommand.php b/lib/Doctrine/Migrations/Tools/Console/Command/LatestCommand.php
index 2c7556e1cb..e469d0f415 100644
--- a/lib/Doctrine/Migrations/Tools/Console/Command/LatestCommand.php
+++ b/lib/Doctrine/Migrations/Tools/Console/Command/LatestCommand.php
@@ -18,8 +18,7 @@ protected function configure() : void
         $this
             ->setName('migrations:latest')
             ->setAliases(['latest'])
-            ->setDescription('Outputs the latest version number')
-        ;
+            ->setDescription('Outputs the latest version number');
 
         parent::configure();
     }
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/MigrateCommand.php b/lib/Doctrine/Migrations/Tools/Console/Command/MigrateCommand.php
index 619f97c691..8e7e9051dc 100644
--- a/lib/Doctrine/Migrations/Tools/Console/Command/MigrateCommand.php
+++ b/lib/Doctrine/Migrations/Tools/Console/Command/MigrateCommand.php
@@ -138,7 +138,7 @@ public function execute(InputInterface $input, OutputInterface $output) : ?int
         $migrator = $this->createMigrator();
 
         if ($path !== false) {
-            $path = $path === null ? getcwd() : $path;
+            $path = $path ?? getcwd();
 
             $migrator->writeSqlFile($path, $version);
 
@@ -157,8 +157,7 @@ public function execute(InputInterface $input, OutputInterface $output) : ?int
             ->setDryRun($dryRun)
             ->setTimeAllQueries($timeAllQueries)
             ->setNoMigrationException($allowNoMigration)
-            ->setAllOrNothing($allOrNothing)
-        ;
+            ->setAllOrNothing($allOrNothing);
 
         $migrator->migrate($version, $migratorConfiguration);
 
@@ -246,8 +245,7 @@ private function getAllOrNothing($allOrNothing) : bool
         if ($allOrNothing !== false) {
             return $allOrNothing !== null
                 ? (bool) $allOrNothing
-                : true
-            ;
+                : true;
         }
 
         return $this->configuration->isAllOrNothing();
diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/RollupCommand.php b/lib/Doctrine/Migrations/Tools/Console/Command/RollupCommand.php
index e1073cf531..621e7e4caf 100644
--- a/lib/Doctrine/Migrations/Tools/Console/Command/RollupCommand.php
+++ b/lib/Doctrine/Migrations/Tools/Console/Command/RollupCommand.php
@@ -30,8 +30,7 @@ protected function configure() : void
 
 To dump your schema to a migration version you can use the <info>migrations:dump-schema</info> command.
 EOT
-            )
-        ;
+            );
     }
 
     public function execute(
diff --git a/lib/Doctrine/Migrations/Tools/Console/ConsoleRunner.php b/lib/Doctrine/Migrations/Tools/Console/ConsoleRunner.php
index f1adcf8773..d7a37a7912 100644
--- a/lib/Doctrine/Migrations/Tools/Console/ConsoleRunner.php
+++ b/lib/Doctrine/Migrations/Tools/Console/ConsoleRunner.php
@@ -22,9 +22,9 @@
 /**
  * The ConsoleRunner class is used to create the Symfony Console application for the Doctrine Migrations console.
  *
- * @see bin/doctrine-migrations.php
- *
  * @internal
+ *
+ * @see bin/doctrine-migrations.php
  */
 class ConsoleRunner
 {
diff --git a/lib/Doctrine/Migrations/Tools/Console/Helper/ConfigurationHelper.php b/lib/Doctrine/Migrations/Tools/Console/Helper/ConfigurationHelper.php
index 771a3b6597..96ce32852f 100644
--- a/lib/Doctrine/Migrations/Tools/Console/Helper/ConfigurationHelper.php
+++ b/lib/Doctrine/Migrations/Tools/Console/Helper/ConfigurationHelper.php
@@ -25,7 +25,7 @@ class ConfigurationHelper extends Helper implements ConfigurationHelperInterface
     /** @var Connection */
     private $connection;
 
-    /** @var null|Configuration */
+    /** @var Configuration|null */
     private $configuration;
 
     public function __construct(
diff --git a/lib/Doctrine/Migrations/Tools/Console/Helper/MigrationStatusInfosHelper.php b/lib/Doctrine/Migrations/Tools/Console/Helper/MigrationStatusInfosHelper.php
index 4fe51bda66..4b28c911ea 100644
--- a/lib/Doctrine/Migrations/Tools/Console/Helper/MigrationStatusInfosHelper.php
+++ b/lib/Doctrine/Migrations/Tools/Console/Helper/MigrationStatusInfosHelper.php
@@ -14,9 +14,9 @@
  * The MigrationStatusInfosHelper class is responsible for building the array of information used when displaying
  * the status of your migrations.
  *
- * @see Doctrine\Migrations\Tools\Console\Command\StatusCommand
- *
  * @internal
+ *
+ * @see Doctrine\Migrations\Tools\Console\Command\StatusCommand
  */
 class MigrationStatusInfosHelper
 {
@@ -42,7 +42,7 @@ public function getMigrationsInfos() : array
         $newMigrations                 = $this->migrationRepository->getNewVersions();
         $executedUnavailableMigrations = $this->migrationRepository->getExecutedUnavailableMigrations();
 
-        $infos = [
+        return [
             'Name'                              => $this->configuration->getName() ?? 'Doctrine Database Migrations',
             'Database Driver'                   => $this->configuration->getConnection()->getDriver()->getName(),
             'Database Host'                     => $this->configuration->getConnection()->getHost(),
@@ -61,8 +61,6 @@ public function getMigrationsInfos() : array
             'Available Migrations'              => count($availableMigrations),
             'New Migrations'                    => count($newMigrations),
         ];
-
-        return $infos;
     }
 
     private function getFormattedVersionAlias(string $alias) : string
diff --git a/lib/Doctrine/Migrations/Version/ExecutionResult.php b/lib/Doctrine/Migrations/Version/ExecutionResult.php
index 76bb0d3eb6..72c02e022d 100644
--- a/lib/Doctrine/Migrations/Version/ExecutionResult.php
+++ b/lib/Doctrine/Migrations/Version/ExecutionResult.php
@@ -23,10 +23,10 @@ class ExecutionResult
     /** @var mixed[] */
     private $types = [];
 
-    /** @var null|float */
+    /** @var float|null */
     private $time;
 
-    /** @var null|float */
+    /** @var float|null */
     private $memory;
 
     /** @var bool */
@@ -35,7 +35,7 @@ class ExecutionResult
     /** @var bool */
     private $error = false;
 
-    /** @var null|Throwable */
+    /** @var Throwable|null */
     private $exception;
 
     /**
diff --git a/tests/Doctrine/Migrations/Tests/BoxPharCompileTest.php b/tests/Doctrine/Migrations/Tests/BoxPharCompileTest.php
index 5a3446383d..b4794ff309 100644
--- a/tests/Doctrine/Migrations/Tests/BoxPharCompileTest.php
+++ b/tests/Doctrine/Migrations/Tests/BoxPharCompileTest.php
@@ -41,7 +41,7 @@ public function testCompile() : void
 
         $process = new Process($runDoctrinePharCommand);
 
-        $process->start(function ($type, $buffer) use (&$output, &$successful) : void {
+        $process->start(static function ($type) use (&$successful) : void {
             if ($type !== 'err') {
                 return;
             }
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/ConfigurationTest.php b/tests/Doctrine/Migrations/Tests/Configuration/ConfigurationTest.php
index c841c8d59b..045ce926fb 100644
--- a/tests/Doctrine/Migrations/Tests/Configuration/ConfigurationTest.php
+++ b/tests/Doctrine/Migrations/Tests/Configuration/ConfigurationTest.php
@@ -22,6 +22,7 @@
 use Doctrine\Migrations\Tests\MigrationTestCase;
 use Doctrine\Migrations\Tests\Stub\Configuration\AutoloadVersions\Version1Test;
 use Doctrine\Migrations\Version\Version;
+use PHPUnit_Framework_MockObject_MockObject;
 use Symfony\Component\Stopwatch\Stopwatch as SymfonyStopwatch;
 use function array_keys;
 use function call_user_func_array;
@@ -70,10 +71,10 @@ public function testGetSetMigrationsColumnName() : void
     }
 
     /**
-     * @dataProvider methodsThatNeedsVersionsLoaded
-     *
      * @param mixed[] $args
      * @param mixed   $expectedResult
+     *
+     * @dataProvider methodsThatNeedsVersionsLoaded
      */
     public function testVersionsTryToGetLoadedIfNotAlreadyLoadedWhenAccessingMethodThatNeedThem(
         string $method,
@@ -94,10 +95,10 @@ public function testVersionsTryToGetLoadedIfNotAlreadyLoadedWhenAccessingMethodT
     }
 
     /**
-     * @dataProvider methodsThatNeedsVersionsLoadedWithAlreadyMigratedMigrations
-     *
      * @param mixed[] $args
      * @param mixed   $expectedResult
+     *
+     * @dataProvider methodsThatNeedsVersionsLoadedWithAlreadyMigratedMigrations
      */
     public function testVersionsTryToGetLoadedIfNotAlreadyLoadedWhenAccessingMethodThatNeedThemEvenIfSomeMigrationsAreAlreadyMigrated(
         string $method,
@@ -319,7 +320,7 @@ public function testGetSetAllOrNothing() : void
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Connection
+     * @return PHPUnit_Framework_MockObject_MockObject|Connection
      */
     private function getConnectionMock()
     {
@@ -327,7 +328,7 @@ private function getConnectionMock()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|OutputWriter
+     * @return PHPUnit_Framework_MockObject_MockObject|OutputWriter
      */
     private function getOutputWriterMock()
     {
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_migrations_list2.php b/tests/Doctrine/Migrations/Tests/Configuration/_files/config_migrations_list2.php
index 49890acdb0..121c7617c6 100644
--- a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_migrations_list2.php
+++ b/tests/Doctrine/Migrations/Tests/Configuration/_files/config_migrations_list2.php
@@ -3,23 +3,23 @@
 declare(strict_types=1);
 
 return [
-'name'                 => 'Doctrine Sandbox Migrations',
-'table_name'           => 'doctrine_migration_versions_test',
-'migrations'           => [
-    'migration1' =>
+    'name'                 => 'Doctrine Sandbox Migrations',
+    'table_name'           => 'doctrine_migration_versions_test',
+    'migrations'           => [
+        'migration1' =>
         [
             'class' => 'Doctrine\\Migrations\\Tests\\Stub\\Version1Test',
             'version' => 'Version1Test',
         ],
-    'migration2' =>
+        'migration2' =>
         [
             'class' => 'Doctrine\\Migrations\\Tests\\Stub\\Version2Test',
             'version' => 'Version2Test',
         ],
-    'migration3' =>
+        'migration3' =>
         [
             'class' => 'Doctrine\\Migrations\\Tests\\Stub\\Version3Test',
             'version' => 'Version3Test',
         ],
-],
+    ],
 ];
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_order_1.php b/tests/Doctrine/Migrations/Tests/Configuration/_files/config_order_1.php
index e537af3a89..0a74e5e2f0 100644
--- a/tests/Doctrine/Migrations/Tests/Configuration/_files/config_order_1.php
+++ b/tests/Doctrine/Migrations/Tests/Configuration/_files/config_order_1.php
@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 return [
-'name'                 => 'Doctrine Sandbox Migrations',
-'migrations_namespace' => 'DoctrineMigrationsTest',
-'table_name'           => 'doctrine_migration_versions_test',
-'migrations_directory' => '.',
-'migrations'           => [],
+    'name'                 => 'Doctrine Sandbox Migrations',
+    'migrations_namespace' => 'DoctrineMigrationsTest',
+    'table_name'           => 'doctrine_migration_versions_test',
+    'migrations_directory' => '.',
+    'migrations'           => [],
 ];
diff --git a/tests/Doctrine/Migrations/Tests/FileQueryWriterTest.php b/tests/Doctrine/Migrations/Tests/FileQueryWriterTest.php
index 6d32719fd8..f3d890f3ea 100644
--- a/tests/Doctrine/Migrations/Tests/FileQueryWriterTest.php
+++ b/tests/Doctrine/Migrations/Tests/FileQueryWriterTest.php
@@ -22,9 +22,9 @@ final class FileQueryWriterTest extends MigrationTestCase
     private const DOWN_QUERY              = 'DELETE FROM %s WHERE %s = \'1\'';
 
     /**
-     * @dataProvider writeProvider
-     *
      * @param string[][] $queries
+     *
+     * @dataProvider writeProvider
      */
     public function testWrite(
         string $path,
diff --git a/tests/Doctrine/Migrations/Tests/Functional/CliTest.php b/tests/Doctrine/Migrations/Tests/Functional/CliTest.php
index b77a1c0ae8..faf69700e5 100644
--- a/tests/Doctrine/Migrations/Tests/Functional/CliTest.php
+++ b/tests/Doctrine/Migrations/Tests/Functional/CliTest.php
@@ -40,7 +40,7 @@ class CliTest extends MigrationTestCase
     /** @var Application */
     private $application;
 
-    /** @var null|int */
+    /** @var int|null */
     private $lastExit;
 
     public function testDumpSchema() : void
@@ -190,6 +190,7 @@ public function testDiffCommandWithSchemaFilterOnlyWorksWithTablesThatMatchFilte
 
     /**
      * @see https://github.com/doctrine/migrations/issues/179
+     *
      * @group regression
      */
     public function testDiffCommandSchemaFilterAreCaseSensitive() : void
@@ -298,7 +299,7 @@ protected function getSchema() : Schema
     }
 
     /**
-     * @return array|\string[]
+     * @return array|string[]
      */
     private function findMigrations() : array
     {
@@ -343,7 +344,7 @@ public function down(Schema $schema) : void
 
 class SampleEntity
 {
-    /** @var null|int */
+    /** @var int|null */
     private $id;
 
     public function getId() : ?int
diff --git a/tests/Doctrine/Migrations/Tests/Functional/FunctionalTest.php b/tests/Doctrine/Migrations/Tests/Functional/FunctionalTest.php
index 721b5e17a3..36518ad4bb 100644
--- a/tests/Doctrine/Migrations/Tests/Functional/FunctionalTest.php
+++ b/tests/Doctrine/Migrations/Tests/Functional/FunctionalTest.php
@@ -169,8 +169,7 @@ public function testDryRunMigration() : void
         $this->config->registerMigration('3', MigrationMigrateFurther::class);
 
         $migratorConfiguration = (new MigratorConfiguration())
-            ->setDryRun(true)
-        ;
+            ->setDryRun(true);
 
         $migrator = $this->createTestMigrator($this->config);
         $migrator->migrate('3', $migratorConfiguration);
@@ -342,9 +341,10 @@ public function testMigrateToCurrentVersionReturnsEmpty() : void
     }
 
     /**
+     * @see https://github.com/doctrine/migrations/issues/61
+     *
      * @param string[] $migrations
      *
-     * @see https://github.com/doctrine/migrations/issues/61
      * @group regression
      * @dataProvider provideTestMigrationNames
      */
@@ -373,7 +373,7 @@ public function testSchemaChangeAreNotTakenIntoAccountInPreAndPostMethod() : voi
         foreach ($queries as $query) {
             self::assertNotContains('bar', $query);
             self::assertNotContains('bar2', $query);
-        };
+        }
 
         $queries = $version->execute('down');
 
@@ -385,7 +385,7 @@ public function testSchemaChangeAreNotTakenIntoAccountInPreAndPostMethod() : voi
         foreach ($queries as $query) {
             self::assertNotContains('bar', $query);
             self::assertNotContains('bar2', $query);
-        };
+        }
     }
 
     /**
@@ -418,7 +418,7 @@ public function testMigrationWorksWhenNoCallsAreMadeToTheSchema() : void
         $schemaDiffProvider->method('getSqlDiffToMigrate')->willReturn([]);
         $schemaDiffProvider
             ->method('createToSchema')
-            ->willReturnCallback(function () use ($schema) {
+            ->willReturnCallback(static function () use ($schema) {
                 return $schema;
             });
 
@@ -489,12 +489,13 @@ public function testSkippedMigrationsDispatchesTheExpectedEvents() : void
     /**
      * This uses a file path based SQL database to actually test the closing
      * of a connection with autocommit mode and re-opening it.
+     *
      * @group https://github.com/doctrine/migrations/issues/496
      */
     public function testMigrateWithConnectionWithAutoCommitOffStillPersistsChanges() : void
     {
-        $listener            = new AutoCommitListener();
-        list($conn, $config) = self::fileConnectionAndConfig();
+        $listener        = new AutoCommitListener();
+        [$conn, $config] = self::fileConnectionAndConfig();
         $config->registerMigration('1', MigrateWithDataModification::class);
         $migrator = $this->createTestMigrator($config);
         $conn->getEventManager()->addEventSubscriber($listener);
diff --git a/tests/Doctrine/Migrations/Tests/Helper.php b/tests/Doctrine/Migrations/Tests/Helper.php
index fbf41288de..917a9a101e 100644
--- a/tests/Doctrine/Migrations/Tests/Helper.php
+++ b/tests/Doctrine/Migrations/Tests/Helper.php
@@ -16,14 +16,13 @@ class Helper
      * Delete a directory.
      *
      * @see http://stackoverflow.com/a/8688278/1645517
-     *
      */
     public static function deleteDir(string $path) : bool
     {
         if ($path === '') {
             return false;
         }
-        $class_func = [__CLASS__, __FUNCTION__];
+        $class_func = [self::class, __FUNCTION__];
 
         return is_file($path) ?
             @unlink($path) :
diff --git a/tests/Doctrine/Migrations/Tests/MigrationTestCase.php b/tests/Doctrine/Migrations/Tests/MigrationTestCase.php
index 09c970fa28..758219f873 100644
--- a/tests/Doctrine/Migrations/Tests/MigrationTestCase.php
+++ b/tests/Doctrine/Migrations/Tests/MigrationTestCase.php
@@ -79,7 +79,7 @@ protected function getOutputWriter() : OutputWriter
         if (! $this->outputWriter) {
             $this->output       = $this->getOutputStream();
             $output             = $this->output;
-            $this->outputWriter = new OutputWriter(function ($message) use ($output) {
+            $this->outputWriter = new OutputWriter(static function ($message) use ($output) {
                 return $output->writeln($message);
             });
         }
diff --git a/tests/Doctrine/Migrations/Tests/MigratorTest.php b/tests/Doctrine/Migrations/Tests/MigratorTest.php
index a8ce8ba4c3..c84c3cd995 100644
--- a/tests/Doctrine/Migrations/Tests/MigratorTest.php
+++ b/tests/Doctrine/Migrations/Tests/MigratorTest.php
@@ -18,7 +18,9 @@
 use Doctrine\Migrations\Tests\Stub\Functional\MigrationThrowsError;
 use Doctrine\Migrations\Version\Direction;
 use PHPUnit\Framework\Constraint\RegularExpression;
+use PHPUnit_Framework_MockObject_MockObject;
 use Symfony\Component\Console\Output\StreamOutput;
+use Throwable;
 use const DIRECTORY_SEPARATOR;
 
 require_once __DIR__ . '/realpath.php';
@@ -110,7 +112,7 @@ public function testMigrateWithNoMigrationsDontThrowsExceptionIfContiniousIntegr
     {
         $messages = [];
 
-        $callback = function ($msg) use (&$messages) : void {
+        $callback = static function ($msg) use (&$messages) : void {
             $messages[] = $msg;
         };
 
@@ -132,7 +134,7 @@ public function testMigrateWithNoMigrationsDontThrowsExceptionIfContiniousIntegr
      */
     public function testGetSql(?string $to) : void
     {
-        /** @var Migration|\PHPUnit_Framework_MockObject_MockObject $migration */
+        /** @var Migration|PHPUnit_Framework_MockObject_MockObject $migration */
         $migration = $this->getMockBuilder(Migrator::class)
             ->disableOriginalConstructor()
             ->setMethods(['migrate'])
@@ -160,9 +162,9 @@ public function getSqlProvider() : array
     }
 
     /**
-     * @dataProvider writeSqlFileProvider
-     *
      * @param string[] $getSqlReturn
+     *
+     * @dataProvider writeSqlFileProvider
      */
     public function testWriteSqlFile(string $path, string $from, ?string $to, array $getSqlReturn) : void
     {
@@ -176,7 +178,7 @@ public function testWriteSqlFile(string $path, string $from, ?string $to, array
         $outputWriter->expects($this->atLeastOnce())
             ->method('write');
 
-        /** @var Configuration|\PHPUnit_Framework_MockObject_MockObject $migration */
+        /** @var Configuration|PHPUnit_Framework_MockObject_MockObject $migration */
         $config = $this->createMock(Configuration::class);
 
         $dependencyFactory   = $this->createMock(DependencyFactory::class);
@@ -208,7 +210,7 @@ public function testWriteSqlFile(string $path, string $from, ?string $to, array
                 ->willReturn($from + 1);
         }
 
-        /** @var Migration|\PHPUnit_Framework_MockObject_MockObject $migration */
+        /** @var Migration|PHPUnit_Framework_MockObject_MockObject $migration */
         $migration = $this->getMockBuilder(Migrator::class)
             ->setConstructorArgs($this->getMigratorConstructorArgs($config))
             ->setMethods(['getSql'])
@@ -240,7 +242,7 @@ public function testMigrateWithMigrationsAndAddTheCurrentVersionOutputsANoMigrat
     {
         $messages = [];
 
-        $callback = function ($msg) use (&$messages) : void {
+        $callback = static function ($msg) use (&$messages) : void {
             $messages[] = $msg;
         };
 
@@ -278,7 +280,7 @@ public function testMigrateAllOrNothing() : void
 
     public function testMigrateAllOrNothingRollback() : void
     {
-        $this->expectException(\Throwable::class);
+        $this->expectException(Throwable::class);
         $this->expectExceptionMessage('Migration up throws exception.');
 
         $this->config->setMigrationsDirectory(__DIR__ . '/Stub/migrations-empty-folder');
diff --git a/tests/Doctrine/Migrations/Tests/Provider/SampleEntity.php b/tests/Doctrine/Migrations/Tests/Provider/SampleEntity.php
index f76d691443..96783123de 100644
--- a/tests/Doctrine/Migrations/Tests/Provider/SampleEntity.php
+++ b/tests/Doctrine/Migrations/Tests/Provider/SampleEntity.php
@@ -6,7 +6,7 @@
 
 class SampleEntity
 {
-    /** @var null|int */
+    /** @var int|null */
     private $id;
 
     public function getId() : ?int
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/AbstractCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/AbstractCommandTest.php
index 0bf549f512..e917377eb8 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/AbstractCommandTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/AbstractCommandTest.php
@@ -236,6 +236,7 @@ public function testMigrationsConfigurationFromCommandLineOverridesInjectedConfi
 
     /**
      * @see https://github.com/doctrine/migrations/issues/228
+     *
      * @group regression
      */
     public function testInjectedConfigurationIsPreferedOverConfigFileIsCurrentWorkingDirectory() : void
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/CommandTestCase.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/CommandTestCase.php
index 5f3e4b02f5..613eccb0cf 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/CommandTestCase.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/CommandTestCase.php
@@ -8,6 +8,7 @@
 use Doctrine\Migrations\Configuration\Configuration;
 use Doctrine\Migrations\Tests\MigrationTestCase;
 use Doctrine\Migrations\Tools\Console\Command\AbstractCommand;
+use PHPUnit_Framework_MockObject_MockObject;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use function array_replace;
@@ -20,7 +21,7 @@ abstract class CommandTestCase extends MigrationTestCase
     /** @var Application */
     protected $app;
 
-    /** @var Configuration|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var Configuration|PHPUnit_Framework_MockObject_MockObject */
     protected $config;
 
     /** @var Connection */
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DialogSupport.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DialogSupport.php
index 0497c25947..aee92f62ef 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DialogSupport.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/DialogSupport.php
@@ -4,12 +4,13 @@
 
 namespace Doctrine\Migrations\Tests\Tools\Console\Command;
 
+use PHPUnit_Framework_MockObject_MockObject;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Helper\QuestionHelper;
 
 trait DialogSupport
 {
-    /** @var QuestionHelper|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var QuestionHelper|PHPUnit_Framework_MockObject_MockObject */
     protected $questions;
 
     protected function configureDialogs(Application $app) : void
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrationStatusTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrationStatusTest.php
index e1b6aba17a..be25472d89 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrationStatusTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrationStatusTest.php
@@ -42,6 +42,7 @@ public function testVersions() : void
 
     /**
      * Asserts that one version is displayed correctly.
+     *
      * @param  string      $alias   "prev", "current", "next", "latest".
      * @param  string|null $version The version corresponding to the $alias.
      * @param  string      $label   The expected row label.
@@ -65,7 +66,7 @@ protected function assertVersion(string $alias, ?string $version, string $label,
         $configuration
             ->expects($this->exactly(4))
             ->method('resolveVersionAlias')
-            ->will($this->returnCallback(function ($argAlias) use ($alias, $version) {
+            ->will($this->returnCallback(static function ($argAlias) use ($alias, $version) {
                 return $argAlias === $alias ? $version : '999';
             }));
 
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php
index 4d90c4d7d0..7275e593e5 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php
@@ -28,10 +28,10 @@ protected function setUp() : void
     }
 
     /**
-     * @dataProvider dataIsUpToDate
-     *
      * @param Version[] $migrations
      * @param string[]  $migratedVersions
+     *
+     * @dataProvider dataIsUpToDate
      */
     public function testIsUpToDate(array $migrations, array $migratedVersions, int $exitCode) : void
     {
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleRunnerTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleRunnerTest.php
index e5b933cca5..44037d64e7 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleRunnerTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/ConsoleRunnerTest.php
@@ -7,6 +7,7 @@
 use Doctrine\Migrations\Tools\Console\ConsoleRunner;
 use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper;
 use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Helper\HelperSet;
 
@@ -15,7 +16,7 @@
  */
 class ConsoleRunnerTest extends TestCase
 {
-    /** @var \PHPUnit_Framework_MockObject_MockObject|EntityManagerHelper */
+    /** @var PHPUnit_Framework_MockObject_MockObject|EntityManagerHelper */
     private $entityManagerHelper;
 
     /** @var Application */
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Helper/ConfigurationHelperTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Helper/ConfigurationHelperTest.php
index 548f3d6eba..3f45de9dbf 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Helper/ConfigurationHelperTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Helper/ConfigurationHelperTest.php
@@ -13,6 +13,7 @@
 use Doctrine\Migrations\Tools\Console\Helper\ConfigurationHelper;
 use Doctrine\ORM\Configuration as ORMConfiguration;
 use InvalidArgumentException;
+use PHPUnit_Framework_MockObject_MockObject;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -34,7 +35,7 @@ class ConfigurationHelperTest extends MigrationTestCase
     /** @var OutputInterface */
     protected $output;
 
-    /** @var InputInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var InputInterface|PHPUnit_Framework_MockObject_MockObject */
     private $input;
 
     protected function setUp() : void
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Helper/files/config.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Helper/files/config.php
index 56bff75ecc..bea97cb84c 100644
--- a/tests/Doctrine/Migrations/Tests/Tools/Console/Helper/files/config.php
+++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Helper/files/config.php
@@ -3,8 +3,8 @@
 declare(strict_types=1);
 
 return [
-'name'                 => 'Doctrine Sandbox Migrations',
-'migrations_namespace' => 'DoctrineMigrationsTest',
-'table_name'           => 'doctrine_migration_versions_test',
-'migrations_directory' => 'tests/Doctrine/Migrations/Tests/Tools/Console/Helper/files',
+    'name'                 => 'Doctrine Sandbox Migrations',
+    'migrations_namespace' => 'DoctrineMigrationsTest',
+    'table_name'           => 'doctrine_migration_versions_test',
+    'migrations_directory' => 'tests/Doctrine/Migrations/Tests/Tools/Console/Helper/files',
 ];
diff --git a/tests/Doctrine/Migrations/Tests/Tracking/TableUpdaterTest.php b/tests/Doctrine/Migrations/Tests/Tracking/TableUpdaterTest.php
index bad0d4ae8c..271b4946b1 100644
--- a/tests/Doctrine/Migrations/Tests/Tracking/TableUpdaterTest.php
+++ b/tests/Doctrine/Migrations/Tests/Tracking/TableUpdaterTest.php
@@ -15,6 +15,7 @@
 use Doctrine\Migrations\Tracking\TableUpdater;
 use Exception;
 use PHPUnit\Framework\TestCase;
+use Throwable;
 
 class TableUpdaterTest extends TestCase
 {
@@ -109,7 +110,7 @@ public function testUpdateMigrationTable() : void
 
     public function testUpdateMigrationTableRollback() : void
     {
-        $this->expectException(\Throwable::class);
+        $this->expectException(Throwable::class);
         $this->expectExceptionMessage('Rolling back.');
 
         $this->migrationTable->expects($this->once())
@@ -200,7 +201,6 @@ protected function setUp() : void
                 $this->platform,
             ])
             ->setMethods(['createSchema'])
-            ->getMock()
-        ;
+            ->getMock();
     }
 }
diff --git a/tests/Doctrine/Migrations/Tests/Version/VersionTest.php b/tests/Doctrine/Migrations/Tests/Version/VersionTest.php
index f1b4539d6f..e4a37850ec 100644
--- a/tests/Doctrine/Migrations/Tests/Version/VersionTest.php
+++ b/tests/Doctrine/Migrations/Tests/Version/VersionTest.php
@@ -37,6 +37,7 @@
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamFile;
 use PDO;
+use PHPUnit_Framework_MockObject_MockObject;
 use ReflectionClass;
 use stdClass;
 use Symfony\Component\Stopwatch\Stopwatch as SymfonyStopwatch;
@@ -184,9 +185,9 @@ public function testAddSql() : void
     }
 
     /**
-     * @dataProvider writeSqlFileProvider
-     *
      * @param string[] $getSqlReturn
+     *
+     * @dataProvider writeSqlFileProvider
      */
     public function testWriteSqlFile(string $path, string $direction, array $getSqlReturn) : void
     {
@@ -199,7 +200,7 @@ public function testWriteSqlFile(string $path, string $direction, array $getSqlR
         $outputWriter->expects($this->atLeastOnce())
             ->method('write');
 
-        /** @var Configuration|\PHPUnit_Framework_MockObject_MockObject $config */
+        /** @var Configuration|PHPUnit_Framework_MockObject_MockObject $config */
         $config = $this->getMockBuilder(Configuration::class)
             ->disableOriginalConstructor()
             ->setMethods(['getConnection', 'getOutputWriter', 'getQueryWriter'])
@@ -214,7 +215,7 @@ public function testWriteSqlFile(string $path, string $direction, array $getSqlR
         $config->method('getQueryWriter')
             ->willReturn($queryWriter);
 
-        /** @var Version|\PHPUnit_Framework_MockObject_MockObject $version */
+        /** @var Version|PHPUnit_Framework_MockObject_MockObject $version */
         $version = $this->getMockBuilder(Version::class)
             ->setConstructorArgs($this->getMockVersionConstructorArgs($config, $version, TestMigration::class))
             ->setMethods(['execute'])
@@ -392,7 +393,7 @@ public function testWriteSqlFileShouldUseStandardCommentMarkerInSql() : void
 
         $connection = $this->getSqliteConnection();
 
-        /** @var Configuration|\PHPUnit_Framework_MockObject_MockObject $migration */
+        /** @var Configuration|PHPUnit_Framework_MockObject_MockObject $migration */
         $config = $this->getMockBuilder(Configuration::class)
             ->disableOriginalConstructor()
             ->setMethods([
@@ -415,7 +416,7 @@ public function testWriteSqlFileShouldUseStandardCommentMarkerInSql() : void
         $config->method('getQuotedMigrationsExecutedAtColumnName')
             ->willReturn('executed_at');
 
-        /** @var Version|\PHPUnit_Framework_MockObject_MockObject $migration */
+        /** @var Version|PHPUnit_Framework_MockObject_MockObject $migration */
         $migration = $this->getMockBuilder(Version::class)
             ->setConstructorArgs($this->getMockVersionConstructorArgs($config, $version, TestMigration::class))
             ->setMethods(['execute'])
@@ -443,7 +444,7 @@ public function testDryRunCausesSqlToBeOutputViaTheOutputWriter() : void
     {
         $messages = [];
 
-        $ow = new OutputWriter(function ($msg) use (&$messages) : void {
+        $ow = new OutputWriter(static function ($msg) use (&$messages) : void {
             $messages[] = trim($msg);
         });
 
@@ -467,7 +468,7 @@ public function testDryRunWithQuestionMarkedParamsOutputsParamsWithSqlStatement(
     {
         $messages = [];
 
-        $ow = new OutputWriter(function ($msg) use (&$messages) : void {
+        $ow = new OutputWriter(static function ($msg) use (&$messages) : void {
             $messages[] = trim($msg);
         });
 
@@ -492,7 +493,7 @@ public function testDryRunWithNamedParametersOutputsParamsAndNamesWithSqlStateme
     {
         $messages = [];
 
-        $ow = new OutputWriter(function ($msg) use (&$messages) : void {
+        $ow = new OutputWriter(static function ($msg) use (&$messages) : void {
             $messages[] = trim($msg);
         });
 
@@ -527,9 +528,10 @@ public static function dryRunTypes() : array
     }
 
     /**
-     * @dataProvider dryRunTypes
      * @param mixed[] $value
      * @param mixed[] $type
+     *
+     * @dataProvider dryRunTypes
      */
     public function testDryRunWithParametersOfComplexTypesCorrectFormatsParameters(
         array $value,
@@ -538,7 +540,7 @@ public function testDryRunWithParametersOfComplexTypesCorrectFormatsParameters(
     ) : void {
         $messages = [];
 
-        $ow = new OutputWriter(function ($msg) use (&$messages) : void {
+        $ow = new OutputWriter(static function ($msg) use (&$messages) : void {
             $messages[] = trim($msg);
         });
 
@@ -565,7 +567,7 @@ public function testRunWithInsertNullValue() : void
     {
         $messages = [];
 
-        $ow = new OutputWriter(function ($msg) use (&$messages) : void {
+        $ow = new OutputWriter(static function ($msg) use (&$messages) : void {
             $messages[] = trim($msg);
         });