Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit f2ff9b945d64 · 2015-06-19T17:09:14.000+02:00
* 2.7:
  [FrameworkBundle] Reuse PropertyAccessor service for ObjectNormalizer
  [VarDumper] Fix dump output for better readability
  [PhpUnitBridge] Enforce @-silencing of deprecation notices according to new policy
diff --git a/Tests/Compiler/CheckDefinitionValidityPassTest.php b/Tests/Compiler/CheckDefinitionValidityPassTest.php
@@ -56,8 +56,6 @@ public function testProcessDetectsNonSyntheticNonAbstractDefinitionWithoutClass(
      */
     public function testLegacyProcessDetectsBothFactorySyntaxesUsed()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = new ContainerBuilder();
         $container->register('a')->setFactory(array('a', 'b'))->setFactoryClass('a');
 
diff --git a/Tests/Compiler/LegacyResolveParameterPlaceHoldersPassTest.php b/Tests/Compiler/LegacyResolveParameterPlaceHoldersPassTest.php
@@ -21,8 +21,6 @@ class LegacyResolveParameterPlaceHoldersPassTest extends \PHPUnit_Framework_Test
 {
     public function testFactoryClassParametersShouldBeResolved()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $compilerPass = new ResolveParameterPlaceHoldersPass();
 
         $container = new ContainerBuilder();
diff --git a/Tests/ContainerBuilderTest.php b/Tests/ContainerBuilderTest.php
@@ -342,8 +342,6 @@ public function testCreateServiceFactory()
 
     public function testLegacyCreateServiceFactory()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $builder = new ContainerBuilder();
         $builder->register('bar', 'Bar\FooClass');
         $builder
@@ -363,8 +361,6 @@ public function testLegacyCreateServiceFactory()
      */
     public function testLegacyCreateServiceFactoryService()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $builder = new ContainerBuilder();
         $builder->register('foo_service', 'Bar\FooClass');
         $builder
@@ -735,8 +731,6 @@ public function testNoExceptionWhenSetSyntheticServiceOnAFrozenContainer()
      */
     public function testLegacySetOnSynchronizedService()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = new ContainerBuilder();
         $container->register('baz', 'BazClass')
             ->setSynchronized(true)
@@ -757,8 +751,6 @@ public function testLegacySetOnSynchronizedService()
      */
     public function testLegacySynchronizedServiceWithScopes()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = new ContainerBuilder();
         $container->addScope(new Scope('foo'));
         $container->register('baz', 'BazClass')
diff --git a/Tests/DefinitionDecoratorTest.php b/Tests/DefinitionDecoratorTest.php
@@ -55,8 +55,6 @@ public function getPropertyTests()
      */
     public function testLegacySetProperty($property, $changeKey)
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $def = new DefinitionDecorator('foo');
 
         $getter = 'get'.ucfirst($property);
diff --git a/Tests/DefinitionTest.php b/Tests/DefinitionTest.php
@@ -170,8 +170,6 @@ public function testSetIsSynthetic()
      */
     public function testLegacySetIsSynchronized()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $def = new Definition('stdClass');
         $this->assertFalse($def->isSynchronized(), '->isSynchronized() returns false by default');
         $this->assertSame($def, $def->setSynchronized(true), '->setSynchronized() implements a fluent interface');
diff --git a/Tests/Dumper/GraphvizDumperTest.php b/Tests/Dumper/GraphvizDumperTest.php
@@ -28,8 +28,6 @@ public static function setUpBeforeClass()
      */
     public function testLegacyDump()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = include self::$fixturesPath.'/containers/legacy-container9.php';
         $dumper = new GraphvizDumper($container);
         $this->assertEquals(str_replace('%path%', __DIR__, file_get_contents(self::$fixturesPath.'/graphviz/legacy-services9.dot')), $dumper->dump(), '->dump() dumps services');
diff --git a/Tests/Dumper/PhpDumperTest.php b/Tests/Dumper/PhpDumperTest.php
@@ -129,8 +129,6 @@ public function testAddService()
      */
     public function testLegacySynchronizedServices()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = include self::$fixturesPath.'/containers/container20.php';
         $dumper = new PhpDumper($container);
         $this->assertEquals(str_replace('%path%', str_replace('\\', '\\\\', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), file_get_contents(self::$fixturesPath.'/php/services20.php')), $dumper->dump(), '->dump() dumps services');
diff --git a/Tests/Dumper/XmlDumperTest.php b/Tests/Dumper/XmlDumperTest.php
@@ -49,8 +49,6 @@ public function testAddParameters()
      */
     public function testLegacyAddService()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = include self::$fixturesPath.'/containers/legacy-container9.php';
         $dumper = new XmlDumper($container);
 
diff --git a/Tests/Dumper/YamlDumperTest.php b/Tests/Dumper/YamlDumperTest.php
@@ -45,8 +45,6 @@ public function testAddParameters()
      */
     public function testLegacyAddService()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = include self::$fixturesPath.'/containers/legacy-container9.php';
         $dumper = new YamlDumper($container);
 
diff --git a/Tests/LegacyContainerBuilderTest.php b/Tests/LegacyContainerBuilderTest.php
@@ -19,11 +19,6 @@
  */
 class LegacyContainerBuilderTest extends \PHPUnit_Framework_TestCase
 {
-    protected function setUp()
-    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-    }
-
     /**
      * @covers Symfony\Component\DependencyInjection\ContainerBuilder::createService
      */
diff --git a/Tests/LegacyDefinitionTest.php b/Tests/LegacyDefinitionTest.php
@@ -18,11 +18,6 @@
  */
 class LegacyDefinitionTest extends \PHPUnit_Framework_TestCase
 {
-    protected function setUp()
-    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-    }
-
     public function testSetGetFactoryClass()
     {
         $def = new Definition('stdClass');
diff --git a/Tests/Loader/XmlFileLoaderTest.php b/Tests/Loader/XmlFileLoaderTest.php
@@ -195,8 +195,6 @@ public function testLoadAnonymousServices()
      */
     public function testLegacyLoadServices()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = new ContainerBuilder();
         $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
         $loader->load('legacy-services6.xml');
diff --git a/Tests/Loader/YamlFileLoaderTest.php b/Tests/Loader/YamlFileLoaderTest.php
@@ -124,8 +124,6 @@ public function testLoadImports()
      */
     public function testLegacyLoadServices()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = new ContainerBuilder();
         $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('legacy-services6.yml');

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,6 @@ public function testProcessDetectsNonSyntheticNonAbstractDefinitionWithoutClass(`
`56`	`56`	`*/`
`57`	`57`	`public function testLegacyProcessDetectsBothFactorySyntaxesUsed()`
`58`	`58`	`{`
`59`		`- $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`60`		`-`
`61`	`59`	`$container = new ContainerBuilder();`
`62`	`60`	`$container->register('a')->setFactory(array('a', 'b'))->setFactoryClass('a');`
`63`	`61`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,6 @@ class LegacyResolveParameterPlaceHoldersPassTest extends \PHPUnit_Framework_Test`
`21`	`21`	`{`
`22`	`22`	`public function testFactoryClassParametersShouldBeResolved()`
`23`	`23`	`{`
`24`		`- $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`25`		`-`
`26`	`24`	`$compilerPass = new ResolveParameterPlaceHoldersPass();`
`27`	`25`
`28`	`26`	`$container = new ContainerBuilder();`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,6 @@ public function getPropertyTests()`
`55`	`55`	`*/`
`56`	`56`	`public function testLegacySetProperty($property, $changeKey)`
`57`	`57`	`{`
`58`		`- $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`59`		`-`
`60`	`58`	`$def = new DefinitionDecorator('foo');`
`61`	`59`
`62`	`60`	`$getter = 'get'.ucfirst($property);`
Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,6 @@ public function testSetIsSynthetic()`
`170`	`170`	`*/`
`171`	`171`	`public function testLegacySetIsSynchronized()`
`172`	`172`	`{`
`173`		`- $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`174`		`-`
`175`	`173`	`$def = new Definition('stdClass');`
`176`	`174`	`$this->assertFalse($def->isSynchronized(), '->isSynchronized() returns false by default');`
`177`	`175`	`$this->assertSame($def, $def->setSynchronized(true), '->setSynchronized() implements a fluent interface');`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@ public static function setUpBeforeClass()`
`28`	`28`	`*/`
`29`	`29`	`public function testLegacyDump()`
`30`	`30`	`{`
`31`		`- $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`32`		`-`
`33`	`31`	`$container = include self::$fixturesPath.'/containers/legacy-container9.php';`
`34`	`32`	`$dumper = new GraphvizDumper($container);`
`35`	`33`	`$this->assertEquals(str_replace('%path%', __DIR__, file_get_contents(self::$fixturesPath.'/graphviz/legacy-services9.dot')), $dumper->dump(), '->dump() dumps services');`
Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,6 @@ public function testAddService()`
`129`	`129`	`*/`
`130`	`130`	`public function testLegacySynchronizedServices()`
`131`	`131`	`{`
`132`		`- $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`133`		`-`
`134`	`132`	`$container = include self::$fixturesPath.'/containers/container20.php';`
`135`	`133`	`$dumper = new PhpDumper($container);`
`136`	`134`	`$this->assertEquals(str_replace('%path%', str_replace('\\', '\\\\', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), file_get_contents(self::$fixturesPath.'/php/services20.php')), $dumper->dump(), '->dump() dumps services');`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,6 @@ public function testAddParameters()`
`49`	`49`	`*/`
`50`	`50`	`public function testLegacyAddService()`
`51`	`51`	`{`
`52`		`- $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`53`		`-`
`54`	`52`	`$container = include self::$fixturesPath.'/containers/legacy-container9.php';`
`55`	`53`	`$dumper = new XmlDumper($container);`
`56`	`54`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,6 @@ public function testAddParameters()`
`45`	`45`	`*/`
`46`	`46`	`public function testLegacyAddService()`
`47`	`47`	`{`
`48`		`- $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`49`		`-`
`50`	`48`	`$container = include self::$fixturesPath.'/containers/legacy-container9.php';`
`51`	`49`	`$dumper = new YamlDumper($container);`
`52`	`50`