[HTTP] Remove Message::isJson()

codeigniter4 · Feb 7, 2021 · 55b4308 · lenuse · Mar 2, 2021 · 55b4308
1 parent 6660ce9
commit 55b4308
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 22 deletions.
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
@@ -294,7 +294,7 @@ public function isSecure(): bool
 	 */
 	public function getVar($index = null, $filter = null, $flags = null)
 	{
-		if ($this->isJSON())
+		if (strpos('application/json', $this->getHeaderLine('Content-Type')) !== false)
 		{
 			if (is_null($index))
 			{

diff --git a/system/HTTP/Message.php b/system/HTTP/Message.php
@@ -132,24 +132,4 @@ public function getProtocolVersion(): string
 	{
 		return $this->protocolVersion ?? '1.1';
 	}
-
-	/**
-	 * Determines if this is a json message based on the Content-Type header
-	 *
-	 * @return boolean
-	 *
-	 * @deprecated Use header calls directly
-	 */
-	public function isJSON()
-	{
-		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/system/Validation/Validation.php b/system/Validation/Validation.php
@@ -346,7 +346,7 @@ protected function processRules(string $field, string $label = null, $value, $ru
 	 */
 	public function withRequest(RequestInterface $request): ValidationInterface
 	{
-		if ($request->isJSON())
+		if (strpos('application/json', $request->getHeaderLine('Content-Type')) !== false)
 		{
 			$this->data = $request->getJSON(true);
 			return $this;