Skip to content

Commit 4c4b5be

Browse files
Merge branch '5.4' into 6.0
* 5.4: [Process] intersect with getenv() in case-insensitive manner to get default envs [Serializer] fix support for lazy/unset properties Fix redundant type casts [Notifier] Fix AllMySms bridge body content Revert "[DoctrineBridge] add support for the JSON type"
2 parents b2d73e4 + 5ef86ac commit 4c4b5be

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Request.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1841,7 +1841,7 @@ protected function preparePathInfo(): string
18411841
return '/';
18421842
}
18431843

1844-
return (string) $pathInfo;
1844+
return $pathInfo;
18451845
}
18461846

18471847
/**

Session/Flash/AutoExpireFlashBag.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function peek(string $type, array $default = []): array
7878
*/
7979
public function peekAll(): array
8080
{
81-
return \array_key_exists('display', $this->flashes) ? (array) $this->flashes['display'] : [];
81+
return \array_key_exists('display', $this->flashes) ? $this->flashes['display'] : [];
8282
}
8383

8484
/**

Session/Storage/Proxy/SessionHandlerProxy.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterf
2121
public function __construct(\SessionHandlerInterface $handler)
2222
{
2323
$this->handler = $handler;
24-
$this->wrapper = ($handler instanceof \SessionHandler);
24+
$this->wrapper = $handler instanceof \SessionHandler;
2525
$this->saveHandlerName = $this->wrapper ? ini_get('session.save_handler') : 'user';
2626
}
2727

@@ -42,7 +42,7 @@ public function close(): bool
4242
return $this->handler->close();
4343
}
4444

45-
public function read(string $sessionId): string
45+
public function read(string $sessionId): string|false
4646
{
4747
return $this->handler->read($sessionId);
4848
}

0 commit comments

Comments
 (0)