Merge pull request #2103 from greg0ire/remove-option

Remove enable_native_lazy_objects

Author: greg0ire

UPGRADE-4.0.md

@@ -0,0 +1,9 @@
+UPGRADE FROM 3 to 4
+===================
+
+Configuration
+-------------
+
+The `doctrine.orm.entity_managers.some_em.enable_native_lazy_objects`
+configuration option has been removed as native lazy objects are now always
+enabled.

docs/en/configuration.rst

@@ -206,9 +206,6 @@ Configuration Reference
             orm:
                 default_entity_manager: ~ # The first defined is used if not set
 
-                # No-op, will be deprecated and removed in the future
-                enable_native_lazy_objects:   true
-
                 identity_generation_preferences:
                     Doctrine\DBAL\Platforms\PostgreSQLPlatform: identity
 

src/DependencyInjection/Configuration.php

@@ -360,7 +360,6 @@ private function addOrmSection(ArrayNodeDefinition $node): void
         // Key that should not be rewritten to the entity-manager config
         $excludedKeys = [
             'default_entity_manager' => true,
-            'enable_native_lazy_objects' => true,
             'resolve_target_entities' => true,
             'resolve_target_entity' => true,
             'controller_resolver' => true,
@@ -404,18 +403,6 @@ private function addOrmSection(ArrayNodeDefinition $node): void
                     ->end()
                     ->children()
                         ->scalarNode('default_entity_manager')->end()
-                        ->booleanNode('enable_native_lazy_objects')
-                            ->defaultTrue()
-                            ->validate()
-                                ->ifTrue(static fn ($v) => $v === false)
-                                ->thenInvalid('The setting "enable_native_lazy_objects" can no longer be disabled and should not be set')
-                            ->end()
-                            ->setDeprecated(
-                                'doctrine/doctrine-bundle',
-                                '3.1',
-                                'The "%node%" option is deprecated and will be removed in DoctrineBundle 4.0, as native lazy objects are now always enabled.',
-                            )
-                        ->end()
                         ->arrayNode('controller_resolver')
                             ->canBeDisabled()
                             ->children()

tests/DependencyInjection/AbstractDoctrineExtensionTestCase.php

@@ -32,7 +32,6 @@
 use Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestHydrator;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
-use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -1199,29 +1198,6 @@ public function testNativeLazyObjectsWithoutConfig(): void
         $this->assertTrue($entityManager->getConfiguration()->isNativeLazyObjectsEnabled());
     }
 
-    public function testNativeLazyObjectsWithConfigTrue(): void
-    {
-        if (! interface_exists(EntityManagerInterface::class)) {
-            self::markTestSkipped('This test requires ORM');
-        }
-
-        $container     = $this->loadContainer('orm_native_lazy_objects_enable');
-        $entityManager = $container->get('doctrine.orm.entity_manager');
-
-        $this->assertTrue($entityManager->getConfiguration()->isNativeLazyObjectsEnabled());
-    }
-
-    #[RequiresMethod(ProxyHelper::class, 'generateLazyGhost')]
-    public function testNativeLazyObjectsWithConfigFalse(): void
-    {
-        if (! interface_exists(EntityManagerInterface::class)) {
-            self::markTestSkipped('This test requires ORM');
-        }
-
-        $this->expectException(InvalidConfigurationException::class);
-        $container = $this->loadContainer('orm_native_lazy_objects_disable');
-    }
-
     /** @param list<string> $bundles */
     private function loadContainer(
         string $fixture,