Merge pull request #1987 from greg0ire/forget-lazy-👻

Forget about lazy ghost objects

Author: greg0ire

UPGRADE-3.0.md

@@ -48,9 +48,13 @@ and does not have a replacement.
 Configuration
 -------------
 
-### The `doctrine.orm.entity_managers.some_em.report_fields_where_declared` configuration option has been removed
+### no-op configuration options removed
 
-This option is a no-op when using `doctrine/orm` 3 and has been removed.
+The following configuration options are no-ops when using `doctrine/orm` 3 and
+have been removed:
+
+- `doctrine.orm.entity_managers.some_em.report_fields_where_declared`
+- `doctrine.orm.enable_lazy_ghost_objects`
 
 ### The `doctrine.dbal.default_table_options.collate` default table option is removed
 

config/schema/doctrine-1.0.xsd

@@ -149,7 +149,6 @@
         <xsd:attribute name="proxy-dir" type="xsd:string" />
         <xsd:attribute name="proxy-namespace" type="xsd:string" />
         <xsd:attribute name="auto-generate-proxy-classes" type="xsd:string" default="false" />
-        <xsd:attribute name="enable-lazy-ghost-objects" type="xsd:boolean" />
         <xsd:attribute name="enable-native-lazy-objects" type="xsd:boolean" />
         <xsd:attributeGroup ref="entity-manager-config" />
     </xsd:complexType>

docs/en/configuration.rst

@@ -217,8 +217,6 @@ Configuration Reference
                 auto_generate_proxy_classes:  false
                 proxy_dir:                    "%kernel.cache_dir%/doctrine/orm/Proxies"
                 proxy_namespace:              Proxies
-                # Enables the new implementation of proxies based on lazy ghosts instead of using the legacy implementation
-                enable_lazy_ghost_objects:    false
                 # Enables the new native implementation of PHP lazy objects instead of generated proxies
                 enable_native_lazy_objects:   false
                 identity_generation_preferences:

src/DependencyInjection/Configuration.php

@@ -418,7 +418,6 @@ private function addOrmSection(ArrayNodeDefinition $node): void
         $excludedKeys = [
             'default_entity_manager' => true,
             'auto_generate_proxy_classes' => true,
-            'enable_lazy_ghost_objects' => true,
             'enable_native_lazy_objects' => true,
             'proxy_dir' => true,
             'proxy_namespace' => true,
@@ -494,10 +493,6 @@ private function addOrmSection(ArrayNodeDefinition $node): void
                                 ->then(static fn (string $v) => constant('Doctrine\ORM\Proxy\ProxyFactory::AUTOGENERATE_' . strtoupper($v)))
                             ->end()
                         ->end()
-                        ->booleanNode('enable_lazy_ghost_objects')
-                            ->defaultValue(true)
-                            ->info('Enables the new implementation of proxies based on lazy ghosts instead of using the legacy implementation')
-                        ->end()
                         ->booleanNode('enable_native_lazy_objects')
                             ->defaultFalse()
                             ->info('Enables the new native implementation of PHP lazy objects instead of generated proxies')

src/DependencyInjection/DoctrineExtension.php

@@ -514,12 +514,6 @@ protected function ormLoad(array $config, ContainerBuilder $container): void
 
         $container->setParameter('doctrine.default_entity_manager', $config['default_entity_manager']);
 
-        if (! ($config['enable_lazy_ghost_objects'] ?? false)) {
-            throw new LogicException(
-                'Lazy ghost objects cannot be disabled for ORM 3.',
-            );
-        }
-
         if (! class_exists(ProxyHelper::class)) {
             throw new LogicException(
                 'Lazy ghost objects cannot be enabled because the "symfony/var-exporter" library'
@@ -541,7 +535,7 @@ protected function ormLoad(array $config, ContainerBuilder $container): void
             trigger_deprecation('doctrine/doctrine-bundle', '2.16', 'Not setting "doctrine.orm.enable_native_lazy_objects" to true is deprecated.');
         }
 
-        $options = ['auto_generate_proxy_classes', 'enable_lazy_ghost_objects', 'enable_native_lazy_objects', 'proxy_dir', 'proxy_namespace'];
+        $options = ['auto_generate_proxy_classes', 'enable_native_lazy_objects', 'proxy_dir', 'proxy_namespace'];
         foreach ($options as $key) {
             $container->setParameter('doctrine.orm.' . $key, $config[$key]);
         }
@@ -662,7 +656,6 @@ protected function loadOrmEntityManager(array $entityManager, ContainerBuilder $
             'setQuoteStrategy' => new Reference($entityManager['quote_strategy']),
             'setTypedFieldMapper' => new Reference($entityManager['typed_field_mapper']),
             'setEntityListenerResolver' => new Reference(sprintf('doctrine.orm.%s_entity_listener_resolver', $entityManager['name'])),
-            'setLazyGhostObjectEnabled' => '%doctrine.orm.enable_lazy_ghost_objects%',
             'setIdentityGenerationPreferences' => $entityManager['identity_generation_preferences'],
         ];
 

tests/DependencyInjection/AbstractDoctrineExtensionTestCase.php

@@ -17,7 +17,6 @@
 use Doctrine\ORM\Mapping\LegacyReflectionFields;
 use Generator;
 use InvalidArgumentException;
-use LogicException;
 use PDO;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterEventListenersAndSubscribersPass;
@@ -853,17 +852,6 @@ public function testAddFilter(): void
         $this->assertCount(2, $entityManager->getFilters()->getEnabledFilters());
     }
 
-    public function testDisablingLazyGhostOnOrm3Throws(): void
-    {
-        if (! interface_exists(EntityManagerInterface::class)) {
-            self::markTestSkipped('This test requires ORM');
-        }
-
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('Lazy ghost objects cannot be disabled for ORM 3.');
-        $this->loadContainer('orm_no_lazy_ghost');
-    }
-
     public function testResolveTargetEntity(): void
     {
         if (! interface_exists(EntityManagerInterface::class)) {

tests/DependencyInjection/Compiler/IdGeneratorPassTest.php

@@ -86,7 +86,6 @@ public function testRepositoryServiceWiring(): void
                 ],
                 'orm' => [
                     'mappings' => $mappings,
-                    'enable_lazy_ghost_objects' => true,
                     /** @phpstan-ignore function.alreadyNarrowedType */
                     'enable_native_lazy_objects' => method_exists(Configuration::class, 'enableNativeLazyObjects'),
                 ],

tests/DependencyInjection/Fixtures/TestKernel.php

@@ -50,7 +50,6 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
                 ],
                 'orm' => [
                     'auto_generate_proxy_classes' => true,
-                    'enable_lazy_ghost_objects' => true,
                     /** @phpstan-ignore function.alreadyNarrowedType */
                     'enable_native_lazy_objects' => method_exists(Configuration::class, 'enableNativeLazyObjects'),
                     'mappings' => [

tests/DependencyInjection/Fixtures/config/xml/orm_filters.xml

@@ -11,7 +11,7 @@
             <connection name="default" dbname="db" server-version="8.0.31" />
         </dbal>
 
-        <orm enable-lazy-ghost-objects="true">
+        <orm>
             <filter name="soft_delete" enabled="true" >Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\TestFilter</filter>
             <filter name="myFilter" enabled="true" class="Doctrine\Bundle\DoctrineBundle\Tests\DependencyInjection\TestFilter">
                 <parameter name="myParameter">myValue</parameter>