Merge pull request #654 from doctrine/3.7.x

Merge 3.7.x up into 3.8.x

Author: greg0ire

.github/workflows/coding-standards.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@13.0.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@13.1.0"

.github/workflows/composer-lint.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   composer-lint:
     name: "Composer Lint"
-    uses: "doctrine/.github/.github/workflows/composer-lint.yml@13.0.0"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@13.1.0"

.github/workflows/continuous-integration.yml

@@ -12,15 +12,15 @@ on:
 jobs:
   phpunit:
     name: "PHPUnit"
-    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@v12.2.0"
+    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@13.1.0"
     with:
       php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]'
     secrets:
       CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"
 
   phpunit-with-dev-deps:
     name: "PHPUnit with dev dependencies"
-    uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@13.0.0"
+    uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@13.1.0"
     with:
       symfony-version-constraint: "^7"
     secrets:

.github/workflows/static-analysis.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/phpstan.yml@13.0.0"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@13.1.0"

composer.json

@@ -25,11 +25,18 @@
     "homepage": "https://www.doctrine-project.org",
     "require": {
         "php": "^7.2 || ^8.0",
+        "doctrine/dbal": "^2 || ^3 || ^4",
         "doctrine/doctrine-bundle": "^2.4 || ^3.0",
         "doctrine/migrations": "^3.2",
+        "psr/log": "^1 || ^2 || ^3",
+        "symfony/config": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/console": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0 || ^8.0",
         "symfony/deprecation-contracts": "^2.1 || ^3",
         "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0",
-        "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0"
+        "symfony/http-foundation": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
+        "symfony/service-contracts": "^1.0 || ^2.0 || ^3.0"
     },
     "require-dev": {
         "composer/semver": "^3.0",

phpstan.neon.dist

@@ -1,6 +1,6 @@
 parameters:
     level: 7
-    phpVersion: 80400
+    phpVersion: 80500
     paths:
         - src
         - tests

src/EventListener/SchemaFilterListener.php

@@ -5,6 +5,7 @@
 namespace Doctrine\Bundle\MigrationsBundle\EventListener;
 
 use Doctrine\DBAL\Schema\AbstractAsset;
+use Doctrine\DBAL\Schema\AbstractNamedObject;
 use Doctrine\DBAL\Schema\Name\OptionallyQualifiedName;
 use Doctrine\ORM\Tools\Console\Command\SchemaTool\UpdateCommand;
 use Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand;
@@ -28,15 +29,17 @@ public function __construct(string $configurationTableName)
     /** @var bool */
     private $enabled = false;
 
-    /** @param AbstractAsset<OptionallyQualifiedName>|string $asset */
+    /** @param AbstractAsset<OptionallyQualifiedName>|AbstractNamedObject<OptionallyQualifiedName>|string $asset */
     public function __invoke($asset): bool
     {
         if (! $this->enabled) {
             return true;
         }
 
         if ($asset instanceof AbstractAsset) {
-            $asset = $asset->getName();
+            $asset = $asset instanceof AbstractNamedObject
+                ? $asset->getObjectName()->toString()
+                : $asset->getName();
         }
 
         return $asset !== $this->configurationTableName;