From e997c6688c1ab653f1b9426e34259f01333d1d44 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Thu, 12 Oct 2023 20:23:35 +0200
Subject: [PATCH] Remove schema visitors (#11001)

---
 lib/Doctrine/ORM/Tools/SchemaTool.php | 11 -----------
 psalm.xml                             |  5 -----
 2 files changed, 16 deletions(-)

diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php
index a9fcc469590..13ce5ed6993 100644
--- a/lib/Doctrine/ORM/Tools/SchemaTool.php
+++ b/lib/Doctrine/ORM/Tools/SchemaTool.php
@@ -11,7 +11,6 @@
 use Doctrine\DBAL\Schema\Index;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
-use Doctrine\DBAL\Schema\Visitor\RemoveNamespacedAssets;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\AssociationMapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
@@ -33,13 +32,11 @@
 use function array_flip;
 use function array_intersect_key;
 use function assert;
-use function class_exists;
 use function count;
 use function current;
 use function implode;
 use function in_array;
 use function is_numeric;
-use function method_exists;
 use function strtolower;
 
 /**
@@ -381,14 +378,6 @@ public function getSchemaFromMetadata(array $classes): Schema
             }
         }
 
-        if (
-            ! $this->platform->supportsSchemas()
-            && class_exists(RemoveNamespacedAssets::class)
-            && method_exists($schema, 'visit')
-        ) {
-            $schema->visit(new RemoveNamespacedAssets());
-        }
-
         if ($eventManager->hasListeners(ToolEvents::postGenerateSchema)) {
             $eventManager->dispatchEvent(
                 ToolEvents::postGenerateSchema,
diff --git a/psalm.xml b/psalm.xml
index 87769df2ecc..13eeb8f5429 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -27,7 +27,6 @@
                 <!-- We wire the command as long as DBAL ships it -->
                 <referencedClass name="Doctrine\DBAL\Tools\Console\Command\ReservedWordsCommand" />
                 <!-- Remove on 3.0.x -->
-                <referencedClass name="Doctrine\DBAL\Schema\Visitor\RemoveNamespacedAssets"/>
                 <referencedClass name="Doctrine\ORM\Event\LifecycleEventArgs"/>
                 <referencedClass name="Doctrine\ORM\Exception\UnknownEntityNamespace"/>
                 <referencedClass name="Doctrine\ORM\Mapping\Driver\AnnotationDriver"/>
@@ -47,7 +46,6 @@
                 <!-- Remove on 3.0.x -->
                 <!-- Compatibility with DBAL 3 -->
                 <referencedMethod name="Doctrine\DBAL\Connection::getEventManager"/>
-                <referencedMethod name="Doctrine\DBAL\Schema\Schema::visit"/>
                 <file name="lib/Doctrine/ORM/Query/TreeWalkerChain.php"/>
             </errorLevel>
         </DeprecatedMethod>
@@ -196,9 +194,6 @@
             <errorLevel type="suppress">
                 <!-- Persistence 2 compatibility -->
                 <referencedClass name="Doctrine\Persistence\ObjectManagerAware"/>
-
-                <!-- See https://github.com/doctrine/dbal/pull/5432 -->
-                <referencedClass name="Doctrine\DBAL\Schema\Visitor\RemoveNamespacedAssets"/>
             </errorLevel>
         </UndefinedClass>
         <UndefinedMethod>