diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-11-28 11:00:40 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-11-28 11:00:40 +0100 |
| commit | c2c3bd12e70eb8c74471ecba8254057b12affb1e (patch) | |
| tree | 780c68ce6a97cf3d54c83492af1eeae841190814 /Csrf | |
| parent | c166708544d3bc21031c46fbe6a7aea3ac4bc6f5 (diff) | |
| parent | c560c7874252784dc23f8722a52fd4e3a027f117 (diff) | |
| download | symfony-security-c2c3bd12e70eb8c74471ecba8254057b12affb1e.zip symfony-security-c2c3bd12e70eb8c74471ecba8254057b12affb1e.tar.gz symfony-security-c2c3bd12e70eb8c74471ecba8254057b12affb1e.tar.bz2 | |
Merge branch '2.5' into 2.6v2.6.0
* 2.5:
[Debug] fix error message on double exception
Fix initialized() with aliased services
Rename Symfony2 to Symfony
compare version using PHP_VERSION_ID
backport #12489
remove an unneeded check
Diffstat (limited to 'Csrf')
| -rw-r--r-- | Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php | 2 | ||||
| -rw-r--r-- | Csrf/TokenStorage/NativeSessionTokenStorage.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php b/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php index 724806c..7ae2779 100644 --- a/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php +++ b/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php @@ -51,7 +51,7 @@ class NativeSessionTokenStorageTest extends \PHPUnit_Framework_TestCase public function testStoreTokenInClosedSessionWithExistingSessionId() { - if (version_compare(PHP_VERSION, '5.4', '<')) { + if (PHP_VERSION_ID < 50400) { $this->markTestSkipped('This test requires PHP 5.4 or later.'); } diff --git a/Csrf/TokenStorage/NativeSessionTokenStorage.php b/Csrf/TokenStorage/NativeSessionTokenStorage.php index af5931b..bb1a417 100644 --- a/Csrf/TokenStorage/NativeSessionTokenStorage.php +++ b/Csrf/TokenStorage/NativeSessionTokenStorage.php @@ -108,7 +108,7 @@ class NativeSessionTokenStorage implements TokenStorageInterface private function startSession() { - if (version_compare(PHP_VERSION, '5.4', '>=')) { + if (PHP_VERSION_ID >= 50400) { if (PHP_SESSION_NONE === session_status()) { session_start(); } |