Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit a351c24e6c0e · 2017-01-10T15:27:01.000+01:00
* 2.7:
  [DI] Add missing legacy group on testLegacy
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -334,6 +334,9 @@ public function testCreateServiceFactory()
         $this->assertTrue($builder->get('baz')->called, '->createService() uses another service as factory');
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyCreateServiceFactory()
     {
         $builder = new ContainerBuilder();
@@ -350,6 +353,9 @@ public function testLegacyCreateServiceFactory()
         $this->assertEquals(array('foo' => 'bar', 'bar' => 'foo', $builder->get('bar')), $builder->get('foo1')->arguments, '->createService() passes the arguments to the factory method');
     }
 
+    /**
+     * @group legacy
+     */
     public function testLegacyCreateServiceFactoryService()
     {
         $builder = new ContainerBuilder();

Original file line number	Diff line number	Diff line change
`@@ -334,6 +334,9 @@ public function testCreateServiceFactory()`
`334`	`334`	`$this->assertTrue($builder->get('baz')->called, '->createService() uses another service as factory');`
`335`	`335`	`}`
`336`	`336`
	`337`	`+ /**`
	`338`	`+ * @group legacy`
	`339`	`+ */`
`337`	`340`	`public function testLegacyCreateServiceFactory()`
`338`	`341`	`{`
`339`	`342`	`$builder = new ContainerBuilder();`
`@@ -350,6 +353,9 @@ public function testLegacyCreateServiceFactory()`
`350`	`353`	`$this->assertEquals(array('foo' => 'bar', 'bar' => 'foo', $builder->get('bar')), $builder->get('foo1')->arguments, '->createService() passes the arguments to the factory method');`
`351`	`354`	`}`
`352`	`355`
	`356`	`+ /**`
	`357`	`+ * @group legacy`
	`358`	`+ */`
`353`	`359`	`public function testLegacyCreateServiceFactoryService()`
`354`	`360`	`{`
`355`	`361`	`$builder = new ContainerBuilder();`