Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit d64c66b7d5c5 · 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/DataCollector/SecurityDataCollectorTest.php b/Tests/DataCollector/SecurityDataCollectorTest.php
@@ -45,8 +45,6 @@ public function testCollectWhenAuthenticationTokenIsNull()
      */
     public function testLegacyCollectWhenAuthenticationTokenIsNull()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $tokenStorage = $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface');
         $collector = new SecurityDataCollector($tokenStorage, $this->getRoleHierarchy());
         $collector->collect($this->getRequest(), $this->getResponse());

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,6 @@ public function testCollectWhenAuthenticationTokenIsNull()`
`45`	`45`	`*/`
`46`	`46`	`public function testLegacyCollectWhenAuthenticationTokenIsNull()`
`47`	`47`	`{`
`48`		`- $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`49`		`-`
`50`	`48`	`$tokenStorage = $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface');`
`51`	`49`	`$collector = new SecurityDataCollector($tokenStorage, $this->getRoleHierarchy());`
`52`	`50`	`$collector->collect($this->getRequest(), $this->getResponse());`