diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-11-20 14:22:25 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-11-20 14:22:25 +0100 |
| commit | 4fb524b3675e3fc507a841e82b3344be050f5030 (patch) | |
| tree | d88168aaf924e59a2b69fde24cdd90c0b4b0c03f /Core | |
| parent | 646fe0c990f619ec433d9f048cb5fdd173bb4e85 (diff) | |
| parent | c54f038a64896f2963a4412974b10cd341ac6e73 (diff) | |
| download | symfony-security-4fb524b3675e3fc507a841e82b3344be050f5030.zip symfony-security-4fb524b3675e3fc507a841e82b3344be050f5030.tar.gz symfony-security-4fb524b3675e3fc507a841e82b3344be050f5030.tar.bz2 | |
Merge branch '2.3' into 2.5v2.5.7
* 2.3:
[SecurityBundle] Authentication entry point is only registered with firewall exception listener, not with authentication listeners
be smarter when guessing the document root
Azerbaijani locale
Fixed grammar error in docblock
Adjust upgrade file rendering
[Bridge/Propel1] Changed deps to accepts all upcoming propel1 versions
compare version using PHP_VERSION_ID
[Form] Add doc for FormEvents
don't override internal PHP constants
Conflicts:
UPGRADE-3.0.md
src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/HttpFoundation/Response.php
Diffstat (limited to 'Core')
| -rw-r--r-- | Core/Resources/translations/security.az.xlf | 71 | ||||
| -rw-r--r-- | Core/Tests/Encoder/BCryptPasswordEncoderTest.php | 2 | ||||
| -rw-r--r-- | Core/Util/SecureRandom.php | 2 |
3 files changed, 73 insertions, 2 deletions
diff --git a/Core/Resources/translations/security.az.xlf b/Core/Resources/translations/security.az.xlf new file mode 100644 index 0000000..a974ed0 --- /dev/null +++ b/Core/Resources/translations/security.az.xlf @@ -0,0 +1,71 @@ +<?xml version="1.0"?> +<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"> + <file source-language="en" datatype="plaintext" original="file.ext"> + <body> + <trans-unit id="1"> + <source>An authentication exception occurred.</source> + <target>Doğrulama istisnası baş verdi.</target> + </trans-unit> + <trans-unit id="2"> + <source>Authentication credentials could not be found.</source> + <target>Doğrulama məlumatları tapılmadı.</target> + </trans-unit> + <trans-unit id="3"> + <source>Authentication request could not be processed due to a system problem.</source> + <target>Sistem xətası səbəbilə doğrulama istəyi emal edilə bilmədi.</target> + </trans-unit> + <trans-unit id="4"> + <source>Invalid credentials.</source> + <target>Yanlış məlumat.</target> + </trans-unit> + <trans-unit id="5"> + <source>Cookie has already been used by someone else.</source> + <target>Kuki başqası tərəfindən istifadə edilib.</target> + </trans-unit> + <trans-unit id="6"> + <source>Not privileged to request the resource.</source> + <target>Resurs istəyi üçün imtiyaz yoxdur.</target> + </trans-unit> + <trans-unit id="7"> + <source>Invalid CSRF token.</source> + <target>Yanlış CSRF nişanı.</target> + </trans-unit> + <trans-unit id="8"> + <source>Digest nonce has expired.</source> + <target>Dərləmə istifadə müddəti bitib.</target> + </trans-unit> + <trans-unit id="9"> + <source>No authentication provider found to support the authentication token.</source> + <target>Doğrulama nişanını dəstəkləyəcək provayder tapılmadı.</target> + </trans-unit> + <trans-unit id="10"> + <source>No session available, it either timed out or cookies are not enabled.</source> + <target>Uyğun seans yoxdur, vaxtı keçib və ya kuki aktiv deyil.</target> + </trans-unit> + <trans-unit id="11"> + <source>No token could be found.</source> + <target>Nişan tapılmadı.</target> + </trans-unit> + <trans-unit id="12"> + <source>Username could not be found.</source> + <target>İstifadəçi adı tapılmadı.</target> + </trans-unit> + <trans-unit id="13"> + <source>Account has expired.</source> + <target>Hesabın istifadə müddəti bitib.</target> + </trans-unit> + <trans-unit id="14"> + <source>Credentials have expired.</source> + <target>Məlumatların istifadə müddəti bitib.</target> + </trans-unit> + <trans-unit id="15"> + <source>Account is disabled.</source> + <target>Hesab qeyri-aktiv edilib.</target> + </trans-unit> + <trans-unit id="16"> + <source>Account is locked.</source> + <target>Hesab kilitlənib.</target> + </trans-unit> + </body> + </file> +</xliff> diff --git a/Core/Tests/Encoder/BCryptPasswordEncoderTest.php b/Core/Tests/Encoder/BCryptPasswordEncoderTest.php index 2213dc5..2f7b845 100644 --- a/Core/Tests/Encoder/BCryptPasswordEncoderTest.php +++ b/Core/Tests/Encoder/BCryptPasswordEncoderTest.php @@ -66,7 +66,7 @@ class BCryptPasswordEncoderTest extends \PHPUnit_Framework_TestCase private function skipIfPhpVersionIsNotSupported() { - if (version_compare(phpversion(), '5.3.7', '<')) { + if (PHP_VERSION_ID < 50307) { $this->markTestSkipped('Requires PHP >= 5.3.7'); } } diff --git a/Core/Util/SecureRandom.php b/Core/Util/SecureRandom.php index 841b9af..aefc888 100644 --- a/Core/Util/SecureRandom.php +++ b/Core/Util/SecureRandom.php @@ -43,7 +43,7 @@ final class SecureRandom implements SecureRandomInterface $this->logger = $logger; // determine whether to use OpenSSL - if (defined('PHP_WINDOWS_VERSION_BUILD') && version_compare(PHP_VERSION, '5.3.4', '<')) { + if (defined('PHP_WINDOWS_VERSION_BUILD') && PHP_VERSION_ID < 50304) { $this->useOpenSsl = false; } elseif (!function_exists('openssl_random_pseudo_bytes')) { if (null !== $this->logger) { |