Add injects into migrations

src/DI/DependencyFactory.php

@@ -8,8 +8,10 @@
 use Doctrine\Migrations\Configuration\EntityManager\ExistingEntityManager;
 use Doctrine\Migrations\Configuration\Migration\ExistingConfiguration;
 use Doctrine\Migrations\DependencyFactory as MigrationsDependencyFactory;
+use Doctrine\Migrations\Version\MigrationFactory;
 use Doctrine\ORM\EntityManagerInterface;
 use Nette\DI\ServiceCreationException;
+use Nettrine\Migrations\Version\DbalMigrationFactory;
 use Psr\Log\LoggerInterface;
 
 class DependencyFactory
@@ -27,31 +29,37 @@ class DependencyFactory
 	/** @var LoggerInterface|null */
 	private $logger;
 
-	public function __construct(Configuration $configuration, ?Connection $connection = null, ?EntityManagerInterface $entityManager = null, ?LoggerInterface $logger = null)
+	/** @var DbalMigrationFactory */
+	private $migrationFactory;
+
+	public function __construct(Configuration $configuration, DbalMigrationFactory $migrationFactory, ?Connection $connection = null, ?EntityManagerInterface $entityManager = null, ?LoggerInterface $logger = null)
 	{
 		$this->configuration = $configuration;
 		$this->connection = $connection;
 		$this->entityManager = $entityManager;
 		$this->logger = $logger;
+		$this->migrationFactory = $migrationFactory;
 	}
 
 	public function createDependencyFactory(): MigrationsDependencyFactory
 	{
 		if ($this->entityManager !== null) {
-			return MigrationsDependencyFactory::fromEntityManager(new ExistingConfiguration($this->configuration), new ExistingEntityManager($this->entityManager), $this->logger);
+			$dependencyFactory = MigrationsDependencyFactory::fromEntityManager(new ExistingConfiguration($this->configuration), new ExistingEntityManager($this->entityManager), $this->logger);
+		} elseif ($this->connection !== null) {
+			$dependencyFactory = MigrationsDependencyFactory::fromConnection(new ExistingConfiguration($this->configuration), new ExistingConnection($this->connection), $this->logger);
+		} else {
+			throw new ServiceCreationException(
+				sprintf(
+					'Either service of type %s or %s needs to be registered for Doctrine migrations to work properly',
+					Connection::class,
+					EntityManagerInterface::class
+				)
+			);
 		}
 
-		if ($this->connection !== null) {
-			return MigrationsDependencyFactory::fromConnection(new ExistingConfiguration($this->configuration), new ExistingConnection($this->connection), $this->logger);
-		}
+		$dependencyFactory->setService(MigrationFactory::class, $this->migrationFactory);
 
-		throw new ServiceCreationException(
-			sprintf(
-				'Either service of type %s or %s needs to be registered for Doctrine migrations to work properly',
-				Connection::class,
-				EntityManagerInterface::class
-			)
-		);
+		return $dependencyFactory;
 	}
 
 }

src/DI/MigrationsExtension.php

@@ -15,6 +15,7 @@
 use Nette\DI\CompilerExtension;
 use Nette\Schema\Expect;
 use Nette\Schema\Schema;
+use Nettrine\Migrations\Version\DbalMigrationFactory;
 use stdClass;
 
 /**
@@ -64,6 +65,9 @@ public function loadConfiguration(): void
 			$configuration->addSetup('setMigrationsAreOrganizedByYearAndMonth');
 		}
 
+		$builder->addDefinition($this->prefix('migrationFactory'))
+			->setFactory(DbalMigrationFactory::class);
+
 		$builder->addDefinition($this->prefix('nettrineDependencyFactory'))
 			->setFactory(DependencyFactory::class)
 			->setAutowired(false);

src/Version/DbalMigrationFactory.php

@@ -0,0 +1,47 @@
+<?php declare(strict_types = 1);
+
+namespace Nettrine\Migrations\Version;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\Migrations\AbstractMigration;
+use Doctrine\Migrations\Version\MigrationFactory;
+use Nette\DI\Container;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
+
+class DbalMigrationFactory implements MigrationFactory
+{
+
+	/** @var Container */
+	private $container;
+
+	/** @var Connection */
+	private $connection;
+
+	/** @var LoggerInterface */
+	private $logger;
+
+	public function __construct(Container $container, Connection $connection, ?LoggerInterface $logger = null)
+	{
+		$this->container = $container;
+		$this->connection = $connection;
+		if ($logger === null) {
+			$this->logger = new NullLogger();
+		} else {
+			$this->logger = $logger;
+		}
+	}
+
+	public function createVersion(string $migrationClassName): AbstractMigration
+	{
+		$migration = new $migrationClassName(
+			$this->connection,
+			$this->logger
+		);
+
+		$this->container->callInjects($migration);
+
+		return $migration;
+	}
+
+}

tests/cases/Unit/DI/MigrationsExtensionTest.php

@@ -9,6 +9,7 @@
 use Nette\DI\Container;
 use Nette\DI\ContainerLoader;
 use Nettrine\Migrations\DI\MigrationsExtension;
+use Nettrine\Migrations\Version\DbalMigrationFactory;
 use Symfony\Component\Console\Application;
 use Tester\Assert;
 use Tester\TestCase;
@@ -116,7 +117,10 @@ public function testDependencyFactory(): void
 		/** @var Container $container */
 		$container = new $class();
 
-		Assert::type(DependencyFactory::class, $container->getByType(DependencyFactory::class));
+		/** @var DependencyFactory $dependencyFactory */
+		$dependencyFactory = $container->getByType(DependencyFactory::class);
+		Assert::type(DependencyFactory::class, $dependencyFactory);
+		Assert::type(DbalMigrationFactory::class, $dependencyFactory->getMigrationFactory());
 	}
 
 }