tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #10771 from fabrixxm/issue/10766

Browse source 
Handle reading empty file in ReversedFileReader
This commit is contained in:
Hypolite Petovan 2021-09-27 07:13:14 -04:00 committed by GitHub
parent 79b40ad573 ab7de16aca
commit e53dcc3be2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Util/ReversedFileReader.php
View file

@ -95,6 +95,9 @@ class ReversedFileReader implements \Iterator
if ($this->pos == 0) { if ($this->pos == 0) {
return array_pop($buffer); return array_pop($buffer);
} }
if (is_null($buffer)) {
return null;
}
if (count($buffer) > 1) { if (count($buffer) > 1) {
return array_pop($buffer); return array_pop($buffer);
} }

0
tests/datasets/log/empty.friendica.log.txt Normal file
View file

12
tests/src/Model/Log/ParsedLogIteratorTest.php
View file

@ -145,4 +145,16 @@ class ParsedLogIteratorTest extends TestCase
$pls = iterator_to_array($this->pli, false); $pls = iterator_to_array($this->pli, false);
self::assertCount(0, $pls); self::assertCount(0, $pls);
} }
public function testEmptyLogFile()
{
$logfile = dirname(__DIR__) . '/../../datasets/log/empty.friendica.log.txt';
$reader = new ReversedFileReader();
$pli = new ParsedLogIterator($reader);
$pli->open($logfile);
$pls = iterator_to_array($pli, false);
self::assertCount(0, $pls);
}
} }