Skip to content
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

Jump to bottom

Addresses Content-Type mismatch on HTTP 301 Moved Permanently with FileGetContents #709

Merged
merged 4 commits into from
May 27, 2024
Merged

Addresses Content-Type mismatch on HTTP 301 Moved Permanently with FileGetContents #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7475c0
test: Add test failure
DannyvdSluijs Feb 5, 2024
e6ea522
test: Remove file_get_contents override and incorrect/invaluable tests
DannyvdSluijs May 26, 2024
4479f6e
fix: Parse headers in reverse order to match with last header avoidin…
DannyvdSluijs May 26, 2024
4f0e8f2
style: Correct code style violations
DannyvdSluijs May 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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 @@ -68,7 +68,7 @@ public function retrieve($uri)
*/
private function fetchContentType(array $headers)
{
foreach ($headers as $header) {
foreach (array_reverse($headers) as $header) {
if ($this->contentType = self::getContentTypeMatchInHeader($header)) {
return true;
}
Expand Down
94 changes: 34 additions & 60 deletions tests/Uri/Retrievers/FileGetContentsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,49 @@
<?php

namespace JsonSchema\Tests\Uri\Retrievers
{
use JsonSchema\Uri\Retrievers\FileGetContents;
use PHPUnit\Framework\TestCase;
namespace JsonSchema\Tests\Uri\Retrievers;

use JsonSchema\Uri\Retrievers\FileGetContents;
use PHPUnit\Framework\TestCase;

/**
* @group FileGetContents
*/
class FileGetContentsTest extends TestCase
{
/**
* @group FileGetContents
* @expectedException \JsonSchema\Exception\ResourceNotFoundException
*/
class FileGetContentsTest extends TestCase
public function testFetchMissingFile()
{
/**
* @expectedException \JsonSchema\Exception\ResourceNotFoundException
*/
public function testFetchMissingFile()
{
$res = new FileGetContents();
$res->retrieve(__DIR__ . '/Fixture/missing.json');
}

public function testFetchFile()
{
$res = new FileGetContents();
$result = $res->retrieve(__DIR__ . '/../Fixture/child.json');
$this->assertNotEmpty($result);
}

public function testFalseReturn()
{
$res = new FileGetContents();

$this->setExpectedException(
'\JsonSchema\Exception\ResourceNotFoundException',
'JSON schema not found at http://example.com/false'
);
$res->retrieve('http://example.com/false');
}

public function testFetchDirectory()
{
$res = new FileGetContents();
$res = new FileGetContents();
$res->retrieve(__DIR__ . '/Fixture/missing.json');
}

$this->setExpectedException(
'\JsonSchema\Exception\ResourceNotFoundException',
'JSON schema not found at file:///this/is/a/directory/'
);
$res->retrieve('file:///this/is/a/directory/');
}
public function testFetchFile()
{
$res = new FileGetContents();
$result = $res->retrieve(__DIR__ . '/../Fixture/child.json');
$this->assertNotEmpty($result);
}

public function testContentType()
{
$res = new FileGetContents();
public function testContentType()
{
$res = new FileGetContents();

$reflector = new \ReflectionObject($res);
$fetchContentType = $reflector->getMethod('fetchContentType');
$fetchContentType->setAccessible(true);
$reflector = new \ReflectionObject($res);
$fetchContentType = $reflector->getMethod('fetchContentType');
$fetchContentType->setAccessible(true);

$this->assertTrue($fetchContentType->invoke($res, array('Content-Type: application/json')));
$this->assertFalse($fetchContentType->invoke($res, array('X-Some-Header: whateverValue')));
}
$this->assertTrue($fetchContentType->invoke($res, array('Content-Type: application/json')));
$this->assertFalse($fetchContentType->invoke($res, array('X-Some-Header: whateverValue')));
}
}

namespace JsonSchema\Uri\Retrievers
{
function file_get_contents($uri)
public function testCanHandleHttp301PermanentRedirect()
{
switch ($uri) {
case 'http://example.com/false': return false;
case 'file:///this/is/a/directory/': return '';
default: return \file_get_contents($uri);
}
$res = new FileGetContents();

$res->retrieve('http://asyncapi.com/definitions/2.0.0/asyncapi.json');

$this->assertSame('application/schema+json', $res->getContentType());
}
}