Merge branch '2.5' into 2.6

fabpot · fabpot · commit d63f37b5fd80 · 2015-01-05T18:57:42.000+01:00
* 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.
diff --git a/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php b/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php
@@ -17,7 +17,7 @@
  * @since  2.5.4
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class LegacyUserPasswordValidatorLegacyApiTest extends UserPasswordValidatorTest
+class LegacyUserPasswordValidatorApiTest extends UserPasswordValidatorTest
 {
     protected function getApiVersion()
     {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`* @since 2.5.4`
`18`	`18`	`* @author Bernhard Schussek <[email protected]>`
`19`	`19`	`*/`
`20`		`-class LegacyUserPasswordValidatorLegacyApiTest extends UserPasswordValidatorTest`
	`20`	`+class LegacyUserPasswordValidatorApiTest extends UserPasswordValidatorTest`
`21`	`21`	`{`
`22`	`22`	`protected function getApiVersion()`
`23`	`23`	`{`