From 7f45928c36aca4058df0ef5a095dc05cc6373f16 Mon Sep 17 00:00:00 2001 From: Christoffer Lindahl Date: Tue, 19 Oct 2021 13:51:47 +0200 Subject: [PATCH 1/3] Fix assert for configuration helper in AbstractCommand, assert interface instead of internal implementation. Regression from ef842cfb1944606148159e724d8ae7e7845cf4b0 Fixes #1115 --- .../Migrations/Tools/Console/Command/AbstractCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/AbstractCommand.php b/lib/Doctrine/Migrations/Tools/Console/Command/AbstractCommand.php index 4479d878ab..441b1d34e7 100644 --- a/lib/Doctrine/Migrations/Tools/Console/Command/AbstractCommand.php +++ b/lib/Doctrine/Migrations/Tools/Console/Command/AbstractCommand.php @@ -116,7 +116,7 @@ protected function getMigrationConfiguration( $helperSet = $this->getHelperSet(); assert($helperSet !== null); $configHelper = $helperSet->get('configuration'); - assert($configHelper instanceof ConfigurationHelper); + assert($configHelper instanceof ConfigurationHelperInterface); } else { $configHelper = new ConfigurationHelper( $this->getConnection($input), From c18ba60bc045d98a892c79871ebf6420ee33f039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 19 Oct 2021 21:48:48 +0200 Subject: [PATCH 2/3] Fix phpstan findings --- .../Migrations/Configuration/AbstractFileConfiguration.php | 2 +- .../Doctrine/Migrations/Tests/Provider/ClassMetadataFactory.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/Migrations/Configuration/AbstractFileConfiguration.php b/lib/Doctrine/Migrations/Configuration/AbstractFileConfiguration.php index 129b4dcb8a..b4d628aece 100644 --- a/lib/Doctrine/Migrations/Configuration/AbstractFileConfiguration.php +++ b/lib/Doctrine/Migrations/Configuration/AbstractFileConfiguration.php @@ -96,7 +96,7 @@ protected function setConfiguration(array $config): void { foreach ($config as $configurationKey => $configurationValue) { if (! in_array($configurationKey, self::ALLOWED_CONFIGURATION_KEYS, true)) { - throw InvalidConfigurationKey::new($configurationKey); + throw InvalidConfigurationKey::new((string) $configurationKey); } } diff --git a/tests/Doctrine/Migrations/Tests/Provider/ClassMetadataFactory.php b/tests/Doctrine/Migrations/Tests/Provider/ClassMetadataFactory.php index ef40f36dda..e33be4a72b 100644 --- a/tests/Doctrine/Migrations/Tests/Provider/ClassMetadataFactory.php +++ b/tests/Doctrine/Migrations/Tests/Provider/ClassMetadataFactory.php @@ -12,7 +12,7 @@ class ClassMetadataFactory extends BaseMetadataFactoryAlias { /** - * @return ClassMetadata[] + * @return list> */ public function getAllMetadata(): array { From ffc465126b0ac493f7cd9d425b7f2a76b0d19318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 19 Oct 2021 21:51:57 +0200 Subject: [PATCH 3/3] Require symfony/cache in dev It is needed in order to run functional tests. --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 1fdf4a4b3f..a154ef88fe 100644 --- a/composer.json +++ b/composer.json @@ -29,6 +29,7 @@ "phpstan/phpstan-phpunit": "^0.12", "phpstan/phpstan-strict-rules": "^0.12", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4", + "symfony/cache": "^4.4. || ^5.3", "symfony/process": "^3.4||^4.0||^5.0", "symfony/yaml": "^3.4||^4.0||^5.0" },