diff options
Diffstat (limited to 'Csrf')
| -rw-r--r-- | Csrf/README.md | 2 | ||||
| -rw-r--r-- | Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php | 4 | ||||
| -rw-r--r-- | Csrf/TokenStorage/NativeSessionTokenStorage.php | 6 | ||||
| -rw-r--r-- | Csrf/composer.json | 10 |
4 files changed, 7 insertions, 15 deletions
diff --git a/Csrf/README.md b/Csrf/README.md index 30d7bb2..85f9114 100644 --- a/Csrf/README.md +++ b/Csrf/README.md @@ -9,7 +9,7 @@ Resources Documentation: -http://symfony.com/doc/2.7/book/security.html +http://symfony.com/doc/3.0/book/security.html Tests ----- diff --git a/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php b/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php index 0039deb..ef49f2f 100644 --- a/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php +++ b/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php @@ -52,10 +52,6 @@ class NativeSessionTokenStorageTest extends \PHPUnit_Framework_TestCase public function testStoreTokenInClosedSessionWithExistingSessionId() { - if (PHP_VERSION_ID < 50400) { - $this->markTestSkipped('This test requires PHP 5.4 or later.'); - } - session_id('foobar'); $this->assertSame(PHP_SESSION_NONE, session_status()); diff --git a/Csrf/TokenStorage/NativeSessionTokenStorage.php b/Csrf/TokenStorage/NativeSessionTokenStorage.php index 60145c6..4229bb6 100644 --- a/Csrf/TokenStorage/NativeSessionTokenStorage.php +++ b/Csrf/TokenStorage/NativeSessionTokenStorage.php @@ -108,11 +108,7 @@ class NativeSessionTokenStorage implements TokenStorageInterface private function startSession() { - if (PHP_VERSION_ID >= 50400) { - if (PHP_SESSION_NONE === session_status()) { - session_start(); - } - } elseif (!session_id()) { + if (PHP_SESSION_NONE === session_status()) { session_start(); } diff --git a/Csrf/composer.json b/Csrf/composer.json index 4d4ff6a..ee6a39c 100644 --- a/Csrf/composer.json +++ b/Csrf/composer.json @@ -16,12 +16,12 @@ } ], "require": { - "php": ">=5.3.9", - "symfony/security-core": "~2.4|~3.0.0" + "php": ">=5.5.9", + "symfony/security-core": "~2.7|~3.0" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7|~3.0.0", - "symfony/http-foundation": "~2.1|~3.0.0" + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/http-foundation": "~2.7|~3.0" }, "suggest": { "symfony/http-foundation": "For using the class SessionTokenStorage." @@ -33,7 +33,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } } } |