Skip to content

fix: Ignore Content-Type header parameters when checking media type #934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DannyvdSluijs merged 3 commits into from
Aug 21, 2026
+48 −5
Merged

fix: Ignore Content-Type header parameters when checking media type #934

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76e7710
fix: Ignore Content-Type header parameters when checking media type
zoliszabo Aug 11, 2026
c05bcf1
fix: Correct Content-Type regex escaping and anchoring
zoliszabo Aug 11, 2026
64c37e8
test: Rename Content-Type tests to testFetchContentType
zoliszabo Aug 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/JsonSchema/Uri/Retrievers/Curl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private function fetchMessageBody($response)
*/
protected function fetchContentType($response)
{
if (0 < preg_match("/Content-Type:(\V*)/ims", $response, $match)) {
if (0 < preg_match("/Content-Type:([^;\v]*)/ims", $response, $match)) {
Comment thread
DannyvdSluijs marked this conversation as resolved.
Outdated
$this->contentType = trim($match[1]);

return true;
Expand Down
2 changes: 1 addition & 1 deletion src/JsonSchema/Uri/Retrievers/FileGetContents.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ private function fetchContentType(array $headers): bool
*/
protected static function getContentTypeMatchInHeader($header)
{
if (0 < preg_match("/Content-Type:(\V*)/ims", $header, $match)) {
if (0 < preg_match("/Content-Type:([^;\v]*)/ims", $header, $match)) {
Comment thread
DannyvdSluijs marked this conversation as resolved.
Outdated
return trim($match[1]);
}

Expand Down
26 changes: 26 additions & 0 deletions tests/Uri/Retrievers/CurlTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,32 @@ public function testNoContentType(): void

self::assertStringEqualsFileCanonicalizing(realpath(__DIR__ . '/../../fixtures/foobar.json'), $result);
}

/**
* @dataProvider contentTypeParameterProvider
*/
public function testContentTypeIgnoresParameters(string $response, string $expected): void
{
$c = new Curl();

$reflector = new \ReflectionObject($c);
$fetchContentType = $reflector->getMethod('fetchContentType');
if (PHP_VERSION_ID < 80100) {
$fetchContentType->setAccessible(true);
}

$this->assertTrue($fetchContentType->invoke($c, $response));
$this->assertSame($expected, $c->getContentType());
}

public function contentTypeParameterProvider(): array
{
return [
'json with charset' => ["Content-Type: application/json; charset=utf-8\r\n\r\n{}", 'application/json'],
'schema media type with charset' => ["Content-Type: application/schema+json; charset=utf-8\r\n\r\n{}", 'application/schema+json'],
'multiple parameters' => ["Content-Type: application/json; charset=utf-8; profile=schema\r\n\r\n{}", 'application/json'],
];
Comment thread
DannyvdSluijs marked this conversation as resolved.
}
}
}

Expand Down
26 changes: 26 additions & 0 deletions tests/Uri/Retrievers/FileGetContentsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,32 @@ public function testContentType(): void
$this->assertFalse($fetchContentType->invoke($res, ['X-Some-Header: whateverValue']));
}

/**
* @dataProvider contentTypeParameterProvider
*/
public function testContentTypeIgnoresParameters(string $header, string $expected): void
{
$res = new FileGetContents();

$reflector = new \ReflectionObject($res);
$fetchContentType = $reflector->getMethod('fetchContentType');
if (PHP_VERSION_ID < 80100) {
$fetchContentType->setAccessible(true);
}

$this->assertTrue($fetchContentType->invoke($res, [$header]));
$this->assertSame($expected, $res->getContentType());
}

public function contentTypeParameterProvider(): array
{
return [
'json with charset' => ['Content-Type: application/json; charset=utf-8', 'application/json'],
'schema media type with charset' => ['Content-Type: application/schema+json; charset=utf-8', 'application/schema+json'],
'multiple parameters' => ['Content-Type: application/json; charset=utf-8; profile=schema', 'application/json'],
];
}

public function testCanHandleHttp301PermanentRedirect(): void
{
$res = new FileGetContents();
Expand Down
Loading