mainly cs

lib/Doctrine/Migrations/AbstractMigration.php

@@ -32,7 +32,7 @@ abstract class AbstractMigration
     /** @var LoggerInterface */
     private $logger;
 
-    /** @var array */
+    /** @var mixed[] */
     private $plannedSql = [];
 
     public function __construct(Connection $connection, LoggerInterface $logger)
@@ -127,6 +127,9 @@ protected function addSql(
         $this->plannedSql[] = func_get_args();
     }
 
+    /**
+     * @return mixed[]
+     */
     public function getSql() : array
     {
         return $this->plannedSql;

lib/Doctrine/Migrations/Configuration/Configuration.php

@@ -65,6 +65,9 @@ public function addMigrationsDirectory(string $namespace, string $path) : void
         $this->migrationsDirectories[$namespace] = $path;
     }
 
+    /**
+     * @return array<string,string>
+     */
     public function getMigrationDirectories() : array
     {
         return $this->migrationsDirectories;

lib/Doctrine/Migrations/Configuration/Loader/AbstractFileLoader.php

@@ -14,6 +14,11 @@
  */
 abstract class AbstractFileLoader implements Loader
 {
+    /**
+     * @param array<string,string> $input
+     *
+     * @return array<string,string>
+     */
     protected function getDirectoryRelativeToFile(string $file, array $input) : array
     {
         foreach ($input as $ns => $dir) {

lib/Doctrine/Migrations/Configuration/Loader/ArrayLoader.php

@@ -22,7 +22,7 @@
 class ArrayLoader implements Loader
 {
     /**
-     * @param mixed|array $array
+     * @param mixed $array
      */
     public function load($array) : Configuration
     {
@@ -64,9 +64,9 @@ public function load($array) : Configuration
     }
 
     /**
-     * @param array                                           $configMap
+     * @param mixed[]                                         $configMap
      * @param Configuration|TableMetadataStorageConfiguration $object
-     * @param array                                           $data
+     * @param mixed[]                                         $data
      */
     private static function applyConfigs(array $configMap, $object, array $data) : void
     {

lib/Doctrine/Migrations/Configuration/Loader/Loader.php

@@ -11,5 +11,5 @@ interface Loader
     /**
      * @param mixed $resource
      */
-    function load($resource) : Configuration;
+    public function load($resource) : Configuration;
 }

lib/Doctrine/Migrations/Configuration/Loader/XmlFileLoader.php

@@ -24,6 +24,9 @@ class XmlFileLoader extends AbstractFileLoader
     /** @var ArrayLoader */
     private $arrayLoader;
 
+    /**
+     * @return mixed[]
+     */
     private function extractParameters(SimpleXMLElement $root, bool $nodes = true) : array
     {
         $config = [];
@@ -52,6 +55,9 @@ public function __construct(?ArrayLoader $arrayLoader = null)
         $this->arrayLoader = $arrayLoader ?: new ArrayLoader();
     }
 
+    /**
+     * @param mixed|string $file
+     */
     public function load($file) : Configuration
     {
         if (! file_exists($file)) {

lib/Doctrine/Migrations/Event/MigrationsVersionEventArgs.php

@@ -6,7 +6,6 @@
 
 use Doctrine\Common\EventArgs;
 use Doctrine\DBAL\Connection;
-use Doctrine\Migrations\Configuration\Configuration;
 use Doctrine\Migrations\Metadata\MigrationPlan;
 use Doctrine\Migrations\MigratorConfiguration;
 
@@ -15,9 +14,6 @@
  */
 class MigrationsVersionEventArgs extends EventArgs
 {
-    /** @var Configuration */
-    private $configuration;
-
     /** @var Connection */
     private $connection;
 

lib/Doctrine/Migrations/Generator/FileBuilder.php

@@ -44,9 +44,9 @@ public function buildMigrationFile(
         return $string;
     }
 
-    // @todo this is hard to implement since MetadataStorage abstracts the migrations table
     private function getVersionUpdateQuery(string $version, string $direction) : string
     {
+        // @todo this is hard to implement since MetadataStorage abstracts the migrations table
         return '';
 
         if ($direction === Direction::DOWN) {

lib/Doctrine/Migrations/Metadata/AvailableMigrationsList.php

@@ -15,6 +15,9 @@ class AvailableMigrationsList implements Countable
     /** @var AvailableMigration[] */
     private $items = [];
 
+    /**
+     * @param AvailableMigration[] $items
+     */
     public function __construct(array $items)
     {
         $this->items = array_values($items);

lib/Doctrine/Migrations/Metadata/ExecutedMigrationsSet.php

@@ -15,6 +15,9 @@ class ExecutedMigrationsSet implements Countable
     /** @var ExecutedMigration[] */
     private $items = [];
 
+    /**
+     * @param ExecutedMigration[] $items
+     */
     public function __construct(array $items)
     {
         $this->items = array_values($items);

lib/Doctrine/Migrations/Metadata/MigrationPlanList.php

@@ -17,6 +17,9 @@ class MigrationPlanList implements Countable
     /** @var MigrationPlan[] */
     private $items = [];
 
+    /**
+     * @param MigrationPlan[] $items
+     */
     public function __construct(array $items, string $direction)
     {
         $this->items     = $items;

lib/Doctrine/Migrations/MigrationPlanCalculator.php

@@ -78,12 +78,20 @@ private function findDirection(Version $to, Metadata\ExecutedMigrationsSet $exec
         return Direction::UP;
     }
 
+    /**
+     * @return  Metadata\AvailableMigration[]
+     */
     private function arrangeMigrationsForDirection(string $direction, Metadata\AvailableMigrationsList $availableMigrations) : array
     {
         return $direction === Direction::UP ? $availableMigrations->getItems() : array_reverse($availableMigrations->getItems());
     }
 
-    private function findMigrationsToExecute(Version $to, $migrationsToCheck, string $direction, Metadata\ExecutedMigrationsSet $executedMigrations) : array
+    /**
+     * @param ExecutedMigration[] $migrationsToCheck
+     *
+     * @return ExecutedMigration[]
+     */
+    private function findMigrationsToExecute(Version $to, array $migrationsToCheck, string $direction, Metadata\ExecutedMigrationsSet $executedMigrations) : array
     {
         $toExecute = [];
         foreach ($migrationsToCheck as $availableMigration) {

lib/Doctrine/Migrations/MigrationRepository.php

@@ -42,6 +42,9 @@ class MigrationRepository
     /** @var callable */
     private $sorter;
 
+    /**
+     * @param array<string, string> $migrationDirectories
+     */
     public function __construct(
         array $migrationDirectories,
         MigrationFinder $migrationFinder,

lib/Doctrine/Migrations/Migrator.php

@@ -86,6 +86,9 @@ private function executeMigrations(
         return $sql;
     }
 
+    /**
+     * @return array<string, string[]>
+     */
     private function executePlan(MigrationPlanList $migrationsPlan, MigratorConfiguration $migratorConfiguration) : array
     {
         $sql  = [];
@@ -130,6 +133,9 @@ private function endMigrations(
         );
     }
 
+    /**
+     * @return string[][]
+     */
     public function migrate(MigrationPlanList $migrationsPlan, MigratorConfiguration $migratorConfiguration) : array
     {
         /**

lib/Doctrine/Migrations/MigratorInterface.php

@@ -13,5 +13,8 @@
  */
 interface MigratorInterface
 {
+    /**
+     * @return string[][]
+     */
     public function migrate(MigrationPlanList $migrationsPlan, MigratorConfiguration $migratorConfiguration) : array;
 }

lib/Doctrine/Migrations/Tools/Console/Command/DumpSchemaCommand.php

@@ -95,7 +95,8 @@ public function execute(
         $configuration = $this->dependencyFactory->getConfiguration();
         $versionNumber = $configuration->generateVersionNumber();
 
-        if (! ($namespace = $input->getOption('namespace'))) {
+        $namespace = $input->getOption('namespace');
+        if ($namespace === null) {
             $dirs      = $configuration->getMigrationDirectories();
             $namespace = key($dirs);
         }

lib/Doctrine/Migrations/Version/AliasResolver.php

@@ -70,13 +70,11 @@ public function resolveVersionAlias(string $alias) : Version
                 if ($info !== null) {
                     return $info->getVersion();
                 }
-
+                throw UnknownMigrationVersion::new($alias);
             case self::ALIAS_CURRENT:
                 $info = $executedMigrations->getLast();
 
-                if ($info !== null) {
-                    return $info->getVersion();
-                }
+                return $info !== null ? $info->getVersion() : new Version('0');
             case self::ALIAS_PREV:
                 $info = $executedMigrations->getLast(-1);
 

lib/Doctrine/Migrations/Version/ExecutionResult.php

@@ -98,6 +98,8 @@ public function getSql() : array
 
     /**
      * @param string[] $sql
+     * @param mixed[]  $params
+     * @param int[]    $types
      */
     public function setSql(array $sql, array $params = [], array $types = []) : void
     {

lib/Doctrine/Migrations/Version/Executor.php

@@ -256,6 +256,9 @@ private function executeMigration(
         return $result;
     }
 
+    /**
+     * @return mixed[]
+     */
     private function getMigrationHeader(MigrationPlan $planItem, AbstractMigration $migration, string $direction) : array
     {
         $versionInfo = (string) $planItem->getVersion();

lib/Doctrine/Migrations/Version/Factory.php

@@ -19,9 +19,6 @@ class Factory
     /** @var Connection */
     private $connection;
 
-    /** @var ExecutorInterface */
-    private $versionExecutor;
-
     /** @var LoggerInterface */
     private $logger;
 

tests/Doctrine/Migrations/Tests/AbstractMigrationTest.php

@@ -8,7 +8,6 @@
 use Doctrine\Migrations\Exception\IrreversibleMigration;
 use Doctrine\Migrations\Exception\SkipMigration;
 use Doctrine\Migrations\Tests\Stub\AbstractMigrationStub;
-use Psr\Log\AbstractLogger;
 use Psr\Log\LoggerInterface;
 
 class AbstractMigrationTest extends MigrationTestCase
@@ -21,14 +20,7 @@ class AbstractMigrationTest extends MigrationTestCase
 
     protected function setUp() : void
     {
-        $this->logger = new class () extends AbstractLogger {
-            public $logs = [];
-
-            public function log($level, $message, array $context = []) : void
-            {
-                $this->logs[] = $message;
-            }
-        };
+        $this->logger = new TestLogger();
 
         $this->migration = new AbstractMigrationStub($this->getSqliteConnection(), $this->logger);
     }

tests/Doctrine/Migrations/Tests/Configuration/Loader/AbstractLoaderTest.php

@@ -15,7 +15,7 @@
 
 abstract class AbstractLoaderTest extends TestCase
 {
-    abstract public function load($prefix = '') : Configuration;
+    abstract public function load(string $prefix = '') : Configuration;
 
     public function testLoad() : void
     {

tests/Doctrine/Migrations/Tests/Configuration/Loader/JsonLoaderTest.php

@@ -10,7 +10,7 @@
 
 class JsonLoaderTest extends AbstractLoaderTest
 {
-    public function load($prefix = '') : Configuration
+    public function load(string $prefix = '') : Configuration
     {
         $loader = new JsonFileLoader();
 

tests/Doctrine/Migrations/Tests/Configuration/Loader/PhpLoaderTest.php

@@ -9,7 +9,7 @@
 
 class PhpLoaderTest extends AbstractLoaderTest
 {
-    public function load($prefix = '') : Configuration
+    public function load(string $prefix = '') : Configuration
     {
         $loader = new PHPFileLoader();
 

tests/Doctrine/Migrations/Tests/Configuration/Loader/XmlLoaderTest.php

@@ -10,7 +10,7 @@
 
 class XmlLoaderTest extends AbstractLoaderTest
 {
-    public function load($prefix = '') : Configuration
+    public function load(string $prefix = '') : Configuration
     {
         $loader = new XmlFileLoader();
 

tests/Doctrine/Migrations/Tests/Configuration/Loader/YamlLoaderTest.php

@@ -10,7 +10,7 @@
 
 class YamlLoaderTest extends AbstractLoaderTest
 {
-    public function load($prefix = '') : Configuration
+    public function load(string $prefix = '') : Configuration
     {
         $loader = new YamlFileLoader();
 

tests/Doctrine/Migrations/Tests/Metadata/ExecutedMigrationSetTest.php

@@ -5,7 +5,6 @@
 namespace Doctrine\Migrations\Tests\Metadata;
 
 use DateTime;
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\Migrations\Exception\MigrationNotExecuted;
 use Doctrine\Migrations\Metadata\ExecutedMigration;
 use Doctrine\Migrations\Metadata\ExecutedMigrationsSet;
@@ -14,14 +13,6 @@
 
 class ExecutedMigrationSetTest extends TestCase
 {
-    /** @var AbstractMigration */
-    private $abstractMigration;
-
-    public function setUp() : void
-    {
-        $this->abstractMigration = $this->createMock(AbstractMigration::class);
-    }
-
     public function testFirst() : void
     {
         $m1 = new ExecutedMigration(new Version('A'));

tests/Doctrine/Migrations/Tests/MigrationPlanCalculatorTest.php

@@ -68,6 +68,8 @@ public function testPlanForExactVersionWhenNoMigrations() : void
     }
 
     /**
+     * @param string[] $expectedPlan
+     *
      * @dataProvider getPlanUpWhenNoMigrations
      */
     public function testPlanWhenNoMigrations(?string $to, array $expectedPlan, string $direction) : void
@@ -100,7 +102,10 @@ public function testPlanWhenNoMigrations(?string $to, array $expectedPlan, strin
         }
     }
 
-    public function getPlanUpWhenNoMigrations()
+    /**
+     * @return mixed[]
+     */
+    public function getPlanUpWhenNoMigrations() : array
     {
         return [
             ['A', ['A'], Direction::UP],
@@ -112,6 +117,8 @@ public function getPlanUpWhenNoMigrations()
     }
 
     /**
+     * @param string[] $expectedPlan
+     *
      * @dataProvider getPlanUpWhenMigrations
      */
     public function testPlanWhenMigrations(?string $to, array $expectedPlan, ?string $direction) : void
@@ -216,7 +223,10 @@ public function testGetExecutedUnavailableMigrations() : void
         self::assertSame([$e2, $e3], $newSet->getItems());
     }
 
-    public function getPlanUpWhenMigrations()
+    /**
+     * @return mixed[]
+     */
+    public function getPlanUpWhenMigrations() : array
     {
         return [
             ['0', ['B', 'A'], Direction::DOWN],