summaryrefslogtreecommitdiff
path: root/vendor/symfony/http-foundation/Session
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-10-10 00:28:20 +0100
committerGreg Roach <fisharebest@webtrees.net>2019-10-10 00:28:20 +0100
commit1413eee0f149cccf7c528e3673d7569a368e4a9b (patch)
tree0f7c151dcd9d1bbc1694e9d0aade1cdae5cc54e2 /vendor/symfony/http-foundation/Session
parent3ecf8b4e3b9edb7773bcf328f4533da4f452929a (diff)
downloadwebtrees-1413eee0f149cccf7c528e3673d7569a368e4a9b.tar.gz
webtrees-1413eee0f149cccf7c528e3673d7569a368e4a9b.tar.bz2
webtrees-1413eee0f149cccf7c528e3673d7569a368e4a9b.zip
Update vendor dependencies
Diffstat (limited to 'vendor/symfony/http-foundation/Session')
-rw-r--r--vendor/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php8
-rw-r--r--vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php2
2 files changed, 5 insertions, 5 deletions
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php
index a6498b882c..46ca6796d8 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php
@@ -34,8 +34,8 @@ class RedisSessionHandler extends AbstractSessionHandler
* List of available options:
* * prefix: The prefix to use for the keys in order to avoid collision on the Redis server.
*
- * @param \Redis|\RedisArray|\RedisCluster|\Predis\Client|RedisProxy $redis
- * @param array $options An associative array of options
+ * @param \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy $redis
+ * @param array $options An associative array of options
*
* @throws \InvalidArgumentException When unsupported client or options are passed
*/
@@ -45,11 +45,11 @@ class RedisSessionHandler extends AbstractSessionHandler
!$redis instanceof \Redis &&
!$redis instanceof \RedisArray &&
!$redis instanceof \RedisCluster &&
- !$redis instanceof \Predis\Client &&
+ !$redis instanceof \Predis\ClientInterface &&
!$redis instanceof RedisProxy &&
!$redis instanceof RedisClusterProxy
) {
- throw new \InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, \is_object($redis) ? \get_class($redis) : \gettype($redis)));
+ throw new \InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\ClientInterface, %s given', __METHOD__, \is_object($redis) ? \get_class($redis) : \gettype($redis)));
}
if ($diff = array_diff(array_keys($options), ['prefix'])) {
diff --git a/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php b/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
index 5bdf5e2ac2..202f3a5a6a 100644
--- a/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
+++ b/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
@@ -458,7 +458,7 @@ class NativeSessionStorage implements SessionStorageInterface
foreach ($bags as $bag) {
$key = $bag->getStorageKey();
- $session[$key] = isset($session[$key]) ? $session[$key] : [];
+ $session[$key] = isset($session[$key]) && \is_array($session[$key]) ? $session[$key] : [];
$bag->initialize($session[$key]);
}