Skip to content

Commit 5ef86ac

Browse files
Merge branch '5.3' into 5.4
* 5.3: [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 0fd6f48 + 937e913 commit 5ef86ac

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Request.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1969,7 +1969,7 @@ protected function preparePathInfo()
19691969
return '/';
19701970
}
19711971

1972-
return (string) $pathInfo;
1972+
return $pathInfo;
19731973
}
19741974

19751975
/**

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 = [])
7878
*/
7979
public function peekAll()
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: 7 additions & 7 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

@@ -41,7 +41,7 @@ public function getHandler()
4141
#[\ReturnTypeWillChange]
4242
public function open($savePath, $sessionName)
4343
{
44-
return (bool) $this->handler->open($savePath, $sessionName);
44+
return $this->handler->open($savePath, $sessionName);
4545
}
4646

4747
/**
@@ -50,16 +50,16 @@ public function open($savePath, $sessionName)
5050
#[\ReturnTypeWillChange]
5151
public function close()
5252
{
53-
return (bool) $this->handler->close();
53+
return $this->handler->close();
5454
}
5555

5656
/**
57-
* @return string
57+
* @return string|false
5858
*/
5959
#[\ReturnTypeWillChange]
6060
public function read($sessionId)
6161
{
62-
return (string) $this->handler->read($sessionId);
62+
return $this->handler->read($sessionId);
6363
}
6464

6565
/**
@@ -68,7 +68,7 @@ public function read($sessionId)
6868
#[\ReturnTypeWillChange]
6969
public function write($sessionId, $data)
7070
{
71-
return (bool) $this->handler->write($sessionId, $data);
71+
return $this->handler->write($sessionId, $data);
7272
}
7373

7474
/**
@@ -77,7 +77,7 @@ public function write($sessionId, $data)
7777
#[\ReturnTypeWillChange]
7878
public function destroy($sessionId)
7979
{
80-
return (bool) $this->handler->destroy($sessionId);
80+
return $this->handler->destroy($sessionId);
8181
}
8282

8383
/**

0 commit comments

Comments
 (0)