Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 820360455bc7 · 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/LegacySecurityContextTest.php b/Tests/LegacySecurityContextTest.php
@@ -26,8 +26,6 @@ class LegacySecurityContextTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $this->tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
         $this->authorizationChecker = $this->getMock('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface');
         $this->securityContext = new SecurityContext($this->tokenStorage, $this->authorizationChecker);

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@ class LegacySecurityContextTest 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->tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');`
`32`	`30`	`$this->authorizationChecker = $this->getMock('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface');`
`33`	`31`	`$this->securityContext = new SecurityContext($this->tokenStorage, $this->authorizationChecker);`