Merge branch '2.7' into 2.8

fabpot · fabpot · commit 66d2e2522627 · 2017-06-13T17:55:24.000-07:00
* 2.7:
  fixed CS
  SCA with Php Inspections (EA Extended): 2.7
  Remove deprecated each function
  Fixed PHPdoc return references in FormBuilderInterface
  [FrameworkBundle] Fix perf issue in CacheClearCommand::warmup()
diff --git a/Tests/ContainerBuilderTest.php b/Tests/ContainerBuilderTest.php
@@ -120,7 +120,7 @@ public function testGet()
             $this->assertEquals('Circular reference detected for service "baz", path: "baz".', $e->getMessage(), '->get() throws a LogicException if the service has a circular reference to itself');
         }
 
-        $this->assertTrue($builder->get('bar') === $builder->get('bar'), '->get() always returns the same instance if the service is shared');
+        $this->assertSame($builder->get('bar'), $builder->get('bar'), '->get() always returns the same instance if the service is shared');
     }
 
     public function testNonSharedServicesReturnsDifferentInstances()

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public function testGet()`
`120`	`120`	`$this->assertEquals('Circular reference detected for service "baz", path: "baz".', $e->getMessage(), '->get() throws a LogicException if the service has a circular reference to itself');`
`121`	`121`	`}`
`122`	`122`
`123`		`- $this->assertTrue($builder->get('bar') === $builder->get('bar'), '->get() always returns the same instance if the service is shared');`
	`123`	`+ $this->assertSame($builder->get('bar'), $builder->get('bar'), '->get() always returns the same instance if the service is shared');`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`public function testNonSharedServicesReturnsDifferentInstances()`