summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Grekas <nicolas.grekas@gmail.com>2015-06-19 17:09:14 +0200
committerNicolas Grekas <nicolas.grekas@gmail.com>2015-06-19 17:09:14 +0200
commitc839c1382bfd96b6a356a2e9498bf5bd1ff775c1 (patch)
tree851660e149b7933643fc015a17b5a4d072861241
parente92b6d4fee8cb5a22a33230897153bf290b3c4c9 (diff)
parenta98ce20e9fe75a27039c6a52b9e9ca96aeb71aff (diff)
downloadsymfony-security-c839c1382bfd96b6a356a2e9498bf5bd1ff775c1.zip
symfony-security-c839c1382bfd96b6a356a2e9498bf5bd1ff775c1.tar.gz
symfony-security-c839c1382bfd96b6a356a2e9498bf5bd1ff775c1.tar.bz2
Merge branch '2.7' into 2.8
* 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
-rw-r--r--Core/Tests/LegacySecurityContextTest.php2
-rw-r--r--Tests/Core/LegacySecurityContextInterfaceTest.php2
2 files changed, 0 insertions, 4 deletions
diff --git a/Core/Tests/LegacySecurityContextTest.php b/Core/Tests/LegacySecurityContextTest.php
index f1f7861..c5da22d 100644
--- a/Core/Tests/LegacySecurityContextTest.php
+++ b/Core/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);
diff --git a/Tests/Core/LegacySecurityContextInterfaceTest.php b/Tests/Core/LegacySecurityContextInterfaceTest.php
index 3fad2b1..57517bf 100644
--- a/Tests/Core/LegacySecurityContextInterfaceTest.php
+++ b/Tests/Core/LegacySecurityContextInterfaceTest.php
@@ -24,8 +24,6 @@ class LegacySecurityContextInterfaceTest extends \PHPUnit_Framework_TestCase
*/
public function testConstantSync()
{
- $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
$this->assertSame(Security::ACCESS_DENIED_ERROR, SecurityContextInterface::ACCESS_DENIED_ERROR);
$this->assertSame(Security::AUTHENTICATION_ERROR, SecurityContextInterface::AUTHENTICATION_ERROR);
$this->assertSame(Security::LAST_USERNAME, SecurityContextInterface::LAST_USERNAME);