summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-11-20 14:24:36 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2014-11-20 14:24:36 +0100
commitfafe52da765633f82ff5ceccdc93f9ec7fc40f5c (patch)
tree7af88ea0143c62f70fb5e7a118dd5ab062a6e639
parent9afb120f9e488c3b7f3c93ab88d2df7bca3f5abc (diff)
parentbe57fad8d257fc0a1f68f222658a1719235750f6 (diff)
downloadsymfony-security-fafe52da765633f82ff5ceccdc93f9ec7fc40f5c.zip
symfony-security-fafe52da765633f82ff5ceccdc93f9ec7fc40f5c.tar.gz
symfony-security-fafe52da765633f82ff5ceccdc93f9ec7fc40f5c.tar.bz2
Merge branch '2.7'
* 2.7: Extract an AbstractEventDispatcherTest from EventDispatcherTest and also use it in ContainerAwareEventDispatcherTest [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 [HttpKernel] fix parse error in DumpDataCollector [TwigBundle/DebugBundle] move dump extension & cleanups 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 *_timezone changes also affect the BirthdayType don't override internal PHP constants Drop support for model_timezone and view_timezone options in TimeType and DateType. [DomCrawler] Added support for link tags in the Link class [Session] Fix parameter names in WriteCheckSessionHandler Add consistency with request type checking [FrameworkBundle] Fix server run in case the router script does not exist
Diffstat
-rw-r--r--Core/Resources/translations/security.az.xlf71
-rw-r--r--Core/Tests/Encoder/BCryptPasswordEncoderTest.php2
-rw-r--r--Core/Util/SecureRandom.php2
-rw-r--r--Resources/translations/security.az.xlf71
4 files changed, 144 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) {
diff --git a/Resources/translations/security.az.xlf b/Resources/translations/security.az.xlf
new file mode 100644
index 0000000..a974ed0
--- /dev/null
+++ b/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>
generated by cgit v1.1 at 2025-05-11 14:13:30 +0000