Merge remote-tracking branch 'upstream/9.x' into 9.x

Author: TBlindaruk

src/Illuminate/Testing/TestResponse.php

@@ -1439,7 +1439,13 @@ public function assertSessionMissing($key)
      */
     protected function session()
     {
-        return app('session.store');
+        $session = app('session.store');
+
+        if (! $session->isStarted()) {
+            $session->start();
+        }
+
+        return $session;
     }
 
     /**

tests/Testing/TestResponseTest.php

@@ -1840,6 +1840,25 @@ public function testAssertSessionHasErrors()
         $response->assertSessionHasErrors(['foo']);
     }
 
+    public function testAssertJsonSerializedSessionHasErrors()
+    {
+        app()->instance('session.store', $store = new Store('test-session', new ArraySessionHandler(1), null, 'json'));
+
+        $store->put('errors', $errorBag = new ViewErrorBag);
+
+        $errorBag->put('default', new MessageBag([
+            'foo' => [
+                'foo is required',
+            ],
+        ]));
+
+        $store->save(); // Required to serialize error bag to JSON
+
+        $response = TestResponse::fromBaseResponse(new Response());
+
+        $response->assertSessionHasErrors(['foo']);
+    }
+
     public function testAssertSessionDoesntHaveErrors()
     {
         $this->expectException(AssertionFailedError::class);