summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-08-02 09:53:48 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2014-08-02 09:53:48 +0200
commit5a4f252c4470b0d4e2fc23bb06752ae1559b97a3 (patch)
treea7ec14510c528b36ee2750d5da6bdd59cc73d225
parent6c176dccbc44f5bd11ffc5613e6c4d023c3971b1 (diff)
parent4bfc7e3e37c3d57591f439057c4f3e94e99c0c7c (diff)
downloadsymfony-security-5a4f252c4470b0d4e2fc23bb06752ae1559b97a3.zip
symfony-security-5a4f252c4470b0d4e2fc23bb06752ae1559b97a3.tar.gz
symfony-security-5a4f252c4470b0d4e2fc23bb06752ae1559b97a3.tar.bz2
minor #11483 fix some docblocks (xabbuh)
This PR was merged into the 2.3 branch. Discussion ---------- fix some docblocks | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 1775da5 fix some docblocks
-rw-r--r--Acl/Dbal/MutableAclProvider.php6
-rw-r--r--Core/Encoder/BCryptPasswordEncoder.php2
-rw-r--r--Core/Encoder/BasePasswordEncoder.php2
3 files changed, 7 insertions, 3 deletions
diff --git a/Acl/Dbal/MutableAclProvider.php b/Acl/Dbal/MutableAclProvider.php
index 42803ac..b8f5fb8 100644
--- a/Acl/Dbal/MutableAclProvider.php
+++ b/Acl/Dbal/MutableAclProvider.php
@@ -801,12 +801,12 @@ QUERY;
}
/**
- * 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($ane, array $changes)
+ private function updateOldFieldAceProperty($name, array $changes)
{
$currentIds = array();
foreach ($changes[1] as $field => $new) {
diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php
index 1dcf3a6..27a7334 100644
--- a/Core/Encoder/BCryptPasswordEncoder.php
+++ b/Core/Encoder/BCryptPasswordEncoder.php
@@ -61,6 +61,8 @@ class BCryptPasswordEncoder extends BasePasswordEncoder
*
* @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
index b27c2b0..5bf223b 100644
--- a/Core/Encoder/BasePasswordEncoder.php
+++ b/Core/Encoder/BasePasswordEncoder.php
@@ -89,6 +89,8 @@ abstract class BasePasswordEncoder implements PasswordEncoderInterface
/**
* Checks if the password is too long.
*
+ * @param string $password The password to check
+ *
* @return bool true if the password is too long, false otherwise
*/
protected function isPasswordTooLong($password)