Add nette/di 3.1 and 3.2 support

- 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

Author: JanTvrdik

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]);
@@ -445,14 +447,6 @@ private function createSymfonyCommandDefinitions($driver, $configuration, $print
 
 	private function filterArguments(array $arguments): array
 	{
-		if (method_exists(Nette\DI\Helpers::class, 'filterArguments')) {
-			return Nette\DI\Helpers::filterArguments($arguments);
-
-		} elseif (method_exists(Nette\DI\Compiler::class, 'filterArguments')) {
-			return Nette\DI\Compiler::filterArguments($arguments);
-
-		} else {
-			throw new Nextras\Migrations\LogicException();
-		}
+		return Nette\DI\Helpers::filterArguments($arguments);
 	}
 }

tests/cases/integration/nette-di/MigrationsExtension.configB.neon

@@ -4,7 +4,7 @@ extensions:
 migrations:
 	dir: migrations
 	driver: mysql
-	dbal: Nextras\Migrations\Bridges\Dibi\DibiAdapter(...)
+	dbal: Nextras\Migrations\Bridges\Dibi\DibiAdapter(_)
 
 services:
 	- Dibi\Connection(%dibiConfig%)

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

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

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

tests/cases/integration/nette-di/MigrationsExtension.configF.neon

@@ -4,7 +4,7 @@ extensions:
 migrations:
 	dir: migrations
 	dbal: dibi
-	driver: Nextras\Migrations\Drivers\MySqlDriver(..., m)
+	driver: Nextras\Migrations\Drivers\MySqlDriver(_, m)
 
 services:
 	- Dibi\Connection(%dibiConfig%)

tests/cases/integration/nette-di/MigrationsExtension.diffGenerator.configA.neon

@@ -8,6 +8,8 @@ migrations:
 	diffGenerator: doctrine
 
 services:
-	- Doctrine\ORM\Tools\Setup::createXMLMetadataConfiguration([%doctrineDir%], true)
+	- Doctrine\ORM\ORMSetup::createXMLMetadataConfiguration([%doctrineDir%], true)
 	- Doctrine\DBAL\DriverManager::getConnection(%doctrineConfig%, @Doctrine\ORM\Configuration)
-	- Doctrine\ORM\EntityManager::create(@Doctrine\DBAL\Connection, @Doctrine\ORM\Configuration)
+	-
+		type: Doctrine\ORM\EntityManagerInterface
+		factory: Doctrine\ORM\EntityManager::create(@Doctrine\DBAL\Connection, @Doctrine\ORM\Configuration)

tests/cases/integration/nette-di/MigrationsExtension.diffGenerator.configB.neon

@@ -7,6 +7,8 @@ migrations:
 	driver: mysql
 
 services:
-	- Doctrine\ORM\Tools\Setup::createXMLMetadataConfiguration([%doctrineDir%], true)
+	- Doctrine\ORM\ORMSetup::createXMLMetadataConfiguration([%doctrineDir%], true)
 	- Doctrine\DBAL\DriverManager::getConnection(%doctrineConfig%, @Doctrine\ORM\Configuration)
-	- Doctrine\ORM\EntityManager::create(@Doctrine\DBAL\Connection, @Doctrine\ORM\Configuration)
+	-
+		type: Doctrine\ORM\EntityManagerInterface
+		factory: Doctrine\ORM\EntityManager::create(@Doctrine\DBAL\Connection, @Doctrine\ORM\Configuration)

tests/cases/integration/nette-di/MigrationsExtension.phpt

@@ -73,10 +73,6 @@ class MigrationsExtensionTest extends TestCase
 
 	public function testDynamicContainerParameters(): void
 	{
-		if (!method_exists(Nette\DI\Compiler::class, 'setDynamicParameterNames')) {
-			Environment::skip('Required Nette >= 2.4.7');
-		}
-
 		$container = $this->createContainer('dynamicParameters', [
 			'rootDir' => '__rootDir__',
 		]);

tests/matrix/nette-di/nette-3.0.sh

@@ -6,4 +6,5 @@ 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/cache:*"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:*"