clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle reading empty file in ReversedFileReader 

fix #10766
This commit is contained in:
fabrixxm 2021-09-27 12:14:19 +02:00
parent 79b40ad573
commit eadcc8dc93
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);
}
} }