Merge branch '3.4' into 4.4

* 3.4:
  [DI] fix loading defaults when using the PHP-DSL
  RepeatedType should always have inner types mapped

Author: nicolas-grekas

Loader/Configurator/AbstractServiceConfigurator.php

@@ -42,7 +42,7 @@ public function __destruct()
     /**
      * Registers a service.
      */
-    final public function set(string $id, string $class = null): ServiceConfigurator
+    final public function set(?string $id, string $class = null): ServiceConfigurator
     {
         $this->__destruct();
 

Loader/Configurator/PrototypeConfigurator.php

@@ -45,10 +45,13 @@ class PrototypeConfigurator extends AbstractServiceConfigurator
     public function __construct(ServicesConfigurator $parent, PhpFileLoader $loader, Definition $defaults, string $namespace, string $resource, bool $allowParent)
     {
         $definition = new Definition();
-        $definition->setPublic($defaults->isPublic());
+        if (!$defaults->isPublic() || !$defaults->isPrivate()) {
+            $definition->setPublic($defaults->isPublic());
+        }
         $definition->setAutowired($defaults->isAutowired());
         $definition->setAutoconfigured($defaults->isAutoconfigured());
-        $definition->setBindings($defaults->getBindings());
+        // deep clone, to avoid multiple process of the same instance in the passes
+        $definition->setBindings(unserialize(serialize($defaults->getBindings())));
         $definition->setChanges([]);
 
         $this->loader = $loader;

Loader/Configurator/ServicesConfigurator.php

@@ -83,13 +83,14 @@ final public function set(?string $id, string $class = null): ServiceConfigurato
 
             $id = sprintf('.%d_%s', ++$this->anonymousCount, preg_replace('/^.*\\\\/', '', $class).'~'.$this->anonymousHash);
             $definition->setPublic(false);
-        } else {
-            $definition->setPublic($defaults->isPublic());
+        } elseif (!$defaults->isPublic() || !$defaults->isPrivate()) {
+            $definition->setPublic($defaults->isPublic() && !$defaults->isPrivate());
         }
 
         $definition->setAutowired($defaults->isAutowired());
         $definition->setAutoconfigured($defaults->isAutoconfigured());
-        $definition->setBindings($defaults->getBindings());
+        // deep clone, to avoid multiple process of the same instance in the passes
+        $definition->setBindings(unserialize(serialize($defaults->getBindings())));
         $definition->setChanges([]);
 
         $configurator = new ServiceConfigurator($this->container, $this->instanceof, $allowParent, $this, $definition, $id, $defaults->getTags(), $this->path);
@@ -103,7 +104,10 @@ final public function set(?string $id, string $class = null): ServiceConfigurato
     final public function alias(string $id, string $referencedId): AliasConfigurator
     {
         $ref = static::processValue($referencedId, true);
-        $alias = new Alias((string) $ref, $this->defaults->isPublic());
+        $alias = new Alias((string) $ref);
+        if (!$this->defaults->isPublic() || !$this->defaults->isPrivate()) {
+            $alias->setPublic($this->defaults->isPublic());
+        }
         $this->container->setAlias($id, $alias);
 
         return new AliasConfigurator($this, $alias);

Tests/Fixtures/config/anonymous.php

@@ -7,7 +7,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\StdClassDecorator;
 
 return function (ContainerConfigurator $c) {
-    $s = $c->services();
+    $s = $c->services()->defaults()->public();
 
     $s->set('decorated', stdClass::class);
 

Tests/Fixtures/config/basic.php

@@ -5,7 +5,7 @@
 use App\BarService;
 
 return function (ContainerConfigurator $c) {
-    $s = $c->services();
+    $s = $c->services()->defaults()->public();
     $s->set(BarService::class)
         ->args([inline('FooClass')]);
 };

Tests/Fixtures/config/child.php

@@ -6,12 +6,14 @@
 
 return function (ContainerConfigurator $c) {
     $c->services()
-        ->set('bar', 'Class1')
+        ->set('bar', 'Class1')->public()
         ->set(BarService::class)
+            ->public()
             ->abstract(true)
             ->lazy()
         ->set('foo')
             ->parent(BarService::class)
+            ->public()
             ->decorate('bar', 'b', 1)
             ->args([ref('b')])
             ->class('Class2')

Tests/Fixtures/config/defaults.expected.yml

@@ -18,7 +18,7 @@ services:
         arguments: ['@bar']
     bar:
         class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
-        public: false
+        public: true
         tags:
             - { name: t, a: b }
         autowire: true

Tests/Fixtures/config/defaults.php

@@ -14,7 +14,7 @@
         ->autowire()
         ->tag('t', ['a' => 'b'])
         ->bind(Foo::class, ref('bar'))
-        ->private();
+        ->public();
 
     $s->set(Foo::class)->args([ref('bar')])->public();
     $s->set('bar', Foo::class)->call('setFoo')->autoconfigure(false);

Tests/Fixtures/config/instanceof.php

@@ -6,7 +6,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype;
 
 return function (ContainerConfigurator $c) {
-    $s = $c->services();
+    $s = $c->services()->defaults()->public();
     $s->instanceof(Prototype\Foo::class)
         ->property('p', 0)
         ->call('setFoo', [ref('foo')])

Tests/Fixtures/config/lazy_fqcn.php

@@ -3,6 +3,6 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 return function (ContainerConfigurator $c) {
-    $di = $c->services();
+    $di = $c->services()->defaults()->public();
     $di->set('foo', 'stdClass')->lazy('SomeInterface');
 };