[DI] Fixed support of private services since Symfony 4.0

Pavel Agaletskiy · Pavel Agaletskiy · commit a4ba66f6a078 · 2018-06-13T18:52:40.000+03:00
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -54,7 +54,7 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode =
         $instantiation = 'return';
 
         if ($definition->isShared()) {
-            $instantiation .= sprintf(' $this->%s[\'%s\'] =', $definition->isPublic() || !method_exists(ContainerBuilder::class, 'addClassResource') ? 'services' : 'privates', $id);
+            $instantiation .= sprintf(' $this->%s[\'%s\'] =', $definition->isPublic() || !method_exists(ContainerBuilder::class, 'addObjectResource') ? 'services' : 'privates', $id);
         }
 
         if (null === $factoryCode) {
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -80,6 +80,34 @@ public function testGetProxyFactoryCode()
         );
     }
 
+    /**
+     * @dataProvider getPrivatePublicDefinitions
+     */
+    public function testCorrectAssigning(Definition $definition, string $access)
+    {
+        $definition->setLazy(true);
+
+        $code = $this->dumper->getProxyFactoryCode($definition, 'foo', '$this->getFoo2Service(false)');
+
+        $this->assertStringMatchesFormat('%A$this->'.$access.'[\'foo\'] = %A', $code);
+    }
+
+    public function getPrivatePublicDefinitions()
+    {
+        return array(
+            array(
+                (new Definition(__CLASS__))
+                    ->setPublic(false),
+                'privates',
+            ),
+            array(
+                (new Definition(__CLASS__))
+                    ->setPublic(true),
+                'services',
+            ),
+        );
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Missing factory code to construct the service "foo".

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode =`
`54`	`54`	`$instantiation = 'return';`
`55`	`55`
`56`	`56`	`if ($definition->isShared()) {`
`57`		`- $instantiation .= sprintf(' $this->%s[\'%s\'] =', $definition->isPublic() \|\| !method_exists(ContainerBuilder::class, 'addClassResource') ? 'services' : 'privates', $id);`
	`57`	`+ $instantiation .= sprintf(' $this->%s[\'%s\'] =', $definition->isPublic() \|\| !method_exists(ContainerBuilder::class, 'addObjectResource') ? 'services' : 'privates', $id);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`if (null === $factoryCode) {`