Merge branch '2.5' into 2.6v2.6.0-BETA2

* 2.5: [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 [Session] Fix parameter names in WriteCheckSessionHandler Add consistency with request type checking [FrameworkBundle] Fix server run in case the router script does not exist Conflicts: composer.json src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/Debug/ExceptionHandler.php
author: Fabien Potencier <fabien.potencier@gmail.com> 2014-11-20 14:24:23 +0100
committer: Fabien Potencier <fabien.potencier@gmail.com> 2014-11-20 14:24:23 +0100
commit: b3fc90d88bd2fe87ac8049c8e363c73781248866 (patch)
tree: e5b0e7a190fdda09c8d9d7c9f6aba84b2f067b4b
parent: e3edd18b37e848d4870c521f53746de8acb5eed1 (diff)
parent: 4fb524b3675e3fc507a841e82b3344be050f5030 (diff)
download: symfony-security-b3fc90d88bd2fe87ac8049c8e363c73781248866.zip
symfony-security-b3fc90d88bd2fe87ac8049c8e363c73781248866.tar.gz
symfony-security-b3fc90d88bd2fe87ac8049c8e363c73781248866.tar.bz2
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>
author	Fabien Potencier <fabien.potencier@gmail.com>	2014-11-20 14:24:23 +0100
committer	Fabien Potencier <fabien.potencier@gmail.com>	2014-11-20 14:24:23 +0100
commit	b3fc90d88bd2fe87ac8049c8e363c73781248866 (patch)
tree	e5b0e7a190fdda09c8d9d7c9f6aba84b2f067b4b
parent	e3edd18b37e848d4870c521f53746de8acb5eed1 (diff)
parent	4fb524b3675e3fc507a841e82b3344be050f5030 (diff)
download	symfony-security-b3fc90d88bd2fe87ac8049c8e363c73781248866.zip symfony-security-b3fc90d88bd2fe87ac8049c8e363c73781248866.tar.gz symfony-security-b3fc90d88bd2fe87ac8049c8e363c73781248866.tar.bz2