revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-26 00:32:42 +01:00
Code Issues Releases Wiki Activity

Fix PHP 8.1 strlen(null) error in PhabricatorFile::newChunkedFile()

Browse source 
Summary:
Fix PHP 8.1 strlen(null) error in PhabricatorFile::newChunkedFile().

Fixes T15499

Test Plan:
Added a unit test which replicated the fault, so you can test simply by 'arc unit'
Alternatively, see test in T15499

Reviewers: O1 Blessed Committers, avivey

Reviewed By: O1 Blessed Committers, avivey

Subscribers: speck, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno

Maniphest Tasks: T15499

Differential Revision: https://we.phorge.it/D25352
This commit is contained in:
Steve Campbell 2023-07-17 13:25:32 +01:00
parent dbc101ca8a
commit 27fa498966
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/applications/files/storage/PhabricatorFile.php
View file

@ -287,7 +287,7 @@ final class PhabricatorFile extends PhabricatorFileDAO
// NOTE: Once we receive the first chunk, we'll detect its MIME type and // NOTE: Once we receive the first chunk, we'll detect its MIME type and
// update the parent file if a MIME type hasn't been provided. This matters // update the parent file if a MIME type hasn't been provided. This matters
// for large media files like video. // for large media files like video.
$mime_type = idx($params, 'mime-type'); $mime_type = idx($params, 'mime-type', '');
if (!strlen($mime_type)) { if (!strlen($mime_type)) {
$file->setMimeType('application/octet-stream'); $file->setMimeType('application/octet-stream');
} }

7
src/applications/files/storage/__tests__/PhabricatorFileTestCase.php
View file

@ -532,4 +532,11 @@ final class PhabricatorFileTestCase extends PhabricatorTestCase {
$this->assertEqual(array(), $alternate_c); $this->assertEqual(array(), $alternate_c);
} }
public function testNewChunkedFile() {
$engine = new PhabricatorTestStorageEngine();
$file = PhabricatorFile::newChunkedFile($engine, 10, []);
$this->assertTrue($file instanceof PhabricatorFile,
pht('newChunkedFile returns a PhabricatorFile'));
}
} }