diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-30 14:34:16 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-30 14:34:16 +0100 |
| commit | 66b3190f2c91508e73f4181fe4b718d19587346b (patch) | |
| tree | 5c25915e6308ac80f7b291a881b0cacdc3416681 /Core/Util | |
| parent | be21bcbd329bb50afa7c91a7d7d4e3c49caaca57 (diff) | |
| parent | 381d069e464bb34f3a9748eb2e32d2a1718205af (diff) | |
| download | symfony-security-66b3190f2c91508e73f4181fe4b718d19587346b.zip symfony-security-66b3190f2c91508e73f4181fe4b718d19587346b.tar.gz symfony-security-66b3190f2c91508e73f4181fe4b718d19587346b.tar.bz2 | |
Merge branch '2.5' into 2.6
* 2.5:
[Form] Remove a redundant test.
use value of DIRECTORY_SEPARATOR to detect Windows
Conflicts:
src/Symfony/Component/Process/Process.php
Diffstat (limited to 'Core/Util')
| -rw-r--r-- | Core/Util/SecureRandom.php | 2 |
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) { |