fix(response): 🐛 assertContentType() considers charset and boundary directives

Author: stein197

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.0.1 - 2025-05-25
+### Fixed
+- `assertContentType(string $contentType)` doesn't fail when the header contains charset or boundary directives
+
 ## 2.0.0 - 2025-05-18
 ### Changed
 - Trait and interface names: `TestCase -> ExtendedTestCase`, `ExtendedTestCase -> ExtendedTestCaseInterface`

src/Assert/ResponseAssert.php

@@ -11,6 +11,7 @@
 use function explode;
 use function join;
 use function preg_split;
+use function strcasecmp;
 use function trim;
 use const PREG_SPLIT_NO_EMPTY;
 
@@ -130,7 +131,10 @@ public function assertContentNotRegex(string $regex): void {
 	 * ```
 	 */
 	public function assertContentType(string $contentType): void {
-		$this->assertHeaderEquals('Content-Type', $contentType);
+		$values = $this->response->getHeader('Content-Type');
+		$header = $values ? $values[0] : '';
+		[$actualType] = preg_split('/\\s*;\\s*/', $header);
+		$this->test->assertEquals(0, strcasecmp($actualType, $contentType), "Expected the response to have the header \"Content-Type\" with value \"{$contentType}\", actual: \"{$actualType}\"");
 	}
 
 	/**

test/Assert/ResponseAssertTest.php

@@ -125,6 +125,11 @@ public function testAssertContentType(?string $exceptionMessage, ResponseInterfa
 	public static function dataAssertContentType(): array {
 		return [
 			'passed' => [null, new Response(200, ['Content-Type' => 'text/html']), 'text/html'],
+			'passed with charset without space' => [null, new Response(200, ['content-type' => 'text/html;charset=utf-8']), 'text/html'],
+			'passed with charset and space' => [null, new Response(200, ['content-type' => 'text/html; charset=utf-8']), 'text/html'],
+			'passed with boundary without space' => [null, new Response(200, ['content-type' => 'text/html;boundary=----']), 'text/html'],
+			'passed with boundary and space' => [null, new Response(200, ['content-type' => 'text/html; boundary=----']), 'text/html'],
+			'passed with charset and boundary' => [null, new Response(200, ['content-type' => 'text/html;charset=utf-8;boundary=----']), 'text/html'],
 			'failed' => ['Expected the response to have the header "Content-Type" with value "text/html", actual: ""', new Response(200), 'text/html'],
 		];
 	}