Merge pull request #95 from kaskadia/2.0

Upgrading to 2.2 in order to support L7. Fixing breaking changes.

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
   - 7.2
   - 7.3
+  - 7.4
 
 cache:
   directories:

composer.json

@@ -17,12 +17,12 @@
     }
   ],
   "require": {
-    "php": "^7.1",
-    "doctrine/migrations": "~1.8",
-    "illuminate/config": "^6.0",
-    "illuminate/contracts": "^6.0",
-    "illuminate/console": "^6.0",
-    "laravel-doctrine/orm": "^1.0"
+    "php": "^7.2",
+    "doctrine/migrations": "~2.2",
+    "illuminate/config": "^7.0",
+    "illuminate/contracts": "^7.0",
+    "illuminate/console": "^7.0",
+    "laravel-doctrine/orm": "^1.6"
   },
   "require-dev": {
     "phpunit/phpunit": "^8.0",

src/Configuration/Configuration.php

@@ -2,7 +2,7 @@
 
 namespace LaravelDoctrine\Migrations\Configuration;
 
-use Doctrine\DBAL\Migrations\Configuration\Configuration as MigrationsConfiguration;
+use Doctrine\Migrations\Configuration\Configuration as MigrationsConfiguration;
 use LaravelDoctrine\Migrations\Naming\NamingStrategy;
 
 class Configuration extends MigrationsConfiguration

src/Configuration/ConfigurationFactory.php

@@ -3,8 +3,10 @@
 namespace LaravelDoctrine\Migrations\Configuration;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\Migrations\Exception\MigrationException;
 use Illuminate\Config\Repository;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Contracts\Container\Container;
 use LaravelDoctrine\Migrations\Naming\DefaultNamingStrategy;
 
@@ -32,9 +34,11 @@ public function __construct(ConfigRepository $config, Container $container)
 
     /**
      * @param Connection $connection
-     * @param string     $name
+     * @param string $name
      *
      * @return Configuration
+     * @throws MigrationException
+     * @throws BindingResolutionException
      */
     public function make(Connection $connection, $name = null)
     {

src/Console/DiffCommand.php

@@ -3,7 +3,7 @@
 namespace LaravelDoctrine\Migrations\Console;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\DBAL\Migrations\Provider\OrmSchemaProvider;
+use Doctrine\Migrations\Provider\OrmSchemaProvider;
 use Doctrine\ORM\EntityManagerInterface;
 use Illuminate\Console\Command;
 use LaravelDoctrine\Migrations\Configuration\ConfigurationProvider;

src/Console/VersionCommand.php

@@ -2,7 +2,7 @@
 
 namespace LaravelDoctrine\Migrations\Console;
 
-use Doctrine\DBAL\Migrations\MigrationException;
+use Doctrine\Migrations\Exception\MigrationException;
 use Illuminate\Console\Command;
 use InvalidArgumentException;
 use LaravelDoctrine\Migrations\Configuration\Configuration;

src/Migration.php

@@ -2,7 +2,10 @@
 
 namespace LaravelDoctrine\Migrations;
 
-use Doctrine\DBAL\Migrations\Migration as DBALMigration;
+use Doctrine\Migrations\MigrationRepository;
+use Doctrine\Migrations\Migrator as DBALMigration;
+use Doctrine\Migrations\Version\Executor;
+use Doctrine\Migrations\Version\Factory;
 use LaravelDoctrine\Migrations\Configuration\Configuration;
 use LaravelDoctrine\Migrations\Exceptions\ExecutedUnavailableMigrationsException;
 use LaravelDoctrine\Migrations\Exceptions\MigrationVersionException;
@@ -44,7 +47,10 @@ public function __construct(Configuration $configuration, $version = 'latest')
      */
     protected function makeMigration(Configuration $configuration)
     {
-        return $this->migration = new DBALMigration($configuration);
+        $repository = $configuration->getDependencyFactory()->getMigrationRepository();
+        $outputWriter = $configuration->getOutputWriter();
+        $stopwatch = $configuration->getDependencyFactory()->getStopwatch();
+        return $this->migration = new DBALMigration($configuration, $repository, $outputWriter, $stopwatch);
     }
 
     /**

src/Migrator.php

@@ -2,7 +2,9 @@
 
 namespace LaravelDoctrine\Migrations;
 
-use Doctrine\DBAL\Migrations\Version;
+use Doctrine\Migrations\Exception\MigrationException;
+use Doctrine\Migrations\MigratorConfiguration;
+use Doctrine\Migrations\Version\Version;
 
 class Migrator
 {
@@ -11,20 +13,20 @@ class Migrator
      */
     protected $notes = [];
 
-    /**
-     * @param Migration  $migration
-     * @param bool|false $dryRun
-     * @param bool|false $timeQueries
-     * @param bool|false $allowNoMigration
-     */
+	/**
+	 * @param Migration $migration
+	 * @param bool|false $dryRun
+	 * @param bool|false $timeQueries
+	 * @param bool|false $allowNoMigration
+	 * @throws MigrationException
+	 */
     public function migrate(Migration $migration, $dryRun = false, $timeQueries = false, bool $allowNoMigration = false)
     {
-        $migration->getMigration()->setNoMigrationException($allowNoMigration);
+        $configuration = $this->setConfiguration($dryRun, $timeQueries, $allowNoMigration);
 
         $sql = $migration->getMigration()->migrate(
             $migration->getVersion(),
-            $dryRun,
-            $timeQueries
+            $configuration
         );
 
         $this->writeNotes($migration, $timeQueries, $sql);
@@ -38,7 +40,8 @@ public function migrate(Migration $migration, $dryRun = false, $timeQueries = fa
      */
     public function execute(Version $version, $direction, $dryRun = false, $timeQueries = false)
     {
-        $version->execute($direction, $dryRun, $timeQueries);
+        $configuration = $this->setConfiguration($dryRun, $timeQueries);
+        $version->execute($direction, $configuration);
 
         $verb = $direction === 'down' ? 'Rolled back' : 'Migrated';
 
@@ -119,4 +122,19 @@ protected function note($versionName, Version $version, $timeQueries = false, $v
 
         $this->notes[] = $msg;
     }
+
+    /**
+     * @param bool $dryRun
+     * @param bool $timeQueries
+     * @param bool $allowNoMigrations
+     * @return MigratorConfiguration
+     */
+    private function setConfiguration(bool $dryRun = false, bool $timeQueries = false, bool $allowNoMigrations = false)
+    {
+        $configuration = new MigratorConfiguration();
+        $configuration->setDryRun($dryRun);
+        $configuration->setTimeAllQueries($timeQueries);
+        $configuration->setNoMigrationException($allowNoMigrations);
+        return $configuration;
+    }
 }

src/Naming/DefaultNamingStrategy.php

@@ -2,8 +2,9 @@
 
 namespace LaravelDoctrine\Migrations\Naming;
 
-use Doctrine\DBAL\Migrations\Finder\MigrationFinderInterface;
-use Doctrine\DBAL\Migrations\Finder\RecursiveRegexFinder;
+use Doctrine\Migrations\Finder\MigrationDeepFinder;
+use Doctrine\Migrations\Finder\MigrationFinder;
+use Doctrine\Migrations\Finder\RecursiveRegexFinder;
 
 class DefaultNamingStrategy implements NamingStrategy
 {
@@ -30,7 +31,7 @@ public function getClassName($version = null)
     }
 
     /**
-     * @return MigrationFinderInterface
+     * @return MigrationDeepFinder
      */
     public function getFinder()
     {

src/Naming/NamingStrategy.php

@@ -2,7 +2,7 @@
 
 namespace LaravelDoctrine\Migrations\Naming;
 
-use Doctrine\DBAL\Migrations\Finder\MigrationFinderInterface;
+use Doctrine\Migrations\Finder\MigrationFinder;
 
 interface NamingStrategy
 {
@@ -21,7 +21,7 @@ public function getFilename($version = null);
     public function getClassName($version = null);
 
     /**
-     * @return MigrationFinderInterface
+     * @return MigrationFinder
      */
     public function getFinder();
 }

src/Output/SqlBuilder.php

@@ -2,18 +2,20 @@
 
 namespace LaravelDoctrine\Migrations\Output;
 
+use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Schema\Schema;
 use LaravelDoctrine\Migrations\Configuration\Configuration;
 
 class SqlBuilder
 {
-    /**
-     * @param Configuration $configuration
-     * @param Schema        $from
-     * @param Schema        $to
-     *
-     * @return string
-     */
+	/**
+	 * @param Configuration $configuration
+	 * @param Schema $from
+	 * @param Schema $to
+	 *
+	 * @return string
+	 * @throws DBALException
+	 */
     public function up(Configuration $configuration, Schema $from, Schema $to)
     {
         return $this->build(
@@ -22,13 +24,14 @@ public function up(Configuration $configuration, Schema $from, Schema $to)
         );
     }
 
-    /**
-     * @param Configuration $configuration
-     * @param Schema        $from
-     * @param Schema        $to
-     *
-     * @return string
-     */
+	/**
+	 * @param Configuration $configuration
+	 * @param Schema $from
+	 * @param Schema $to
+	 *
+	 * @return string
+	 * @throws DBALException
+	 */
     public function down(Configuration $configuration, Schema $from, Schema $to)
     {
         return $this->build(
@@ -37,12 +40,13 @@ public function down(Configuration $configuration, Schema $from, Schema $to)
         );
     }
 
-    /**
-     * @param Configuration $configuration
-     * @param array         $queries
-     *
-     * @return string
-     */
+	/**
+	 * @param Configuration $configuration
+	 * @param array $queries
+	 *
+	 * @return string
+	 * @throws DBALException
+	 */
     public function build(Configuration $configuration, array $queries = [])
     {
         $platform = $configuration->getConnection()->getDatabasePlatform()->getName();

src/Output/stubs/blank.stub

@@ -10,15 +10,15 @@ class <class> extends AbstractMigration
     /**
      * @param Schema $schema
      */
-    public function up(Schema $schema)
+    public function up(Schema $schema): void
     {
         <up>
     }
 
     /**
      * @param Schema $schema
      */
-    public function down(Schema $schema)
+    public function down(Schema $schema): void
     {
         <down>
     }

src/Output/stubs/create.stub

@@ -12,7 +12,7 @@ class <class> extends AbstractMigration
     /**
      * @param Schema $schema
      */
-    public function up(Schema $schema)
+    public function up(Schema $schema): void
     {
         (new Builder($schema))->create('<table>', function (Table $table) {
             $table->increments('id');
@@ -23,7 +23,7 @@ class <class> extends AbstractMigration
     /**
      * @param Schema $schema
      */
-    public function down(Schema $schema)
+    public function down(Schema $schema): void
     {
         (new Builder($schema))->drop('<table>');
     }

src/Output/stubs/update.stub

@@ -12,7 +12,7 @@ class <class> extends AbstractMigration
     /**
      * @param Schema $schema
      */
-    public function up(Schema $schema)
+    public function up(Schema $schema): void
     {
         (new Builder($schema))->table('<table>', function (Table $table) {
             //
@@ -22,7 +22,7 @@ class <class> extends AbstractMigration
     /**
      * @param Schema $schema
      */
-    public function down(Schema $schema)
+    public function down(Schema $schema): void
     {
         (new Builder($schema))->table('<table>', function (Table $table) {
             //