Skip to content

Commit 4e8532d

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: Fix CS
2 parents 96c1a43 + 7a2ab8c commit 4e8532d

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

RedirectResponse.php

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

50-
if (301 == $status && !\array_key_exists('cache-control', array_change_key_case($headers, \CASE_LOWER))) {
50+
if (301 == $status && !\array_key_exists('cache-control', array_change_key_case($headers, CASE_LOWER))) {
5151
$this->headers->remove('cache-control');
5252
}
5353
}

Session/Storage/Handler/AbstractSessionHandler.php

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

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($name)
202202
public function regenerate($destroy = false, $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
/**

0 commit comments

Comments
 (0)