Merge remote-tracking branch 'upstream/develop' into 4.5

Author: kenjis

phpstan-baseline.php

@@ -2981,11 +2981,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Session/Handlers/RedisHandler.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in a negated boolean, int given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Session/Handlers/RedisHandler.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Accessing offset \'HTTP_X_REQUESTED_WITH\' directly on \\$_SERVER is discouraged\\.$#',
 	'count' => 2,

system/Cache/Handlers/RedisHandler.php

@@ -245,6 +245,7 @@ public function getMetaData(string $key)
         if ($value !== null) {
             $time = Time::now()->getTimestamp();
             $ttl  = $this->redis->ttl(static::validateKey($key, $this->prefix));
+            assert(is_int($ttl));
 
             return [
                 'expire' => $ttl > 0 ? $time + $ttl : null,

system/Session/Handlers/RedisHandler.php

@@ -293,7 +293,10 @@ protected function lockSession(string $sessionID): bool
         $attempt = 0;
 
         do {
-            if (($ttl = $this->redis->ttl($lockKey)) > 0) {
+            $ttl = $this->redis->ttl($lockKey);
+            assert(is_int($ttl));
+
+            if ($ttl > 0) {
                 sleep(1);
 
                 continue;