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/Tests/Encoder/BCryptPasswordEncoderTest.php | |
| 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/Tests/Encoder/BCryptPasswordEncoderTest.php')
| -rw-r--r-- | Core/Tests/Encoder/BCryptPasswordEncoderTest.php | 2 |
1 files changed, 1 insertions, 1 deletions
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'); } } |