Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit d965ec7

Browse files
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.
2 parents 79471f9 + df42c78 commit d965ec7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorLegacyApiTest.php renamed to Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @since 2.5.4
1818
* @author Bernhard Schussek <[email protected]>
1919
*/
20-
class LegacyUserPasswordValidatorLegacyApiTest extends UserPasswordValidatorTest
20+
class LegacyUserPasswordValidatorApiTest extends UserPasswordValidatorTest
2121
{
2222
protected function getApiVersion()
2323
{

Tests/Core/LegacySecurityContextInterfaceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class LegacySecurityContextInterfaceTest extends \PHPUnit_Framework_TestCase
2121
*/
2222
public function testConstantSync()
2323
{
24-
$this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
24+
$this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
2525

2626
$this->assertSame(Security::ACCESS_DENIED_ERROR, SecurityContextInterface::ACCESS_DENIED_ERROR);
2727
$this->assertSame(Security::AUTHENTICATION_ERROR, SecurityContextInterface::AUTHENTICATION_ERROR);

0 commit comments

Comments
 (0)