Skip to content

Add support for stream resources in FinfoMimeTypeDetector::detectMimeType() #29

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

Open
das-peter wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Add support for stream resources in FinfoMimeTypeDetector::detectMimeType() #29

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ecd27e7
Add support for streams in FinfoMimeTypeDetector::detectMimeType()
das-peter Dec 20, 2023
c647850
Adjusted FinfoMimeTypeDetectorTest to test behavior with valid and "i…
das-peter Dec 20, 2023
302d7c2
Ensure FinfoMimeTypeDetector::detectMimeType() doesn't modify stream …
das-peter Dec 20, 2023
b0eb166
Optimize handling if non-seekable resources and attempt to minimize m…
das-peter Dec 21, 2023
019c26c
Rewind contents stream before stream_copy_to_stream() as it seems to …
das-peter Dec 21, 2023
9b61e60
Use php://temp stream with custom memory / file switch for resource s…
das-peter Dec 21, 2023
873c27f
Only use seekable streams for content sampling.
das-peter Dec 21, 2023
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
11 changes: 8 additions & 3 deletions src/FinfoMimeTypeDetector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,14 @@ public function __construct(

public function detectMimeType(string $path, $contents): ?string
{
$mimeType = is_string($contents)
? (@$this->finfo->buffer($this->takeSample($contents)) ?: null)
: null;
$mimeType = null;
if (is_string($contents)) {
$mimeType = @$this->finfo->buffer($this->takeSample($contents));
} elseif (is_resource($contents) && get_resource_type($contents) === 'stream') {
$streamPosition = ftell($contents);
$mimeType = @$this->finfo->buffer(stream_get_contents($contents, $this->bufferSampleSize, 0));
fseek($contents, $streamPosition);
}

if ($mimeType !== null && ! in_array($mimeType, $this->inconclusiveMimetypes)) {
return $mimeType;
Expand Down
30 changes: 29 additions & 1 deletion src/FinfoMimeTypeDetectorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public function detecting_from_a_file_location(): void
/**
* @test
*/
public function detecting_uses_extensions_when_a_resource_is_presented(): void
public function detecting_uses_extensions_when_a_invalid_resource_is_presented(): void
{
/** @var resource $handle */
$handle = fopen(__DIR__ . '/../test_files/flysystem.svg', 'r+');
Expand All @@ -111,4 +111,32 @@ public function detecting_uses_extensions_when_a_resource_is_presented(): void

$this->assertEquals('image/svg+xml', $mimeType);
}

/**
* @test
*/
public function detecting_uses_stream_contents_when_a_valid_resource_is_presented(): void
{
/** @var resource $handle */
$handle = fopen(__DIR__ . '/../test_files/flysystem.svg', 'r+');

$mimeType = $this->detector->detectMimeType('flysystem.unknown', $handle);
fclose($handle);

$this->assertEquals('image/svg+xml', $mimeType);
}

/**
* @test
*/
public function detecting_keeps_stream_contents_positions_unchanged(): void
{
/** @var resource $handle */
$handle = fopen(__DIR__ . '/../test_files/flysystem.svg', 'r+');
fseek($handle, 10);
$mimeType = $this->detector->detectMimeType('flysystem.unknown', $handle);
$this->assertEquals('image/svg+xml', $mimeType);
$this->assertEquals(10, ftell($handle));
fclose($handle);
}
}