Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/http/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
if ($this->adapter !== null) {
$headers = $this->adapter->getHeaders();

$this->filterHeaders($headers);

Check warning on line 55 in src/http/Request.php

View workflow job for this annotation

GitHub Actions / mutation / PHP 8.4-ubuntu-latest

Escaped Mutant for Mutator "MethodCallRemoval": @@ @@ { if ($this->adapter !== null) { $headers = $this->adapter->getHeaders(); - $this->filterHeaders($headers); + return $headers; } return parent::getHeaders();

Check warning on line 55 in src/http/Request.php

View workflow job for this annotation

GitHub Actions / mutation / PHP 8.4-ubuntu-latest

Escaped Mutant for Mutator "MethodCallRemoval": @@ @@ { if ($this->adapter !== null) { $headers = $this->adapter->getHeaders(); - $this->filterHeaders($headers); + return $headers; } return parent::getHeaders();

return $headers;
}
Expand Down Expand Up @@ -203,7 +203,7 @@
[
'error' => $psrFile->getError(),
'name' => $psrFile->getClientFilename() ?? '',
'size' => $psrFile->getSize() ?? 0,
'size' => $psrFile->getSize() ?? null,
'tempName' => $psrFile->getStream()->getMetadata('uri') ?? '',
'type' => $psrFile->getClientMediaType() ?? '',
],
Expand Down
63 changes: 58 additions & 5 deletions tests/http/PSR7RequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@
use PHPUnit\Framework\Attributes\{DataProviderExternal, Group};
use Psr\Http\Message\ServerRequestInterface;
use Yii;
use yii\base\InvalidCallException;
use yii\base\InvalidConfigException;
use yii\base\{InvalidCallException, InvalidConfigException};
use yii\helpers\Json;
use yii\web\Cookie;
use yii\web\CookieCollection;
use yii\web\UploadedFile;
use yii\web\{Cookie, CookieCollection, UploadedFile};
use yii2\extensions\psrbridge\exception\Message;
use yii2\extensions\psrbridge\http\Request;
use yii2\extensions\psrbridge\tests\provider\RequestProvider;
Expand Down Expand Up @@ -1514,6 +1511,62 @@ public function testReturnUploadedFilesWhenAdapterIsSet(): void
}
}

public function testReturnUploadedFileWithZeroSizeWhenPsr7FileSizeIsNull(): void
{
$this->mockWebApplication();

$file1 = dirname(__DIR__) . '/support/stub/files/test1.txt';

$uploadedFile1 = FactoryHelper::createUploadedFile('test1.txt', 'text/plain', $file1);
$psr7Request = FactoryHelper::createRequest('POST', '/upload');

$psr7Request = $psr7Request->withUploadedFiles(['test_file' => $uploadedFile1]);

$request = new Request();

$request->setPsr7Request($psr7Request);
$uploadedFiles = $request->getUploadedFiles();

self::assertArrayHasKey(
'test_file',
$uploadedFiles,
"Uploaded files array should contain the 'test_file' key.",
);

$uploadedFile = $uploadedFiles['test_file'] ?? null;

self::assertInstanceOf(
UploadedFile::class,
$uploadedFile,
"Value for 'test_file' should be an instance of 'UploadedFile'.",
);
self::assertSame(
UPLOAD_ERR_OK,
$uploadedFile->error,
"'UploadedFile' 'error' property should be 'UPLOAD_ERR_OK'.",
);
self::assertSame(
'test1.txt',
$uploadedFile->name,
"'UploadedFile' 'name' property should match the original filename.",
);
self::assertSame(
0,
$uploadedFile->size,
"'UploadedFile' 'size' should default to 0 when PSR-7 file 'getSize()' returns 'null'.",
);
self::assertSame(
$file1,
$uploadedFile->tempName,
"'UploadedFile' 'tempName' should match the original file path.",
);
self::assertSame(
'text/plain',
$uploadedFile->type,
"'UploadedFile' 'type' should match the original MIME type.",
);
}

#[DataProviderExternal(RequestProvider::class, 'getUrl')]
public function testReturnUrlFromAdapterWhenAdapterIsSet(string $url, string $expectedUrl): void
{
Expand Down