Skip to content

Commit f59183a

Browse files
Merge branch '4.4' into 5.2
* 4.4: Allow psr/cache v3 but on symfony/cache [DI] fix tracking of changes to vendor/ dirs Remove EOLed 5.1 branch from PR template [HttpKernel] [Kernel] Silence deprecations logs writes Update PULL_REQUEST_TEMPLATE.md [Mailer][Mime] Update inline part names with newly generated ContentId Fixed updating catalogue metadata from intl domain [HttpFoundation] Setting `REQUEST_TIME_FLOAT` when constructing a Request object
2 parents 20c554c + 09e16fb commit f59183a

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

Request.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ public static function create(string $uri, string $method = 'GET', array $parame
347347
'SCRIPT_FILENAME' => '',
348348
'SERVER_PROTOCOL' => 'HTTP/1.1',
349349
'REQUEST_TIME' => time(),
350+
'REQUEST_TIME_FLOAT' => microtime(true),
350351
], $server);
351352

352353
$server['PATH_INFO'] = '';

Session/Storage/Handler/MarshallingSessionHandler.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,47 +28,47 @@ public function __construct(AbstractSessionHandler $handler, MarshallerInterface
2828
}
2929

3030
/**
31-
* {@inheritdoc}
31+
* @return bool
3232
*/
3333
public function open($savePath, $name)
3434
{
3535
return $this->handler->open($savePath, $name);
3636
}
3737

3838
/**
39-
* {@inheritdoc}
39+
* @return bool
4040
*/
4141
public function close()
4242
{
4343
return $this->handler->close();
4444
}
4545

4646
/**
47-
* {@inheritdoc}
47+
* @return bool
4848
*/
4949
public function destroy($sessionId)
5050
{
5151
return $this->handler->destroy($sessionId);
5252
}
5353

5454
/**
55-
* {@inheritdoc}
55+
* @return bool
5656
*/
5757
public function gc($maxlifetime)
5858
{
5959
return $this->handler->gc($maxlifetime);
6060
}
6161

6262
/**
63-
* {@inheritdoc}
63+
* @return string
6464
*/
6565
public function read($sessionId)
6666
{
6767
return $this->marshaller->unmarshall($this->handler->read($sessionId));
6868
}
6969

7070
/**
71-
* {@inheritdoc}
71+
* @return bool
7272
*/
7373
public function write($sessionId, $data)
7474
{
@@ -83,15 +83,15 @@ public function write($sessionId, $data)
8383
}
8484

8585
/**
86-
* {@inheritdoc}
86+
* @return bool
8787
*/
8888
public function validateId($sessionId)
8989
{
9090
return $this->handler->validateId($sessionId);
9191
}
9292

9393
/**
94-
* {@inheritdoc}
94+
* @return bool
9595
*/
9696
public function updateTimestamp($sessionId, $data)
9797
{

0 commit comments

Comments
 (0)