Merge branch '6.x' into 8.x

GrahamCampbell · GrahamCampbell · commit d7f27d534807 · 2021-01-20T16:47:27.000Z
diff --git a/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php b/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php
@@ -13,7 +13,7 @@ trait InteractsWithContentTypes
      */
     public function isJson()
     {
-        return Str::contains($this->header('CONTENT_TYPE'), ['/json', '+json']);
+        return Str::contains($this->header('CONTENT_TYPE') ?? '', ['/json', '+json']);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ trait InteractsWithContentTypes`
`13`	`13`	`*/`
`14`	`14`	`public function isJson()`
`15`	`15`	`{`
`16`		`- return Str::contains($this->header('CONTENT_TYPE'), ['/json', '+json']);`
	`16`	`+ return Str::contains($this->header('CONTENT_TYPE') ?? '', ['/json', '+json']);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`/**`