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

Commit 021514d

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: (22 commits) 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. [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 [Validator] Fixed and simplified IsbnValidator [Validator] Simplified IBAN validation algorithm ... Conflicts: src/Symfony/Component/Console/Helper/DescriptorHelper.php src/Symfony/Component/DependencyInjection/Container.php src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php src/Symfony/Component/HttpFoundation/File/UploadedFile.php src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php src/Symfony/Component/Validator/Constraints/CollectionValidator.php src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php
2 parents 5040c1c + 5a4f252 commit 021514d

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

Acl/Dbal/MutableAclProvider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -801,12 +801,12 @@ private function updateNewFieldAceProperty($name, array $changes)
801801
}
802802

803803
/**
804-
* This process old entries changes on an ACE related property (classFieldAces, or objectFieldAces).
804+
* This processes old entries changes on an ACE related property (classFieldAces, or objectFieldAces).
805805
*
806806
* @param string $name
807-
* @param array $changes
807+
* @param array $changes
808808
*/
809-
private function updateOldFieldAceProperty($ane, array $changes)
809+
private function updateOldFieldAceProperty($name, array $changes)
810810
{
811811
$currentIds = array();
812812
foreach ($changes[1] as $field => $new) {

Core/Encoder/BCryptPasswordEncoder.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ public function __construct($cost)
6161
*
6262
* @return string The encoded password
6363
*
64+
* @throws BadCredentialsException when the given password is too long
65+
*
6466
* @link http://lxr.php.net/xref/PHP_5_5/ext/standard/password.c#111
6567
*/
6668
public function encodePassword($raw, $salt)

Core/Encoder/BasePasswordEncoder.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ protected function comparePasswords($password1, $password2)
8989
/**
9090
* Checks if the password is too long.
9191
*
92+
* @param string $password The password to check
93+
*
9294
* @return bool true if the password is too long, false otherwise
9395
*/
9496
protected function isPasswordTooLong($password)

0 commit comments

Comments
 (0)