Merge branch '2.12.x' into 2.13.x

* 2.12.x: PHPStan 1.6.1 (doctrine#9688) Drop SymfonyStyle[listing] for sqls (doctrine#9679)
derrabus · Apr 27, 2022 · 825e964 · 825e964
2 parents 5fbe5eb + 0846b8b
commit 825e964
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
         "doctrine/annotations": "^1.13",
         "doctrine/coding-standard": "^9.0",
         "phpbench/phpbench": "^0.16.10 || ^1.0",
-        "phpstan/phpstan": "~1.4.10 || 1.6.0",
+        "phpstan/phpstan": "~1.4.10 || 1.6.1",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.6.2",

diff --git a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php
@@ -90,7 +90,9 @@ protected function executeSchemaCommand(InputInterface $input, OutputInterface $
         if ($dumpSql) {
             $ui->text('The following SQL statements will be executed:');
             $ui->newLine();
-            $ui->listing($sqls);
+            foreach ($sqls as $sql) {
+                $ui->text(sprintf('    %s;', $sql));
+            }
         }
 
         if ($force) {

diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ValidateSchemaCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ValidateSchemaCommand.php
@@ -81,7 +81,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
                 $sqls = $validator->getUpdateSchemaList();
                 $ui->comment(sprintf('<info>%d</info> schema diff(s) detected:', count($sqls)));
-                $ui->listing($sqls);
+                foreach ($sqls as $sql) {
+                    $ui->text(sprintf('    %s;', $sql));
+                }
             }
 
             $exit += 2;

diff --git a/phpstan-dbal2.neon b/phpstan-dbal2.neon
@@ -55,8 +55,3 @@ parameters:
         -
             message: '#^Call to method injectObjectManager\(\) on an unknown class Doctrine\\Persistence\\ObjectManagerAware\.$#'
             path: lib/Doctrine/ORM/UnitOfWork.php
-
-        # See https://github.com/phpstan/phpstan/issues/7096
-        -
-            message: '#^Method Doctrine\\ORM\\Mapping\\ReflectionEnumProperty\:\:initializeEnumValue\(\) should return BackedEnum but returns static\.$#'
-            path: lib/Doctrine/ORM/Mapping/ReflectionEnumProperty.php
diff --git a/phpstan-persistence2.neon b/phpstan-persistence2.neon
@@ -52,8 +52,3 @@ parameters:
         -
             message: "#^Return type \\(Doctrine\\\\ORM\\\\Mapping\\\\Driver\\\\AttributeReader\\) of method Doctrine\\\\ORM\\\\Mapping\\\\Driver\\\\AttributeDriver\\:\\:getReader\\(\\) should be compatible with return type \\(Doctrine\\\\Common\\\\Annotations\\\\Reader\\) of method Doctrine\\\\Persistence\\\\Mapping\\\\Driver\\\\AnnotationDriver\\:\\:getReader\\(\\)$#"
             path: lib/Doctrine/ORM/Mapping/Driver/AttributeDriver.php
-
-        # See https://github.com/phpstan/phpstan/issues/7096
-        -
-            message: '#^Method Doctrine\\ORM\\Mapping\\ReflectionEnumProperty\:\:initializeEnumValue\(\) should return BackedEnum but returns static\.$#'
-            path: lib/Doctrine/ORM/Mapping/ReflectionEnumProperty.php
diff --git a/phpstan.neon b/phpstan.neon
@@ -52,8 +52,3 @@ parameters:
         -
             message: '#^Call to method injectObjectManager\(\) on an unknown class Doctrine\\Persistence\\ObjectManagerAware\.$#'
             path: lib/Doctrine/ORM/UnitOfWork.php
-
-        # See https://github.com/phpstan/phpstan/issues/7096
-        -
-            message: '#^Method Doctrine\\ORM\\Mapping\\ReflectionEnumProperty\:\:initializeEnumValue\(\) should return BackedEnum but returns static\.$#'
-            path: lib/Doctrine/ORM/Mapping/ReflectionEnumProperty.php