summaryrefslogtreecommitdiffstats
path: root/Core
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2015-01-05 18:57:42 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2015-01-05 18:57:42 +0100
commitd63f37b5fd805ebd025203eca4b02e2803f18e69 (patch)
tree536bd2928472cf3367467eb3ca2827660a445594 /Core
parent887bcdd527e7a428d5073db41213d18cdc10b8ef (diff)
parent4e37bf92e4581c109cf940f88b5aa24e51d0404e (diff)
downloadsymfony-security-d63f37b5fd805ebd025203eca4b02e2803f18e69.zip
symfony-security-d63f37b5fd805ebd025203eca4b02e2803f18e69.tar.gz
symfony-security-d63f37b5fd805ebd025203eca4b02e2803f18e69.tar.bz2
Merge branch '2.5' into 2.6
* 2.5: [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 'Core')
-rw-r--r--Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php (renamed from Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorLegacyApiTest.php)2
1 files changed, 1 insertions, 1 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()
{