[DI] deprecate Definition/Alias::setPrivate()

Author: nicolas-grekas

Alias.php

@@ -17,16 +17,14 @@ class Alias
 {
     private $id;
     private $public;
-    private $private;
     private $deprecation = [];
 
     private static $defaultDeprecationTemplate = 'The "%alias_id%" service alias is deprecated. You should stop using it, as it will be removed in the future.';
 
-    public function __construct(string $id, bool $public = true)
+    public function __construct(string $id, bool $public = false)
     {
         $this->id = $id;
         $this->public = $public;
-        $this->private = 2 > \func_num_args();
     }
 
     /**
@@ -47,26 +45,22 @@ public function isPublic()
     public function setPublic(bool $boolean)
     {
         $this->public = $boolean;
-        $this->private = false;
 
         return $this;
     }
 
     /**
      * Sets if this Alias is private.
      *
-     * When set, the "private" state has a higher precedence than "public".
-     * In version 3.4, a "private" alias always remains publicly accessible,
-     * but triggers a deprecation notice when accessed from the container,
-     * so that the alias can be made really private in 4.0.
-     *
      * @return $this
+     *
+     * @deprecated since Symfony 5.2, use setPublic() instead
      */
     public function setPrivate(bool $boolean)
     {
-        $this->private = $boolean;
+        trigger_deprecation('symfony/dependency-injection', '5.2', 'The "%s()" method is deprecated, use "setPublic()" instead.', __METHOD__);
 
-        return $this;
+        return $this->setPublic(!$boolean);
     }
 
     /**
@@ -76,7 +70,7 @@ public function setPrivate(bool $boolean)
      */
     public function isPrivate()
     {
-        return $this->private;
+        return !$this->public;
     }
 
     /**

CHANGELOG.md

@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * added `param()` and `abstract_arg()` in the PHP-DSL
+ * deprecated `Definition::setPrivate()` and `Alias::setPrivate()`, use `setPublic()` instead
 
 5.1.0
 -----

ChildDefinition.php

@@ -29,7 +29,6 @@ class ChildDefinition extends Definition
     public function __construct(string $parent)
     {
         $this->parent = $parent;
-        $this->setPrivate(false);
     }
 
     /**

Compiler/DecoratorServicePass.php

@@ -104,7 +104,7 @@ public function process(ContainerBuilder $container)
                 $decoratingDefinitions[$inner] = $definition;
             }
 
-            $container->setAlias($inner, $id)->setPublic($public)->setPrivate($private);
+            $container->setAlias($inner, $id)->setPublic($public);
         }
     }
 

Compiler/PassConfig.php

@@ -74,12 +74,6 @@ public function __construct()
             new CheckArgumentsValidityPass(false),
         ]];
 
-        $this->beforeRemovingPasses = [
-            -100 => [
-                new ResolvePrivatesPass(),
-            ],
-        ];
-
         $this->removingPasses = [[
             new RemovePrivateAliasesPass(),
             new ReplaceAliasByActualDefinitionPass(),

Compiler/ReplaceAliasByActualDefinitionPass.php

@@ -44,7 +44,7 @@ public function process(ContainerBuilder $container)
             }
             // Check if target needs to be replaces
             if (isset($replacements[$targetId])) {
-                $container->setAlias($definitionId, $replacements[$targetId])->setPublic($target->isPublic())->setPrivate($target->isPrivate());
+                $container->setAlias($definitionId, $replacements[$targetId])->setPublic($target->isPublic());
             }
             // No need to process the same target twice
             if (isset($seenAliasTargets[$targetId])) {
@@ -65,8 +65,7 @@ public function process(ContainerBuilder $container)
                 continue;
             }
             // Remove private definition and schedule for replacement
-            $definition->setPublic(!$target->isPrivate());
-            $definition->setPrivate($target->isPrivate());
+            $definition->setPublic($target->isPublic());
             $container->setDefinition($definitionId, $definition);
             $container->removeDefinition($targetId);
             $replacements[$targetId] = $definitionId;

Compiler/ResolveChildDefinitionsPass.php

@@ -132,7 +132,7 @@ private function doResolveDefinition(ChildDefinition $definition): Definition
         if (isset($changes['public'])) {
             $def->setPublic($definition->isPublic());
         } else {
-            $def->setPrivate($definition->isPrivate() || $parentDef->isPrivate());
+            $def->setPublic($parentDef->isPublic());
         }
         if (isset($changes['lazy'])) {
             $def->setLazy($definition->isLazy());

Compiler/ResolvePrivatesPass.php

@@ -11,10 +11,14 @@
 
 namespace Symfony\Component\DependencyInjection\Compiler;
 
+trigger_deprecation('symfony/dependency-injection', '5.2', 'The "%s" class is deprecated.', ResolvePrivatesPass::class);
+
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * @author Nicolas Grekas <[email protected]>
+ *
+ * @deprecated since Symfony 5.2
  */
 class ResolvePrivatesPass implements CompilerPassInterface
 {

Compiler/ResolveReferencesToAliasesPass.php

@@ -34,7 +34,7 @@ public function process(ContainerBuilder $container)
             $this->currentId = $id;
 
             if ($aliasId !== $defId = $this->getDefinitionId($aliasId, $container)) {
-                $container->setAlias($id, $defId)->setPublic($alias->isPublic())->setPrivate($alias->isPrivate());
+                $container->setAlias($id, $defId)->setPublic($alias->isPublic());
             }
         }
     }

Compiler/ServiceLocatorTagPass.php

@@ -106,7 +106,6 @@ public static function register(ContainerBuilder $container, array $refMap, stri
 
         $locator = (new Definition(ServiceLocator::class))
             ->addArgument($refMap)
-            ->setPublic(false)
             ->addTag('container.service_locator');
 
         if (null !== $callerId && $container->hasDefinition($callerId)) {
@@ -123,7 +122,6 @@ public static function register(ContainerBuilder $container, array $refMap, stri
             // to have them specialized per consumer service, we use a cloning factory
             // to derivate customized instances from the prototype one.
             $container->register($id .= '.'.$callerId, ServiceLocator::class)
-                ->setPublic(false)
                 ->setFactory([new Reference($locatorId), 'withContext'])
                 ->addTag('container.service_locator_context', ['id' => $callerId])
                 ->addArgument($callerId)