fix tests

Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
cakephp · Jun 19, 2021 · f385bbb · f385bbb
1 parent f8d4391
commit f385bbb
Show file tree

Hide file tree

Showing 27 changed files with 89 additions and 93 deletions.
diff --git a/src/Phinx/Console/Command/AbstractCommand.php b/src/Phinx/Console/Command/AbstractCommand.php
@@ -44,7 +44,7 @@ abstract class AbstractCommand extends Command
     protected const DEFAULT_SEED_TEMPLATE = '/../../Seed/Seed.template.php.dist';
 
     /**
-     * @var \Phinx\Config\ConfigInterface
+     * @var \Phinx\Config\ConfigInterface|null
      */
     protected $config;
 
@@ -107,7 +107,6 @@ protected function configure(): void
      */
     public function bootstrap(InputInterface $input, OutputInterface $output): void
     {
-        /** @var \Phinx\Config\ConfigInterface|null $config */
         $config = $this->getConfig();
         if (!$config) {
             $this->loadConfig($input, $output);
@@ -159,9 +158,9 @@ public function setConfig(ConfigInterface $config)
     /**
      * Gets the config.
      *
-     * @return \Phinx\Config\ConfigInterface
+     * @return \Phinx\Config\ConfigInterface|null
      */
-    public function getConfig(): ConfigInterface
+    public function getConfig(): ?ConfigInterface
     {
         return $this->config;
     }

diff --git a/src/Phinx/Db/Adapter/AbstractAdapter.php b/src/Phinx/Db/Adapter/AbstractAdapter.php
@@ -27,9 +27,9 @@ abstract class AbstractAdapter implements AdapterInterface
     protected $options = [];
 
     /**
-     * @var \Symfony\Component\Console\Input\InputInterface
+     * @var \Symfony\Component\Console\Input\InputInterface|null
      */
-    protected $input;
+    protected $input = null;
 
     /**
      * @var \Symfony\Component\Console\Output\OutputInterface
@@ -135,7 +135,7 @@ public function setInput(InputInterface $input): AdapterInterface
     /**
      * @inheritDoc
      */
-    public function getInput(): InputInterface
+    public function getInput(): ?InputInterface
     {
         return $this->input;
     }

diff --git a/src/Phinx/Db/Adapter/AdapterFactory.php b/src/Phinx/Db/Adapter/AdapterFactory.php
@@ -64,11 +64,11 @@ public static function instance(): AdapterFactory
      * Add or replace an adapter with a fully qualified class name.
      *
      * @param string $name Name
-     * @param string $class Class
+     * @param object $class Class
      * @throws \RuntimeException
      * @return $this
      */
-    public function registerAdapter(string $name, string $class)
+    public function registerAdapter(string $name, $class)
     {
         if (!is_subclass_of($class, 'Phinx\Db\Adapter\AdapterInterface')) {
             throw new RuntimeException(sprintf(
@@ -86,9 +86,9 @@ public function registerAdapter(string $name, string $class)
      *
      * @param string $name Name
      * @throws \RuntimeException
-     * @return string
+     * @return object
      */
-    protected function getClass(string $name): string
+    protected function getClass(string $name)
     {
         if (empty($this->adapters[$name])) {
             throw new RuntimeException(sprintf(

diff --git a/src/Phinx/Db/Adapter/AdapterInterface.php b/src/Phinx/Db/Adapter/AdapterInterface.php
@@ -124,9 +124,9 @@ public function setInput(InputInterface $input): AdapterInterface;
     /**
      * Gets the console input.
      *
-     * @return \Symfony\Component\Console\Input\InputInterface
+     * @return \Symfony\Component\Console\Input\InputInterface|null
      */
-    public function getInput(): InputInterface;
+    public function getInput(): ?InputInterface;
 
     /**
      * Sets the console output.

diff --git a/src/Phinx/Db/Adapter/PdoAdapter.php b/src/Phinx/Db/Adapter/PdoAdapter.php
@@ -166,16 +166,12 @@ public function getConnection(): PDO
     /**
      * @inheritDoc
      */
-    public function connect(): void
-    {
-    }
+    abstract public function connect(): void;
 
     /**
      * @inheritDoc
      */
-    public function disconnect(): void
-    {
-    }
+    abstract public function disconnect(): void;
 
     /**
      * @inheritDoc

diff --git a/src/Phinx/Db/Adapter/SQLiteAdapter.php b/src/Phinx/Db/Adapter/SQLiteAdapter.php
@@ -1394,9 +1394,11 @@ protected function getDropForeignKeyByColumnsInstructions(string $tableName, arr
     /**
      * {@inheritDoc}
      *
+     * @param string|\Phinx\Db\Literal $type Type
+     * @param int|null $limit Limit
      * @throws \Phinx\Db\Adapter\UnsupportedColumnTypeException
      */
-    public function getSqlType(string $type, ?int $limit = null): array
+    public function getSqlType($type, ?int $limit = null): array
     {
         $typeLC = strtolower($type);
         if ($type instanceof Literal) {

diff --git a/src/Phinx/Db/Table/Column.php b/src/Phinx/Db/Table/Column.php
@@ -64,9 +64,9 @@ class Column
     protected $type;
 
     /**
-     * @var int
+     * @var int|null
      */
-    protected $limit;
+    protected $limit = null;
 
     /**
      * @var bool
@@ -96,7 +96,7 @@ class Column
     /**
      * @var int
      */
-    protected $scale;
+    protected $scale = null;
 
     /**
      * @var string
@@ -109,9 +109,9 @@ class Column
     protected $update;
 
     /**
-     * @var string
+     * @var string|null
      */
-    protected $comment;
+    protected $comment = null;
 
     /**
      * @var bool
@@ -197,10 +197,10 @@ public function getType()
     /**
      * Sets the column limit.
      *
-     * @param int $limit Limit
+     * @param int|null $limit Limit
      * @return $this
      */
-    public function setLimit(int $limit)
+    public function setLimit(?int $limit)
     {
         $this->limit = $limit;
 
@@ -212,7 +212,7 @@ public function setLimit(int $limit)
      *
      * @return int
      */
-    public function getLimit(): int
+    public function getLimit(): ?int
     {
         return $this->limit;
     }
@@ -358,10 +358,10 @@ public function getUpdate(): string
      * For example `DECIMAL(5,2)`, 5 is the precision and 2 is the scale,
      * and the column could store value from -999.99 to 999.99.
      *
-     * @param int $precision Number precision
+     * @param int|null $precision Number precision
      * @return $this
      */
-    public function setPrecision(int $precision)
+    public function setPrecision(?int $precision)
     {
         $this->setLimit($precision);
 
@@ -376,7 +376,7 @@ public function setPrecision(int $precision)
      *
      * @return int
      */
-    public function getPrecision(): int
+    public function getPrecision(): ?int
     {
         return $this->limit;
     }
@@ -433,10 +433,10 @@ public function setIncrement(int $increment)
      * For example `DECIMAL(5,2)`, 5 is the precision and 2 is the scale,
      * and the column could store value from -999.99 to 999.99.
      *
-     * @param int $scale Number scale
+     * @param int|null $scale Number scale
      * @return $this
      */
-    public function setScale(int $scale)
+    public function setScale(?int $scale)
     {
         $this->scale = $scale;
 
@@ -451,7 +451,7 @@ public function setScale(int $scale)
      *
      * @return int
      */
-    public function getScale(): int
+    public function getScale(): ?int
     {
         return $this->scale;
     }
@@ -477,10 +477,10 @@ public function setPrecisionAndScale(int $precision, int $scale)
     /**
      * Sets the column comment.
      *
-     * @param string $comment Comment
+     * @param string|null $comment Comment
      * @return $this
      */
-    public function setComment(string $comment)
+    public function setComment(?string $comment)
     {
         $this->comment = $comment;
 
@@ -492,7 +492,7 @@ public function setComment(string $comment)
      *
      * @return string
      */
-    public function getComment(): string
+    public function getComment(): ?string
     {
         return $this->comment;
     }

diff --git a/src/Phinx/Db/Table/ForeignKey.php b/src/Phinx/Db/Table/ForeignKey.php
@@ -33,19 +33,19 @@ class ForeignKey
     protected $referencedColumns = [];
 
     /**
-     * @var string
+     * @var string|null
      */
-    protected $onDelete;
+    protected $onDelete = null;
 
     /**
-     * @var string
+     * @var string|null
      */
-    protected $onUpdate;
+    protected $onUpdate = null;
 
     /**
      * @var string|null
      */
-    protected $constraint;
+    protected $constraint = null;
 
     /**
      * Sets the foreign key columns.
@@ -132,19 +132,19 @@ public function setOnDelete(string $onDelete)
     /**
      * Gets ON DELETE action for the foreign key.
      *
-     * @return string
+     * @return string|null
      */
-    public function getOnDelete(): string
+    public function getOnDelete(): ?string
     {
         return $this->onDelete;
     }
 
     /**
      * Gets ON UPDATE action for the foreign key.
      *
-     * @return string
+     * @return string|null
      */
-    public function getOnUpdate(): string
+    public function getOnUpdate(): ?string
     {
         return $this->onUpdate;
     }

diff --git a/src/Phinx/Migration/AbstractMigration.php b/src/Phinx/Migration/AbstractMigration.php
@@ -36,19 +36,19 @@ abstract class AbstractMigration implements MigrationInterface
     protected $version;
 
     /**
-     * @var \Phinx\Db\Adapter\AdapterInterface
+     * @var \Phinx\Db\Adapter\AdapterInterface|null
      */
-    protected $adapter;
+    protected $adapter = null;
 
     /**
-     * @var \Symfony\Component\Console\Output\OutputInterface
+     * @var \Symfony\Component\Console\Output\OutputInterface|null
      */
-    protected $output;
+    protected $output = null;
 
     /**
-     * @var \Symfony\Component\Console\Input\InputInterface
+     * @var \Symfony\Component\Console\Input\InputInterface|null
      */
-    protected $input;
+    protected $input = null;
 
     /**
      * Whether this migration is being applied or reverted
@@ -97,7 +97,7 @@ public function setAdapter(AdapterInterface $adapter): MigrationInterface
     /**
      * @inheritDoc
      */
-    public function getAdapter(): AdapterInterface
+    public function getAdapter(): ?AdapterInterface
     {
         return $this->adapter;
     }
@@ -115,7 +115,7 @@ public function setInput(InputInterface $input): MigrationInterface
     /**
      * @inheritDoc
      */
-    public function getInput(): InputInterface
+    public function getInput(): ?InputInterface
     {
         return $this->input;
     }
@@ -133,7 +133,7 @@ public function setOutput(OutputInterface $output): MigrationInterface
     /**
      * @inheritDoc
      */
-    public function getOutput(): OutputInterface
+    public function getOutput(): ?OutputInterface
     {
         return $this->output;
     }

diff --git a/src/Phinx/Migration/Manager.php b/src/Phinx/Migration/Manager.php
@@ -51,12 +51,12 @@ class Manager
     /**
      * @var \Phinx\Migration\MigrationInterface[]
      */
-    protected $migrations = [];
+    protected $migrations;
 
     /**
      * @var \Phinx\Seed\SeedInterface[]
      */
-    protected $seeds = [];
+    protected $seeds;
 
     /**
      * @var \Psr\Container\ContainerInterface
@@ -1035,7 +1035,6 @@ public function toggleBreakpoint(string $environment, ?int $version): void
     protected function markBreakpoint(string $environment, ?int $version, int $mark): void
     {
         $migrations = $this->getMigrations($environment);
-        $this->getMigrations($environment);
         $env = $this->getEnvironment($environment);
         $versions = $env->getVersionLog();