Add nette/di 3.1 and 3.2 support

JanTvrdik · JanTvrdik · commit b18dbdca3e0a · 2026-02-24T20:46:10.000+01:00
- Fix MigrationsExtension to accept Nette\DI\Statement for dynamic
  container parameters (nette/di 3.1+ uses Statement instead of
  PhpLiteral for dynamic parameters)
- Return service reference strings instead of ServiceDefinition objects
  from definition methods (required for nette/di 3.2 compatibility)
- Suppress E_USER_DEPRECATED during container compilation in tests to
  handle deprecation notices from nette/di and doctrine/orm
- Replace deprecated `(...)` syntax with autowiring-compatible
  alternatives in test config files
- Add nette-3.1.sh (PHP 8.0-8.3) and nette-3.2.sh (PHP 8.1-8.4)
  matrix files
diff --git a/src/Bridges/NetteDI/MigrationsExtension.php b/src/Bridges/NetteDI/MigrationsExtension.php
@@ -89,7 +89,7 @@ public function loadConfiguration(): void
 
 		// groups
 		if ($config['groups'] === null) {
-			Validators::assertField($config, 'dir', 'string|Nette\PhpGenerator\PhpLiteral');
+			Validators::assertField($config, 'dir', 'string|Nette\PhpGenerator\PhpLiteral|Nette\DI\Statement');
 			Validators::assertField($config, 'withDummyData', 'bool');
 			$config['groups'] = $this->createDefaultGroupConfiguration($config['dir'], $config['withDummyData']);
 		}
@@ -164,18 +164,19 @@ public function beforeCompile(): void
 
 	/**
 	 * @param  null|string|Statement $dbal
-	 * @return string|ServiceDefinition
 	 */
-	private function getDbalDefinition($dbal)
+	private function getDbalDefinition($dbal): string
 	{
 		$factory = $this->getDbalFactory($dbal);
 
 		if ($factory) {
-			return $this->getContainerBuilder()
+			$this->getContainerBuilder()
 				->addDefinition($this->prefix('dbal'))
 				->setType(Nextras\Migrations\IDbal::class)
 				->setFactory($factory);
 
+			return '@' . $this->prefix('dbal');
+
 		} elseif ($dbal === null) {
 			return '@Nextras\Migrations\IDbal';
 
@@ -207,20 +208,20 @@ private function getDbalFactory($dbal)
 
 
 	/**
-	 * @param  null|string|Statement    $driver
-	 * @param  string|ServiceDefinition $dbal
-	 * @return string|ServiceDefinition
+	 * @param  null|string|Statement $driver
 	 */
-	private function getDriverDefinition($driver, $dbal)
+	private function getDriverDefinition($driver, string $dbal): string
 	{
 		$factory = $this->getDriverFactory($driver, $dbal);
 
 		if ($factory) {
-			return $this->getContainerBuilder()
+			$this->getContainerBuilder()
 				->addDefinition($this->prefix('driver'))
 				->setType(Nextras\Migrations\IDriver::class)
 				->setFactory($factory);
 
+			return '@' . $this->prefix('driver');
+
 		} elseif ($driver === null) {
 			return '@Nextras\Migrations\IDriver';
 
@@ -231,11 +232,10 @@ private function getDriverDefinition($driver, $dbal)
 
 
 	/**
-	 * @param  null|string|Statement    $driver
-	 * @param  string|ServiceDefinition $dbal
+	 * @param  null|string|Statement $driver
 	 * @return string|Statement|null
 	 */
-	private function getDriverFactory($driver, $dbal)
+	private function getDriverFactory($driver, string $dbal)
 	{
 		if ($driver instanceof Statement) {
 			return $this->filterArguments([$driver])[0];
@@ -251,18 +251,19 @@ private function getDriverFactory($driver, $dbal)
 
 	/**
 	 * @param  null|string|Statement $printer
-	 * @return string|ServiceDefinition
 	 */
-	private function getPrinterDefinition($printer)
+	private function getPrinterDefinition($printer): string
 	{
 		$factory = $this->getPrinterFactory($printer);
 
 		if ($factory) {
-			return $this->getContainerBuilder()
+			$this->getContainerBuilder()
 				->addDefinition($this->prefix('printer'))
 				->setType(Nextras\Migrations\IPrinter::class)
 				->setFactory($factory);
 
+			return '@' . $this->prefix('printer');
+
 		} elseif ($printer === null) {
 			return '@Nextras\Migrations\IPrinter';
 
@@ -294,12 +295,17 @@ private function getPrinterFactory($printer)
 
 
 	/**
-	 * @param  string|Nette\PhpGenerator\PhpLiteral $dir
+	 * @param  string|Nette\PhpGenerator\PhpLiteral|Statement $dir
 	 * @return array<string, array{enabled?: bool, directory: string, dependencies?: list<string>, generator?: ServiceDefinition|null}>
 	 */
 	private function createDefaultGroupConfiguration($dir, bool $withDummyData): array
 	{
-		if ($dir instanceof Nette\PhpGenerator\PhpLiteral) {
+		if ($dir instanceof Statement) {
+			$append = function (string $path) use ($dir): Statement {
+				return new Statement('? . ?', [$dir, $path]);
+			};
+
+		} elseif ($dir instanceof Nette\PhpGenerator\PhpLiteral) {
 			$append = function (string $path) use ($dir): Nette\PhpGenerator\PhpLiteral {
 				return ContainerBuilder::literal('? . ?', [$dir, $path]);
 			};
@@ -347,7 +353,7 @@ private function createGroupDefinitions(array $groups): array
 		$groupDefinitions = [];
 
 		foreach ($groups as $groupName => $groupConfig) {
-			Validators::assertField($groupConfig, 'directory', 'string|Nette\PhpGenerator\PhpLiteral');
+			Validators::assertField($groupConfig, 'directory', 'string|Nette\PhpGenerator\PhpLiteral|Nette\DI\Statement');
 
 			$enabled = isset($groupConfig['enabled']) ? $groupConfig['enabled'] : true;
 			$directory = $groupConfig['directory'];
@@ -371,11 +377,10 @@ private function createGroupDefinitions(array $groups): array
 
 
 	/**
-	 * @param  string|ServiceDefinition $driver
-	 * @param  array<string, mixed>     $phpParams
+	 * @param  array<string, mixed> $phpParams
 	 * @return list<ServiceDefinition>
 	 */
-	private function createExtensionHandlerDefinitions($driver, array $phpParams): array
+	private function createExtensionHandlerDefinitions(string $driver, array $phpParams): array
 	{
 		$builder = $this->getContainerBuilder();
 
@@ -395,12 +400,14 @@ private function createExtensionHandlerDefinitions($driver, array $phpParams): a
 	}
 
 
-	private function createConfigurationDefinition(): ServiceDefinition
+	private function createConfigurationDefinition(): string
 	{
-		return $this->getContainerBuilder()
+		$this->getContainerBuilder()
 			->addDefinition($this->prefix('configuration'))
 			->setType(Nextras\Migrations\IConfiguration::class)
 			->setFactory(Nextras\Migrations\Configurations\Configuration::class);
+
+		return '@' . $this->prefix('configuration');
 	}
 
 
@@ -416,12 +423,7 @@ private function createDoctrineStructureDiffGeneratorDefinition(?string $ignored
 	}
 
 
-	/**
-	 * @param  string|ServiceDefinition $driver
-	 * @param  string|ServiceDefinition $configuration
-	 * @param  string|ServiceDefinition $printer
-	 */
-	private function createSymfonyCommandDefinitions($driver, $configuration, $printer): void
+	private function createSymfonyCommandDefinitions(string $driver, string $configuration, string $printer): void
 	{
 		$builder = $this->getContainerBuilder();
 		$builder->addExcludedClasses([Nextras\Migrations\Bridges\SymfonyConsole\BaseCommand::class]);
diff --git a/tests/cases/integration/nette-di/MigrationsExtension.configC.neon b/tests/cases/integration/nette-di/MigrationsExtension.configC.neon
@@ -7,4 +7,4 @@ migrations:
 
 services:
 	- Dibi\Connection(%dibiConfig%)
-	- Nextras\Migrations\Bridges\Dibi\DibiAdapter(...)
+	- Nextras\Migrations\Bridges\Dibi\DibiAdapter
diff --git a/tests/cases/integration/nette-di/MigrationsExtension.configD.neon b/tests/cases/integration/nette-di/MigrationsExtension.configD.neon
@@ -3,8 +3,8 @@ extensions:
 
 migrations:
 	dir: migrations
-	driver: Nextras\Migrations\Drivers\MySqlDriver(...)
+	driver: Nextras\Migrations\Drivers\MySqlDriver(@Nextras\Migrations\IDbal)
 
 services:
 	- Dibi\Connection(%dibiConfig%)
-	- Nextras\Migrations\Bridges\Dibi\DibiAdapter(...)
+	- Nextras\Migrations\Bridges\Dibi\DibiAdapter
diff --git a/tests/cases/integration/nette-di/MigrationsExtension.configE.neon b/tests/cases/integration/nette-di/MigrationsExtension.configE.neon
@@ -7,4 +7,4 @@ migrations:
 services:
 	- Dibi\Connection(%dibiConfig%)
 	- Nextras\Migrations\Drivers\MySqlDriver
-	- Nextras\Migrations\Bridges\Dibi\DibiAdapter(...)
+	- Nextras\Migrations\Bridges\Dibi\DibiAdapter
diff --git a/tests/cases/integration/nette-di/MigrationsExtension.phpt b/tests/cases/integration/nette-di/MigrationsExtension.phpt
@@ -135,23 +135,28 @@ class MigrationsExtensionTest extends TestCase
 
 		$loader = new Nette\DI\ContainerLoader(TEMP_DIR);
 		$key = __FILE__ . ':' . __LINE__ . ':' . $config;
-		$className = $loader->load(
-			function (Nette\DI\Compiler $compiler) use ($config, $dibiConfig, $doctrineConfig, $dynamicParameters) {
-				$compiler->addExtension('extensions', new Nette\DI\Extensions\ExtensionsExtension());
-				$compiler->addConfig([
-					'parameters' => [
-						'dibiConfig' => $dibiConfig,
-						'doctrineConfig' => $doctrineConfig,
-						'doctrineDir' => __DIR__ . '/../../../fixtures/doctrine',
-					]
-				]);
-				$compiler->loadConfig(__DIR__ . "/MigrationsExtension.$config.neon");
-				if ($dynamicParameters !== null) {
-					$compiler->setDynamicParameterNames(array_keys($dynamicParameters));
-				}
-			},
-			$key
-		);
+		$previousLevel = error_reporting(E_ALL & ~E_USER_DEPRECATED);
+		try {
+			$className = $loader->load(
+				function (Nette\DI\Compiler $compiler) use ($config, $dibiConfig, $doctrineConfig, $dynamicParameters) {
+					$compiler->addExtension('extensions', new Nette\DI\Extensions\ExtensionsExtension());
+					$compiler->addConfig([
+						'parameters' => [
+							'dibiConfig' => $dibiConfig,
+							'doctrineConfig' => $doctrineConfig,
+							'doctrineDir' => __DIR__ . '/../../../fixtures/doctrine',
+						]
+					]);
+					$compiler->loadConfig(__DIR__ . "/MigrationsExtension.$config.neon");
+					if ($dynamicParameters !== null) {
+						$compiler->setDynamicParameterNames(array_keys($dynamicParameters));
+					}
+				},
+				$key
+			);
+		} finally {
+			error_reporting($previousLevel);
+		}
 
 		return new $className($dynamicParameters ?: []);
 	}
diff --git a/tests/matrix/nette-di/nette-3.1.sh b/tests/matrix/nette-di/nette-3.1.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+PHP_VERSION_MIN="80000"
+PHP_VERSION_MAX="80399"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/di:3.1.*"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:*"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:^2.13|^3.0"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:^2.11"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/cache:^1.11"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:*"
diff --git a/tests/matrix/nette-di/nette-3.2.sh b/tests/matrix/nette-di/nette-3.2.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+PHP_VERSION_MIN="80100"
+PHP_VERSION_MAX="80499"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/di:3.2.*"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:*"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:^2.13|^3.0"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:^2.11"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/cache:^1.11"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:*"
