Merge branch '9.x' into 10.x

# Conflicts:
#	CHANGELOG.md
#	tests/Integration/Cache/RedisStoreTest.php

Author: driesvints

tests/Integration/Cache/RedisStoreTest.php

@@ -143,4 +143,24 @@ public function testStaleEntriesCanBeFlushed()
         $keyCount = Cache::store('redis')->connection()->keys('*');
         $this->assertEquals(4, count($keyCount)); // Sets for people, authors, and artists + individual entry for Jennifer
     }
+
+    public function testMultipleItemsCanBeSetAndRetrieved()
+    {
+        $store = Cache::store('redis');
+        $result = $store->put('foo', 'bar', 10);
+        $resultMany = $store->putMany([
+            'fizz' => 'buz',
+            'quz' => 'baz',
+        ], 10);
+        $this->assertTrue($result);
+        $this->assertTrue($resultMany);
+        $this->assertEquals([
+            'foo' => 'bar',
+            'fizz' => 'buz',
+            'quz' => 'baz',
+            'norf' => null,
+        ], $store->many(['foo', 'fizz', 'quz', 'norf']));
+
+        $this->assertEquals([], $store->many([]));
+    }
 }

types/Database/Eloquent/Factories/Factory.php

@@ -113,8 +113,8 @@ public function definition()
 // assertType('Closure(): Illuminate\Database\Eloquent\Collection<int, User>|User', $factory->lazy([
 //     'string' => 'string',
 // ]));
-assertType('Closure(): Illuminate\Database\Eloquent\Collection<int, Illuminate\Database\Eloquent\Model>|Illuminate\Database\Eloquent\Model', $factory->lazy());
-assertType('Closure(): Illuminate\Database\Eloquent\Collection<int, Illuminate\Database\Eloquent\Model>|Illuminate\Database\Eloquent\Model', $factory->lazy([
+assertType('Closure(): (Illuminate\Database\Eloquent\Collection<int, Illuminate\Database\Eloquent\Model>|Illuminate\Database\Eloquent\Model)', $factory->lazy());
+assertType('Closure(): (Illuminate\Database\Eloquent\Collection<int, Illuminate\Database\Eloquent\Model>|Illuminate\Database\Eloquent\Model)', $factory->lazy([
     'string' => 'string',
 ]));