Merge branch '4.2'
* 4.2: fix pruning pdo cache for vendors that throw on execute Fix typo in translation Declare exceptions that are already thrown by implementations
This commit is contained in:
commit
23fe9c89db
@ -165,8 +165,11 @@ trait PdoTrait
|
|||||||
if ('' !== $this->namespace) {
|
if ('' !== $this->namespace) {
|
||||||
$delete->bindValue(':namespace', sprintf('%s%%', $this->namespace), \PDO::PARAM_STR);
|
$delete->bindValue(':namespace', sprintf('%s%%', $this->namespace), \PDO::PARAM_STR);
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
return $delete->execute();
|
return $delete->execute();
|
||||||
|
} catch (TableNotFoundException $e) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -11,6 +11,8 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Security\Core\Encoder;
|
namespace Symfony\Component\Security\Core\Encoder;
|
||||||
|
|
||||||
|
use Symfony\Component\Security\Core\Exception\BadCredentialsException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* PasswordEncoderInterface is the interface for all encoders.
|
* PasswordEncoderInterface is the interface for all encoders.
|
||||||
*
|
*
|
||||||
@ -25,6 +27,9 @@ interface PasswordEncoderInterface
|
|||||||
* @param string $salt The salt
|
* @param string $salt The salt
|
||||||
*
|
*
|
||||||
* @return string The encoded password
|
* @return string The encoded password
|
||||||
|
*
|
||||||
|
* @throws BadCredentialsException If the raw password is invalid, e.g. excessively long
|
||||||
|
* @throws \InvalidArgumentException If the salt is invalid
|
||||||
*/
|
*/
|
||||||
public function encodePassword($raw, $salt);
|
public function encodePassword($raw, $salt);
|
||||||
|
|
||||||
@ -36,6 +41,8 @@ interface PasswordEncoderInterface
|
|||||||
* @param string $salt The salt
|
* @param string $salt The salt
|
||||||
*
|
*
|
||||||
* @return bool true if the password is valid, false otherwise
|
* @return bool true if the password is valid, false otherwise
|
||||||
|
*
|
||||||
|
* @throws \InvalidArgumentException If the salt is invalid
|
||||||
*/
|
*/
|
||||||
public function isPasswordValid($encoded, $raw, $salt);
|
public function isPasswordValid($encoded, $raw, $salt);
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="4">
|
<trans-unit id="4">
|
||||||
<source>Invalid credentials.</source>
|
<source>Invalid credentials.</source>
|
||||||
<target>Ugyldig påloggingsinformasjonen.</target>
|
<target>Ugyldig påloggingsinformasjon.</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="5">
|
<trans-unit id="5">
|
||||||
<source>Cookie has already been used by someone else.</source>
|
<source>Cookie has already been used by someone else.</source>
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="4">
|
<trans-unit id="4">
|
||||||
<source>Invalid credentials.</source>
|
<source>Invalid credentials.</source>
|
||||||
<target>Ugyldig påloggingsinformasjonen.</target>
|
<target>Ugyldig påloggingsinformasjon.</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="5">
|
<trans-unit id="5">
|
||||||
<source>Cookie has already been used by someone else.</source>
|
<source>Cookie has already been used by someone else.</source>
|
||||||
|
Reference in New Issue
Block a user