Merge branch '6.x' into 7.x

laravel · Aug 26, 2020 · aa4e269 · aa4e269
2 parents f64299a + 0eb542d
commit aa4e269
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Illuminate/Redis/Connectors/PhpRedisConnector.php b/src/Illuminate/Redis/Connectors/PhpRedisConnector.php
@@ -7,6 +7,7 @@
 use Illuminate\Redis\Connections\PhpRedisConnection;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Redis as RedisFacade;
+use Illuminate\Support\Str;
 use LogicException;
 use Redis;
 use RedisCluster;
@@ -183,7 +184,7 @@ protected function createRedisClusterInstance(array $servers, array $options)
     protected function formatHost(array $options)
     {
         if (isset($options['scheme'])) {
-            return "{$options['scheme']}://{$options['host']}";
+            return Str::start($options['host'], "{$options['scheme']}://");
         }
 
         return $options['host'];

diff --git a/src/Illuminate/Session/Middleware/AuthenticateSession.php b/src/Illuminate/Session/Middleware/AuthenticateSession.php
@@ -40,9 +40,9 @@ public function handle($request, Closure $next)
         }
 
         if ($this->auth->viaRemember()) {
-            $passwordHash = explode('|', $request->cookies->get($this->auth->getRecallerName()))[2];
+            $passwordHash = explode('|', $request->cookies->get($this->auth->getRecallerName()))[2] ?? null;
 
-            if ($passwordHash != $request->user()->getAuthPassword()) {
+            if (! $passwordHash || $passwordHash != $request->user()->getAuthPassword()) {
                 $this->logout($request);
             }
         }