Merge pull request doctrine#1904 from doctrine/2.15.x-merge-up-into-2.16.x_u10LPM9L

greg0ire · web-flow · commit 820d5740eeb9 · 2025-08-01T20:33:32.000+02:00
Merge release 2.15.1 into 2.16.x
diff --git a/docs/en/configuration.rst b/docs/en/configuration.rst
@@ -27,6 +27,7 @@ Configuration Reference
                         # RDBMS specific; Refer to the manual of your RDBMS for more information
                         charset:              ~
 
+                        # Adds the given suffix to the configured database name, this option has no effects for the SQLite platform
                         dbname_suffix:        ~
 
                         # SQLite specific
@@ -151,6 +152,8 @@ Configuration Reference
                                 user:                 root
                                 password:             ~
                                 charset:              ~
+
+                                # Adds the given suffix to the configured database name, this option has no effects for the SQLite platform
                                 dbname_suffix:        ~
                                 path:                 ~
                                 memory:               ~
@@ -451,6 +454,7 @@ Configuration Reference
                         <doctrine:default-table-option name="engine">InnoDB</doctrine:default-table-option>
 
                         <!-- example -->
+                        <!-- dbname_suffix: Adds the given suffix to the configured database name, this option has no effects for the SQLite platform -->
                         <!-- unix-socket: The unix socket to use for MySQL -->
                         <!-- persistent: True to use as persistent connection for the ibm_db2 driver -->
                         <!-- protocol: The protocol to use for the ibm_db2 driver (default to TCPIP if omitted) -->
diff --git a/src/Command/CreateDatabaseDoctrineCommand.php b/src/Command/CreateDatabaseDoctrineCommand.php
@@ -25,7 +25,7 @@ protected function configure(): void
         $this
             ->setName('doctrine:database:create')
             ->setDescription('Creates the configured database')
-            ->addOption('connection', 'c', InputOption::VALUE_OPTIONAL, 'The connection to use for this command')
+            ->addOption('connection', 'c', InputOption::VALUE_REQUIRED, 'The connection to use for this command')
             ->addOption('if-not-exists', null, InputOption::VALUE_NONE, 'Don\'t trigger an error, when the database already exists')
             ->setHelp(<<<'EOT'
 The <info>%command.name%</info> command creates the default connections database:
diff --git a/src/Command/DropDatabaseDoctrineCommand.php b/src/Command/DropDatabaseDoctrineCommand.php
@@ -33,7 +33,7 @@ protected function configure()
         $this
             ->setName('doctrine:database:drop')
             ->setDescription('Drops the configured database')
-            ->addOption('connection', 'c', InputOption::VALUE_OPTIONAL, 'The connection to use for this command')
+            ->addOption('connection', 'c', InputOption::VALUE_REQUIRED, 'The connection to use for this command')
             ->addOption('if-exists', null, InputOption::VALUE_NONE, 'Don\'t trigger an error, when the database doesn\'t exist')
             ->addOption('force', 'f', InputOption::VALUE_NONE, 'Set this parameter to execute this action')
             ->setHelp(<<<'EOT'
diff --git a/src/Command/ImportMappingDoctrineCommand.php b/src/Command/ImportMappingDoctrineCommand.php
@@ -46,7 +46,7 @@ protected function configure(): void
             ->setName('doctrine:mapping:import')
             ->addArgument('name', InputArgument::REQUIRED, 'The bundle or namespace to import the mapping information to')
             ->addArgument('mapping-type', InputArgument::OPTIONAL, 'The mapping type to export the imported mapping information to')
-            ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command')
+            ->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command')
             ->addOption('filter', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'A string pattern used to match entities that should be mapped.')
             ->addOption('force', null, InputOption::VALUE_NONE, 'Force to overwrite existing mapping files.')
             ->addOption('path', null, InputOption::VALUE_REQUIRED, 'The path where the files would be generated (not used when a bundle is passed).')
diff --git a/src/Command/Proxy/ClearMetadataCacheDoctrineCommand.php b/src/Command/Proxy/ClearMetadataCacheDoctrineCommand.php
@@ -26,6 +26,6 @@ protected function configure(): void
             return;
         }
 
-        $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
+        $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');
     }
 }
diff --git a/src/Command/Proxy/ClearQueryCacheDoctrineCommand.php b/src/Command/Proxy/ClearQueryCacheDoctrineCommand.php
@@ -26,6 +26,6 @@ protected function configure(): void
             return;
         }
 
-        $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
+        $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');
     }
 }
diff --git a/src/Command/Proxy/ClearResultCacheDoctrineCommand.php b/src/Command/Proxy/ClearResultCacheDoctrineCommand.php
@@ -26,6 +26,6 @@ protected function configure(): void
             return;
         }
 
-        $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
+        $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');
     }
 }
diff --git a/src/Command/Proxy/CollectionRegionDoctrineCommand.php b/src/Command/Proxy/CollectionRegionDoctrineCommand.php
@@ -25,6 +25,6 @@ protected function configure(): void
             return;
         }
 
-        $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
+        $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');
     }
 }
diff --git a/src/Command/Proxy/ConvertMappingDoctrineCommand.php b/src/Command/Proxy/ConvertMappingDoctrineCommand.php
@@ -34,7 +34,7 @@ protected function configure()
             return;
         }
 
-        $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
+        $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');
     }
 
     /**
diff --git a/src/Command/Proxy/CreateSchemaDoctrineCommand.php b/src/Command/Proxy/CreateSchemaDoctrineCommand.php
@@ -27,6 +27,6 @@ protected function configure(): void
             return;
         }
 
-        $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
+        $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');
     }
 }
diff --git a/src/Command/Proxy/DropSchemaDoctrineCommand.php b/src/Command/Proxy/DropSchemaDoctrineCommand.php
@@ -26,6 +26,6 @@ protected function configure(): void
             return;
         }
 
-        $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
+        $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');
     }
 }
diff --git a/src/Command/Proxy/EnsureProductionSettingsDoctrineCommand.php b/src/Command/Proxy/EnsureProductionSettingsDoctrineCommand.php
@@ -27,6 +27,6 @@ protected function configure(): void
             return;
         }
 
-        $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
+        $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');
     }
 }
diff --git a/src/Command/Proxy/EntityRegionCacheDoctrineCommand.php b/src/Command/Proxy/EntityRegionCacheDoctrineCommand.php
@@ -25,6 +25,6 @@ protected function configure(): void
             return;
         }
 
-        $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
+        $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');
     }
 }
diff --git a/src/Command/Proxy/InfoDoctrineCommand.php b/src/Command/Proxy/InfoDoctrineCommand.php
@@ -23,6 +23,6 @@ protected function configure(): void
             return;
         }
 
-        $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
+        $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');
     }
 }
diff --git a/src/Command/Proxy/QueryRegionCacheDoctrineCommand.php b/src/Command/Proxy/QueryRegionCacheDoctrineCommand.php
@@ -25,6 +25,6 @@ protected function configure(): void
             return;
         }
 
-        $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
+        $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');
     }
 }
diff --git a/src/Command/Proxy/RunDqlDoctrineCommand.php b/src/Command/Proxy/RunDqlDoctrineCommand.php
@@ -41,6 +41,6 @@ protected function configure(): void
             return;
         }
 
-        $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
+        $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');
     }
 }
diff --git a/src/Command/Proxy/UpdateSchemaDoctrineCommand.php b/src/Command/Proxy/UpdateSchemaDoctrineCommand.php
@@ -26,6 +26,6 @@ protected function configure(): void
             return;
         }
 
-        $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
+        $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');
     }
 }
diff --git a/src/Command/Proxy/ValidateSchemaCommand.php b/src/Command/Proxy/ValidateSchemaCommand.php
@@ -25,6 +25,6 @@ protected function configure(): void
             return;
         }
 
-        $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
+        $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');
     }
 }
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -324,7 +324,7 @@ private function configureDbalDriverNode(ArrayNodeDefinition $node): void
                     '2.4',
                     'The "doctrine.dbal.override_url" configuration key is deprecated.',
                 )->end()
-                ->scalarNode('dbname_suffix')->end()
+                ->scalarNode('dbname_suffix')->info('Adds the given suffix to the configured database name, this option has no effects for the SQLite platform')->end()
                 ->scalarNode('application_name')->end()
                 ->scalarNode('charset')->end()
                 ->scalarNode('path')->end()
diff --git a/src/Registry.php b/src/Registry.php
@@ -6,13 +6,17 @@
 use Doctrine\ORM\ORMException;
 use Doctrine\Persistence\Proxy;
 use ProxyManager\Proxy\LazyLoadingInterface;
+use ReflectionClass;
 use Symfony\Bridge\Doctrine\ManagerRegistry;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\VarExporter\LazyObjectInterface;
 use Symfony\Contracts\Service\ResetInterface;
 
 use function array_keys;
 use function assert;
+use function method_exists;
+
+use const PHP_VERSION_ID;
 
 /**
  * References all Doctrine connections and entity managers in a given Container.
@@ -79,10 +83,27 @@ private function resetOrClearManager(string $managerName, string $serviceId): vo
 
         assert($manager instanceof EntityManagerInterface);
 
-        if ((! $manager instanceof LazyLoadingInterface && ! $manager instanceof LazyObjectInterface) || $manager->isOpen()) {
-            $manager->clear();
+        // Determine if the version of symfony/dependency-injection is >= 7.3
+        /** @phpstan-ignore function.alreadyNarrowedType */
+        $sfNativeLazyObjects = method_exists('Symfony\Component\DependencyInjection\ContainerBuilder', 'findTaggedResourceIds');
 
-            return;
+        if (PHP_VERSION_ID < 80400 || ! $sfNativeLazyObjects) {
+            if ((! $manager instanceof LazyLoadingInterface && ! $manager instanceof LazyObjectInterface) || $manager->isOpen()) {
+                $manager->clear();
+
+                return;
+            }
+        } else {
+            $r = new ReflectionClass($manager);
+            if ($r->isUninitializedLazyObject($manager)) {
+                return;
+            }
+
+            if ($manager->isOpen()) {
+                $manager->clear();
+
+                return;
+            }
         }
 
         $this->resetManager($managerName);

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@ protected function configure(): void`
`26`	`26`	`return;`
`27`	`27`	`}`
`28`	`28`
`29`		`- $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');`
	`29`	`+ $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@ protected function configure(): void`
`25`	`25`	`return;`
`26`	`26`	`}`
`27`	`27`
`28`		`- $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');`
	`28`	`+ $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ protected function configure()`
`34`	`34`	`return;`
`35`	`35`	`}`
`36`	`36`
`37`		`- $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');`
	`37`	`+ $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ protected function configure(): void`
`27`	`27`	`return;`
`28`	`28`	`}`
`29`	`29`
`30`		`- $this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');`
	`30`	`+ $this->addOption('em', null, InputOption::VALUE_REQUIRED, 'The entity manager to use for this command');`
`31`	`31`	`}`
`32`	`32`	`}`