diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-01-05 19:25:37 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-01-05 19:25:37 +0100 |
| commit | d965ec7a3c921382741120027a4a0f7b5b05c09a (patch) | |
| tree | 7dfdf5fa38cb8460f29f7efc5e62ba82cd8819e5 /Tests | |
| parent | 79471f92de28ed0acf9cce11051ebc47964acfbb (diff) | |
| parent | df42c78ad58cdb55207422d3d34925f8eb02374d (diff) | |
| download | symfony-security-d965ec7a3c921382741120027a4a0f7b5b05c09a.zip symfony-security-d965ec7a3c921382741120027a4a0f7b5b05c09a.tar.gz symfony-security-d965ec7a3c921382741120027a4a0f7b5b05c09a.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
[2.6] fix deprecation silencing...
[Form] fix Context\ExecutionContextInterface mock
[Validator] marks TraversalStrategy::STOP_RECURSION constant internal as it has been introduced for the BC layer and will be removed in 3.0.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Core/LegacySecurityContextInterfaceTest.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/Core/LegacySecurityContextInterfaceTest.php b/Tests/Core/LegacySecurityContextInterfaceTest.php index 764a43d..8f68475 100644 --- a/Tests/Core/LegacySecurityContextInterfaceTest.php +++ b/Tests/Core/LegacySecurityContextInterfaceTest.php @@ -21,7 +21,7 @@ class LegacySecurityContextInterfaceTest extends \PHPUnit_Framework_TestCase */ public function testConstantSync() { - $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED); + $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); |