Merge pull request #115 from rn0/handle_empty_files

SplFileInfoHandler should handle empty files
fsi-open · Sep 25, 2019 · eee1ee8 · eee1ee8
2 parents 8a45523 + d009911
commit eee1ee8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/lib/FSi/DoctrineExtensions/Uploadable/FileHandler/SplFileInfoHandler.php b/lib/FSi/DoctrineExtensions/Uploadable/FileHandler/SplFileInfoHandler.php
@@ -120,6 +120,10 @@ private function tryTellFile($fileObject): int
 
     private function tryReadFile(SplFileObject $fileObject, int $length): string
     {
+        if ($length === 0) {
+            return '';
+        }
+
         $content = $fileObject->fread($length);
 
         if (false === $content) {

diff --git a/tests/FSi/DoctrineExtensions/Tests/Uploadable/FileHandler/SplFileInfoHandlerTest.php b/tests/FSi/DoctrineExtensions/Tests/Uploadable/FileHandler/SplFileInfoHandlerTest.php
@@ -41,6 +41,14 @@ public function testGetContent()
         $this->assertEquals(self::CONTENT, $content);
     }
 
+    public function testGetContentOnEmptyFile()
+    {
+        $emptyFile = new SplTempFileObject();
+
+        $content = $this->handler->getContent($emptyFile);
+        $this->assertEquals('', $content);
+    }
+
     public function testGetContentOnTempFile()
     {
         $input = new SplTempFileObject();