Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit a53aba327e7d · 2016-05-06T11:19:28.000+02:00
* 2.3:
  top-level anonymous services must be public

Conflicts:
	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -292,6 +292,10 @@ private function processAnonymousServices(\DOMDocument $xml, $file)
                 if ($services = $this->getChildren($node, 'service')) {
                     $definitions[$id] = array($services[0], $file, false);
                     $services[0]->setAttribute('id', $id);
+
+                    // anonymous services are always private
+                    // we could not use the constant false here, because of XML parsing
+                    $services[0]->setAttribute('public', 'false');
                 }
             }
         }
@@ -311,9 +315,6 @@ private function processAnonymousServices(\DOMDocument $xml, $file)
         foreach ($definitions as $id => $def) {
             list($domElement, $file, $wild) = $def;
 
-            // anonymous services are always private
-            // we could not use the constant false here, because of XML parsing
-            $domElement->setAttribute('public', 'false');
 
             if (null !== $definition = $this->parseDefinition($domElement, $file)) {
                 $this->container->setDefinition($id, $definition);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -200,7 +200,7 @@ public function testLoadAnonymousServices()
             $service = $container->getDefinition($id);
         }
         $this->assertEquals('BizClass', $service->getClass(), '->load() uses the same configuration as for the anonymous ones');
-        $this->assertFalse($service->isPublic());
+        $this->assertTrue($service->isPublic());
 
         // anonymous services are shared when using decoration definitions
         $container->compile();

Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,10 @@ private function processAnonymousServices(\DOMDocument $xml, $file)`
`292`	`292`	`if ($services = $this->getChildren($node, 'service')) {`
`293`	`293`	`$definitions[$id] = array($services[0], $file, false);`
`294`	`294`	`$services[0]->setAttribute('id', $id);`
	`295`	`+`
	`296`	`+ // anonymous services are always private`
	`297`	`+ // we could not use the constant false here, because of XML parsing`
	`298`	`+ $services[0]->setAttribute('public', 'false');`
`295`	`299`	`}`
`296`	`300`	`}`
`297`	`301`	`}`
`@@ -311,9 +315,6 @@ private function processAnonymousServices(\DOMDocument $xml, $file)`
`311`	`315`	`foreach ($definitions as $id => $def) {`
`312`	`316`	`list($domElement, $file, $wild) = $def;`
`313`	`317`
`314`		`- // anonymous services are always private`
`315`		`- // we could not use the constant false here, because of XML parsing`
`316`		`- $domElement->setAttribute('public', 'false');`
`317`	`318`
`318`	`319`	`if (null !== $definition = $this->parseDefinition($domElement, $file)) {`
`319`	`320`	`$this->container->setDefinition($id, $definition);`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public function testLoadAnonymousServices()`
`200`	`200`	`$service = $container->getDefinition($id);`
`201`	`201`	`}`
`202`	`202`	`$this->assertEquals('BizClass', $service->getClass(), '->load() uses the same configuration as for the anonymous ones');`
`203`		`- $this->assertFalse($service->isPublic());`
	`203`	`+ $this->assertTrue($service->isPublic());`
`204`	`204`
`205`	`205`	`// anonymous services are shared when using decoration definitions`
`206`	`206`	`$container->compile();`