Merge pull request #28523 from mintbridge/patch-1

[5.8] Allow for objects to be passed to json and jsonp in the docblock
laravel · May 14, 2019 · fab75c7 · fab75c7
2 parents 1f32131 + 91be0dc
commit fab75c7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Illuminate/Contracts/Routing/ResponseFactory.php b/src/Illuminate/Contracts/Routing/ResponseFactory.php
@@ -37,7 +37,7 @@ public function view($view, $data = [], $status = 200, array $headers = []);
     /**
      * Create a new JSON response instance.
      *
-     * @param  string|array  $data
+     * @param  string|array|object  $data
      * @param  int  $status
      * @param  array  $headers
      * @param  int  $options
@@ -49,7 +49,7 @@ public function json($data = [], $status = 200, array $headers = [], $options =
      * Create a new JSONP response instance.
      *
      * @param  string  $callback
-     * @param  string|array  $data
+     * @param  string|array|object  $data
      * @param  int  $status
      * @param  array  $headers
      * @param  int  $options