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 files changed, 2 insertions, 2 deletions

diff --git a/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorLegacyApiTest.php b/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php
index 5092a79..5cfe444 100644
--- a/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorLegacyApiTest.php
+++ b/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php
@@ -17,7 +17,7 @@ use Symfony\Component\Validator\Validation;
  * @since  2.5.4
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class LegacyUserPasswordValidatorLegacyApiTest extends UserPasswordValidatorTest
+class LegacyUserPasswordValidatorApiTest extends UserPasswordValidatorTest
 {
     protected function getApiVersion()
     {
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);