diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-07-13 22:13:09 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-07-13 22:13:09 +0100 |
| commit | ea75abda1c0370fb1de46fb302c8871017f17632 (patch) | |
| tree | 6ad700e0af225680cbeb9349882aa77f9292f5e9 /vendor/symfony/http-foundation/Session | |
| parent | d0bcc06fc828c5fd8500d82c2aef6b766eb1c443 (diff) | |
| download | webtrees-ea75abda1c0370fb1de46fb302c8871017f17632.tar.gz webtrees-ea75abda1c0370fb1de46fb302c8871017f17632.tar.bz2 webtrees-ea75abda1c0370fb1de46fb302c8871017f17632.zip | |
Update vendor dependencies
Diffstat (limited to 'vendor/symfony/http-foundation/Session')
| -rw-r--r-- | vendor/symfony/http-foundation/Session/Session.php | 4 | ||||
| -rw-r--r-- | vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/vendor/symfony/http-foundation/Session/Session.php b/vendor/symfony/http-foundation/Session/Session.php index 867ceba97f..db0b9aeb0b 100644 --- a/vendor/symfony/http-foundation/Session/Session.php +++ b/vendor/symfony/http-foundation/Session/Session.php @@ -253,7 +253,9 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable */ public function getBag($name) { - return $this->storage->getBag($name)->getBag(); + $bag = $this->storage->getBag($name); + + return method_exists($bag, 'getBag') ? $bag->getBag() : $bag; } /** diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php index 0623318d0a..a3877ef4c7 100644 --- a/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php +++ b/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php @@ -681,7 +681,7 @@ class PdoSessionHandler extends AbstractSessionHandler switch ($this->driver) { case 'mysql': // MySQL 5.7.5 and later enforces a maximum length on lock names of 64 characters. Previously, no limit was enforced. - $lockId = \substr($sessionId, 0, 64); + $lockId = substr($sessionId, 0, 64); // should we handle the return value? 0 on timeout, null on error // we use a timeout of 50 seconds which is also the default for innodb_lock_wait_timeout $stmt = $this->pdo->prepare('SELECT GET_LOCK(:key, 50)'); |
