Merge pull request #4081 from caswell-wc/bug-fix-isJson

Fixing a bug in Message::isJSON
codeigniter4 · Jan 10, 2021 · 6861a58 · 6861a58
2 parents d09a546 + 50de15c
commit 6861a58
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/system/HTTP/Message.php b/system/HTTP/Message.php
@@ -142,7 +142,14 @@ public function getProtocolVersion(): string
 	 */
 	public function isJSON()
 	{
-		return $this->hasHeader('Content-Type')
-			&& $this->header('Content-Type')->getValue() === 'application/json';
+		if (! $this->hasHeader('Content-Type'))
+		{
+			return false;
+		}
+
+		$header = $this->header('Content-Type')->getValue();
+		$parts  = explode(';', $header);
+
+		return in_array('application/json', $parts, true);
 	}
 }
diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
@@ -349,4 +349,10 @@ public function testIsJsonReturnsTrue()
 		$this->assertTrue($this->message->isJSON());
 	}
 
+	public function testIsJsonWorksWithExtendedContentType()
+	{
+		$this->message->setHeader('Content-Type', 'application/json;charset=UTF-8');
+		$this->assertTrue($this->message->isJSON());
+	}
+
 }