expects json

laravel · Jun 22, 2016 · d33d33f · d33d33f
1 parent cc60121
commit d33d33f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/Illuminate/Foundation/Exceptions/Handler.php b/src/Illuminate/Foundation/Exceptions/Handler.php
@@ -183,7 +183,7 @@ protected function convertValidationExceptionToResponse(ValidationException $e,
 
         $errors = $e->validator->errors()->getMessages();
 
-        if ($request->probablyWantsJson()) {
+        if ($request->expectsJson()) {
             return response()->json($errors, 422);
         }
 

diff --git a/src/Illuminate/Foundation/Http/FormRequest.php b/src/Illuminate/Foundation/Http/FormRequest.php
@@ -144,7 +144,7 @@ protected function failedAuthorization()
      */
     public function response(array $errors)
     {
-        if ($this->probablyWantsJson()) {
+        if ($this->expectsJson()) {
             return new JsonResponse($errors, 422);
         }
 

diff --git a/src/Illuminate/Foundation/Validation/ValidatesRequests.php b/src/Illuminate/Foundation/Validation/ValidatesRequests.php
@@ -100,7 +100,7 @@ protected function throwValidationException(Request $request, $validator)
      */
     protected function buildFailedValidationResponse(Request $request, array $errors)
     {
-        if ($request->probablyWantsJson()) {
+        if ($request->expectsJson()) {
             return new JsonResponse($errors, 422);
         }
 

diff --git a/src/Illuminate/Http/Request.php b/src/Illuminate/Http/Request.php
@@ -703,7 +703,7 @@ public function isJson()
      *
      * @return bool
      */
-    public function probablyWantsJson()
+    public function expectsJson()
     {
         return ($this->ajax() && ! $this->pjax()) || $this->wantsJson();
     }