Merge branch '2.4' into 2.5

webmozart · webmozart · commit 03a7d1911cc0 · 2014-08-05T11:00:40.000+02:00
* 2.4: (24 commits)
  [Validator] Added Swedish translations
  Fix incorrect romanian plural translations
  fix axes handling in Crawler::filterXPath()
  fix some docblocks
  Fixed self-reference in 'service_container' service breaks garbage collection (and clone).
  [Process] Fix tests when pcntl is not available.
  [DependencyInjection] Roll back changes made to generated files.
  [Console] Roll back changes made to fixture files.
  Issue #11489 Added some CA and ES translations
  [Validator] Added more detailed inline documentation
  [Validator] Removed information from the violation output if the value is an array, object or resource
  partially reverted previous commit
  fixed CS
  properly handle null data when denormalizing
  [Validator] Renamed valueToString() to formatValue(); added missing formatValue() calls
  [Validator] Fixed CS
  [Validator] Fixed date-to-string conversion tests to match ICU 51
  [Validator] Added "{{ value }}" parameters where they were missing
  [Validator] Simplified and explained the LuhnValidator
  [Validator] Simplified IssnValidator
  ...

Conflicts:
	src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
	src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
	src/Symfony/Component/Validator/Constraints/FileValidator.php
	src/Symfony/Component/Validator/Constraints/Isbn.php
	src/Symfony/Component/Validator/Constraints/IsbnValidator.php
	src/Symfony/Component/Validator/Constraints/LengthValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
	src/Symfony/Component/Validator/Tests/Constraints/BlankValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/FalseValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/FileValidatorPathTest.php
	src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/NullValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/TrueValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
diff --git a/Acl/Dbal/MutableAclProvider.php b/Acl/Dbal/MutableAclProvider.php
@@ -865,10 +865,10 @@ private function updateNewFieldAceProperty($name, array $changes)
     }
 
     /**
-     * This process old entries changes on an ACE related property (classFieldAces, or objectFieldAces).
+     * This processes old entries changes on an ACE related property (classFieldAces, or objectFieldAces).
      *
      * @param string $name
-     * @param array $changes
+     * @param array  $changes
      */
     private function updateOldFieldAceProperty($name, array $changes)
     {
diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php
@@ -61,6 +61,8 @@ public function __construct($cost)
      *
      * @return string The encoded password
      *
+     * @throws BadCredentialsException when the given password is too long
+     *
      * @link http://lxr.php.net/xref/PHP_5_5/ext/standard/password.c#111
      */
     public function encodePassword($raw, $salt)
diff --git a/Core/Encoder/BasePasswordEncoder.php b/Core/Encoder/BasePasswordEncoder.php
@@ -89,7 +89,7 @@ protected function comparePasswords($password1, $password2)
     /**
      * Checks if the password is too long.
      *
-     * @param string $password The password
+     * @param string $password The password to check
      *
      * @return bool true if the password is too long, false otherwise
      */

Original file line number	Diff line number	Diff line change
`@@ -865,10 +865,10 @@ private function updateNewFieldAceProperty($name, array $changes)`
`865`	`865`	`}`
`866`	`866`
`867`	`867`	`/**`
`868`		`- * This process old entries changes on an ACE related property (classFieldAces, or objectFieldAces).`
	`868`	`+ * This processes old entries changes on an ACE related property (classFieldAces, or objectFieldAces).`
`869`	`869`	`*`
`870`	`870`	`* @param string $name`
`871`		`- * @param array $changes`
	`871`	`+ * @param array $changes`
`872`	`872`	`*/`
`873`	`873`	`private function updateOldFieldAceProperty($name, array $changes)`
`874`	`874`	`{`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,8 @@ public function __construct($cost)`
`61`	`61`	`*`
`62`	`62`	`* @return string The encoded password`
`63`	`63`	`*`
	`64`	`+ * @throws BadCredentialsException when the given password is too long`
	`65`	`+ *`
`64`	`66`	`* @link http://lxr.php.net/xref/PHP_5_5/ext/standard/password.c#111`
`65`	`67`	`*/`
`66`	`68`	`public function encodePassword($raw, $salt)`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ protected function comparePasswords($password1, $password2)`
`89`	`89`	`/**`
`90`	`90`	`* Checks if the password is too long.`
`91`	`91`	`*`
`92`		`- * @param string $password The password`
	`92`	`+ * @param string $password The password to check`
`93`	`93`	`*`
`94`	`94`	`* @return bool true if the password is too long, false otherwise`
`95`	`95`	`*/`