[DependencyInjection] Undeprecate RealServiceInstantiator, it's useful to disable lazy proxies in tests

Author: nicolas-grekas

CHANGELOG.md

@@ -8,7 +8,6 @@ CHANGELOG
  * Add argument `&$asGhostObject` to LazyProxy's `DumperInterface` to allow using ghost objects for lazy loading services
  * Add `enum` env var processor
  * Add `shuffle` env var processor
- * Deprecate `RealServiceInstantiator`
 
 6.1
 ---

ContainerBuilder.php

@@ -1002,7 +1002,7 @@ private function createService(Definition $definition, array &$inlineServices, b
                 $this,
                 (clone $definition)
                     ->setClass($parameterBag->resolveValue($definition->getClass()))
-                    ->setTags($parameterBag->resolveValue($definition->getTags())),
+                    ->setTags(($definition->hasTag('proxy') ? ['proxy' => $parameterBag->resolveValue($definition->getTag('proxy'))] : []) + $definition->getTags()),
                 $id, function ($proxy = false) use ($definition, &$inlineServices, $id) {
                     return $this->createService($definition, $inlineServices, true, $id, $proxy);
                 }

Dumper/PhpDumper.php

@@ -2299,7 +2299,7 @@ private function isProxyCandidate(Definition $definition, bool &$asGhostObject =
         $bag = $this->container->getParameterBag();
         $definition = (clone $definition)
             ->setClass($bag->resolveValue($definition->getClass()))
-            ->setTags($bag->resolveValue($definition->getTags()));
+            ->setTags(($definition->hasTag('proxy') ? ['proxy' => $bag->resolveValue($definition->getTag('proxy'))] : []) + $definition->getTags());
 
         return $proxyDumper->isProxyCandidate($definition, $asGhostObject) ? $definition : null;
     }

LazyProxy/Instantiator/RealServiceInstantiator.php

@@ -14,16 +14,12 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 
-trigger_deprecation('symfony/dependency-injection', '6.2', 'The "%s" class is deprecated, use "%s" instead.', RealServiceInstantiator::class, LazyServiceInstantiator::class);
-
 /**
  * {@inheritdoc}
  *
  * Noop proxy instantiator - produces the real service instead of a proxy instance.
  *
  * @author Marco Pivetta <[email protected]>
- *
- * @deprecated since Symfony 6.2, use LazyServiceInstantiator instead.
  */
 class RealServiceInstantiator implements InstantiatorInterface
 {

Tests/ContainerBuilderTest.php

@@ -370,9 +370,6 @@ public function testCreateService()
         $this->assertInstanceOf(\Bar\FooClass::class, $builder->get('foo2'), '->createService() replaces parameters in the file provided by the service definition');
     }
 
-    /**
-     * @group legacy
-     */
     public function testCreateProxyWithRealServiceInstantiator()
     {
         $builder = new ContainerBuilder();

Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php

@@ -20,8 +20,6 @@
  * Tests for {@see \Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator}.
  *
  * @author Marco Pivetta <[email protected]>
- *
- * @group legacy
  */
 class RealServiceInstantiatorTest extends TestCase
 {