projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated Drupal to 8.6. This goes with the following updates because it's possible...
[yaffs-website]
/
vendor
/
symfony
/
http-foundation
/
Session
/
SessionBagProxy.php
diff --git
a/vendor/symfony/http-foundation/Session/SessionBagProxy.php
b/vendor/symfony/http-foundation/Session/SessionBagProxy.php
index 307836d5f94616e22404631fea345f02a64fcb8c..3504bdfe7b4a6fe1c52c0bf8e628ec703857445a 100644
(file)
--- a/
vendor/symfony/http-foundation/Session/SessionBagProxy.php
+++ b/
vendor/symfony/http-foundation/Session/SessionBagProxy.php
@@
-20,13
+20,13
@@
final class SessionBagProxy implements SessionBagInterface
{
private $bag;
private $data;
{
private $bag;
private $data;
- private $
hasBeenStarted
;
+ private $
usageIndex
;
- public function __construct(SessionBagInterface $bag, array &$data, &$
hasBeenStarted
)
+ public function __construct(SessionBagInterface $bag, array &$data, &$
usageIndex
)
{
$this->bag = $bag;
$this->data = &$data;
{
$this->bag = $bag;
$this->data = &$data;
- $this->
hasBeenStarted = &$hasBeenStarted
;
+ $this->
usageIndex = &$usageIndex
;
}
/**
}
/**
@@
-34,6
+34,8
@@
final class SessionBagProxy implements SessionBagInterface
*/
public function getBag()
{
*/
public function getBag()
{
+ ++$this->usageIndex;
+
return $this->bag;
}
return $this->bag;
}
@@
-42,6
+44,11
@@
final class SessionBagProxy implements SessionBagInterface
*/
public function isEmpty()
{
*/
public function isEmpty()
{
+ if (!isset($this->data[$this->bag->getStorageKey()])) {
+ return true;
+ }
+ ++$this->usageIndex;
+
return empty($this->data[$this->bag->getStorageKey()]);
}
return empty($this->data[$this->bag->getStorageKey()]);
}
@@
-58,7
+65,7
@@
final class SessionBagProxy implements SessionBagInterface
*/
public function initialize(array &$array)
{
*/
public function initialize(array &$array)
{
-
$this->hasBeenStarted = true
;
+
++$this->usageIndex
;
$this->data[$this->bag->getStorageKey()] = &$array;
$this->bag->initialize($array);
$this->data[$this->bag->getStorageKey()] = &$array;
$this->bag->initialize($array);