[DI] Turn services and aliases private by default, with BC layer

Author: nicolas-grekas

Alias.php

@@ -15,7 +15,7 @@ class Alias
 {
     private $id;
     private $public;
-    private $private = false;
+    private $private;
 
     /**
      * @param string $id     Alias identifier
@@ -25,6 +25,7 @@ public function __construct($id, $public = true)
     {
         $this->id = (string) $id;
         $this->public = $public;
+        $this->private = 2 > func_num_args();
     }
 
     /**
@@ -47,6 +48,7 @@ public function isPublic()
     public function setPublic($boolean)
     {
         $this->public = (bool) $boolean;
+        $this->private = false;
 
         return $this;
     }

CHANGELOG.md

@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * deprecated "public-by-default" definitions and aliases, the new default will be "private" in 4.0
  * added `EnvVarProcessorInterface` and corresponding "container.env_var_processor" tag for processing env vars
  * added support for ignore-on-uninitialized references
  * deprecated service auto-registration while autowiring

Compiler/AutoAliasServicePass.php

@@ -33,7 +33,7 @@ public function process(ContainerBuilder $container)
 
                 $aliasId = $container->getParameterBag()->resolveValue($tag['format']);
                 if ($container->hasDefinition($aliasId) || $container->hasAlias($aliasId)) {
-                    $container->setAlias($serviceId, new Alias($aliasId));
+                    $container->setAlias($serviceId, new Alias($aliasId, true));
                 }
             }
         }

Compiler/CheckDefinitionValidityPass.php

@@ -39,7 +39,7 @@ public function process(ContainerBuilder $container)
     {
         foreach ($container->getDefinitions() as $id => $definition) {
             // synthetic service is public
-            if ($definition->isSynthetic() && (!$definition->isPublic() || $definition->isPrivate())) {
+            if ($definition->isSynthetic() && !($definition->isPublic() || $definition->isPrivate())) {
                 throw new RuntimeException(sprintf('A synthetic service ("%s") must be public.', $id));
             }
 

Compiler/DecoratorServicePass.php

@@ -67,7 +67,7 @@ public function process(ContainerBuilder $container)
                 $container->setDefinition($renamedId, $decoratedDefinition);
             }
 
-            $container->setAlias($inner, $id)->setPublic($public && !$private)->setPrivate($private);
+            $container->setAlias($inner, $id)->setPublic($public)->setPrivate($private);
         }
     }
 }

Compiler/RegisterEnvVarProcessorsPass.php

@@ -52,6 +52,7 @@ public function process(ContainerBuilder $container)
                 $bag->setProvidedTypes($types);
             }
             $container->register('container.env_var_processors_locator', ServiceLocator::class)
+                ->setPublic(true)
                 ->setArguments(array($processors))
             ;
         }

Compiler/ReplaceAliasByActualDefinitionPass.php

@@ -45,7 +45,7 @@ public function process(ContainerBuilder $container)
             }
             // Check if target needs to be replaces
             if (isset($replacements[$targetId])) {
-                $container->setAlias($definitionId, $replacements[$targetId]);
+                $container->setAlias($definitionId, $replacements[$targetId])->setPublic($target->isPublic())->setPrivate($target->isPrivate());
             }
             // No need to process the same target twice
             if (isset($seenAliasTargets[$targetId])) {

Compiler/ResolveChildDefinitionsPass.php

@@ -36,12 +36,14 @@ public function process(ContainerBuilder $container)
         foreach ($container->getDefinitions() as $definition) {
             if ($definition->isPrivate()) {
                 $definition->setPublic(false);
+                $definition->setPrivate(true);
             }
         }
 
         foreach ($container->getAliases() as $alias) {
             if ($alias->isPrivate()) {
                 $alias->setPublic(false);
+                $alias->setPrivate(true);
             }
         }
     }

Compiler/ResolveReferencesToAliasesPass.php

@@ -32,7 +32,7 @@ public function process(ContainerBuilder $container)
         foreach ($container->getAliases() as $id => $alias) {
             $aliasId = (string) $alias;
             if ($aliasId !== $defId = $this->getDefinitionId($aliasId, $container)) {
-                $container->setAlias($id, $defId)->setPublic($alias->isPublic() && !$alias->isPrivate())->setPrivate($alias->isPrivate());
+                $container->setAlias($id, $defId)->setPublic($alias->isPublic())->setPrivate($alias->isPrivate());
             }
         }
     }

Definition.php

@@ -35,7 +35,7 @@ class Definition
     private $configurator;
     private $tags = array();
     private $public = true;
-    private $private = false;
+    private $private = true;
     private $synthetic = false;
     private $abstract = false;
     private $lazy = false;
@@ -603,6 +603,7 @@ public function setPublic($boolean)
         $this->changes['public'] = true;
 
         $this->public = (bool) $boolean;
+        $this->private = false;
 
         return $this;
     }