diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-16 10:08:40 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-16 10:08:40 +0200 |
| commit | 4746383920bc2bb152808092c7a68fb117e12273 (patch) | |
| tree | 7d933d839d3c09834db65daec098f5c77a04a40f /Csrf | |
| parent | f70d3420f4f5bdb9b98ce3c880c7fcd8ccc46918 (diff) | |
| parent | be954bbe63838d3d08885b96547e6081a0773757 (diff) | |
| download | symfony-security-4746383920bc2bb152808092c7a68fb117e12273.zip symfony-security-4746383920bc2bb152808092c7a68fb117e12273.tar.gz symfony-security-4746383920bc2bb152808092c7a68fb117e12273.tar.bz2 | |
Merge branch '2.4'
* 2.4:
made types consistent with those defined in Hack
made {@inheritdoc} annotations consistent across the board
made {@inheritdoc} annotations consistent across the board
fixed types in phpdocs
[Debug] Fixed ClassNotFoundFatalErrorHandler on windows.
made phpdoc types consistent with those defined in Hack
Add support Thai translations
[Validator] Add missing czech translations
made types consistent with those defined in Hack
removed extra/unsupported arguments
[HttpKernel] fixed an error message
[TwigBundle] removed undefined argument
[Translation] Make IcuDatFileLoader/IcuResFileLoader::load invalid resource compatible with HHVM.
Conflicts:
src/Symfony/Component/Console/Helper/TableHelper.php
src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
src/Symfony/Component/Form/FormError.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/Process/ProcessPipes.php
src/Symfony/Component/PropertyAccess/PropertyAccessor.php
src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
src/Symfony/Component/Translation/Dumper/FileDumper.php
src/Symfony/Component/Validator/ConstraintViolation.php
src/Symfony/Component/Validator/Constraints/EmailValidator.php
src/Symfony/Component/Validator/ExecutionContextInterface.php
src/Symfony/Component/Validator/Mapping/BlackholeMetadataFactory.php
Diffstat (limited to 'Csrf')
| -rw-r--r-- | Csrf/TokenGenerator/UriSafeTokenGenerator.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Csrf/TokenGenerator/UriSafeTokenGenerator.php b/Csrf/TokenGenerator/UriSafeTokenGenerator.php index 558273d..1bf72e5 100644 --- a/Csrf/TokenGenerator/UriSafeTokenGenerator.php +++ b/Csrf/TokenGenerator/UriSafeTokenGenerator.php @@ -41,7 +41,7 @@ class UriSafeTokenGenerator implements TokenGeneratorInterface * * @param SecureRandomInterface|null $random The random value generator used for * generating entropy - * @param integer $entropy The amount of entropy collected for + * @param int $entropy The amount of entropy collected for * each token (in bits) */ public function __construct(SecureRandomInterface $random = null, $entropy = 256) |