summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-12-30 14:34:24 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2014-12-30 14:34:24 +0100
commit6e96a175c73cad7542ca394b821e5fd912919dec (patch)
tree001d94bbb940a4bc9f07e96098d0fdf416a1ba41
parent732645f4a8842f05116687e61c013307f1de2ea5 (diff)
parent66b3190f2c91508e73f4181fe4b718d19587346b (diff)
downloadsymfony-security-6e96a175c73cad7542ca394b821e5fd912919dec.zip
symfony-security-6e96a175c73cad7542ca394b821e5fd912919dec.tar.gz
symfony-security-6e96a175c73cad7542ca394b821e5fd912919dec.tar.bz2
Merge branch '2.6' into 2.7
* 2.6: [Form] Remove a redundant test. use value of DIRECTORY_SEPARATOR to detect Windows
-rw-r--r--Core/Util/SecureRandom.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Util/SecureRandom.php b/Core/Util/SecureRandom.php
index aefc888..c0924df 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') && PHP_VERSION_ID < 50304) {
+ if ('\\' === DIRECTORY_SEPARATOR && PHP_VERSION_ID < 50304) {
$this->useOpenSsl = false;
} elseif (!function_exists('openssl_random_pseudo_bytes')) {
if (null !== $this->logger) {