Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 7b4b8b864406 · 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/LegacyOptionsResolverTest.php b/Tests/LegacyOptionsResolverTest.php
@@ -26,8 +26,6 @@ class LegacyOptionsResolverTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $this->resolver = new OptionsResolver();
     }
 
diff --git a/Tests/LegacyOptionsTest.php b/Tests/LegacyOptionsTest.php
@@ -26,8 +26,6 @@ class LegacyOptionsTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $this->options = new OptionsResolver();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@ class LegacyOptionsResolverTest extends \PHPUnit_Framework_TestCase`
`26`	`26`
`27`	`27`	`protected function setUp()`
`28`	`28`	`{`
`29`		`- $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`30`		`-`
`31`	`29`	`$this->resolver = new OptionsResolver();`
`32`	`30`	`}`
`33`	`31`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@ class LegacyOptionsTest extends \PHPUnit_Framework_TestCase`
`26`	`26`
`27`	`27`	`protected function setUp()`
`28`	`28`	`{`
`29`		`- $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`30`		`-`
`31`	`29`	`$this->options = new OptionsResolver();`
`32`	`30`	`}`
`33`	`31`