Skip to content

Commit 690d902

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Fix CS Fix CS
2 parents f01c1eb + 2292c5c commit 690d902

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

RedirectResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function __construct(string $url, int $status = 302, array $headers = [])
4242
throw new \InvalidArgumentException(sprintf('The HTTP status code is not a redirect ("%s" given).', $status));
4343
}
4444

45-
if (301 == $status && !\array_key_exists('cache-control', array_change_key_case($headers, \CASE_LOWER))) {
45+
if (301 == $status && !\array_key_exists('cache-control', array_change_key_case($headers, CASE_LOWER))) {
4646
$this->headers->remove('cache-control');
4747
}
4848
}

Session/Storage/Handler/AbstractSessionHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public function destroy($sessionId)
114114
{
115115
if (!headers_sent() && filter_var(ini_get('session.use_cookies'), FILTER_VALIDATE_BOOLEAN)) {
116116
if (!$this->sessionName) {
117-
throw new \LogicException(sprintf('Session name cannot be empty, did you forget to call "parent::open()" in "%s"?.', \get_class($this)));
117+
throw new \LogicException(sprintf('Session name cannot be empty, did you forget to call "parent::open()" in "%s"?.', static::class));
118118
}
119119
$cookie = SessionUtils::popSessionCookie($this->sessionName, $sessionId);
120120

Session/Storage/NativeSessionStorage.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function start()
139139
return true;
140140
}
141141

142-
if (\PHP_SESSION_ACTIVE === session_status()) {
142+
if (PHP_SESSION_ACTIVE === session_status()) {
143143
throw new \RuntimeException('Failed to start the session: already started by PHP.');
144144
}
145145

@@ -202,7 +202,7 @@ public function setName(string $name)
202202
public function regenerate(bool $destroy = false, int $lifetime = null)
203203
{
204204
// Cannot regenerate the session ID for non-active sessions.
205-
if (\PHP_SESSION_ACTIVE !== session_status()) {
205+
if (PHP_SESSION_ACTIVE !== session_status()) {
206206
return false;
207207
}
208208

@@ -362,7 +362,7 @@ public function isStarted()
362362
*/
363363
public function setOptions(array $options)
364364
{
365-
if (headers_sent() || \PHP_SESSION_ACTIVE === session_status()) {
365+
if (headers_sent() || PHP_SESSION_ACTIVE === session_status()) {
366366
return;
367367
}
368368

@@ -427,7 +427,7 @@ public function setSaveHandler($saveHandler = null)
427427
}
428428
$this->saveHandler = $saveHandler;
429429

430-
if (headers_sent() || \PHP_SESSION_ACTIVE === session_status()) {
430+
if (headers_sent() || PHP_SESSION_ACTIVE === session_status()) {
431431
return;
432432
}
433433

Session/Storage/Proxy/AbstractProxy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function isWrapper()
6565
*/
6666
public function isActive()
6767
{
68-
return \PHP_SESSION_ACTIVE === session_status();
68+
return PHP_SESSION_ACTIVE === session_status();
6969
}
7070

7171
/**

Tests/Session/Storage/PhpBridgeSessionStorageTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ public function testPhpSession()
6161
{
6262
$storage = $this->getStorage();
6363

64-
$this->assertNotSame(\PHP_SESSION_ACTIVE, session_status());
64+
$this->assertNotSame(PHP_SESSION_ACTIVE, session_status());
6565
$this->assertFalse($storage->isStarted());
6666

6767
session_start();
6868
$this->assertTrue(isset($_SESSION));
69-
$this->assertSame(\PHP_SESSION_ACTIVE, session_status());
69+
$this->assertSame(PHP_SESSION_ACTIVE, session_status());
7070
// PHP session might have started, but the storage driver has not, so false is correct here
7171
$this->assertFalse($storage->isStarted());
7272

0 commit comments

Comments
 (0)