Merge pull request #16 from mediact/hotfix/issue-15

1.0.3 - Fix fread call when file size is zero
mediact · Jul 10, 2018 · e5e6eeb · e5e6eeb
2 parents b3c77d4 + afbe670
commit e5e6eeb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/Php/SymbolExtractor.php b/src/Php/SymbolExtractor.php
@@ -49,10 +49,11 @@ public function extract(
 
         foreach ($files as $file) {
             try {
+                $size     = $file->getSize();
                 $handle   = $file->openFile('rb');
-                $contents = $handle->fread($file->getSize());
+                $contents = $size  > 0 ? $handle->fread($size) : '';
 
-                if (!$contents) { // phpstan thinks this can only return string.
+                if (empty($contents)) {
                     continue;
                 }
 

diff --git a/tests/Php/SymbolExtractorTest.php b/tests/Php/SymbolExtractorTest.php
@@ -45,7 +45,7 @@ public function testConstructor(): void
 
     /**
      * @dataProvider emptyProvider
-     * @dataProvider unparsableFilesProvider
+     * @dataProvider nonParsingFilesProvider
      * @dataProvider filledFilesProvider
      *
      * @param Parser                $parser
@@ -115,14 +115,20 @@ public function emptyProvider(): array
             ->with(self::anything());
 
         return [
-            [$parser, $this->createFileIterator()]
+            [$parser, $this->createFileIterator()],
+            [
+                $parser,
+                $this->createFileIterator(
+                    $this->createFile('')
+                )
+            ]
         ];
     }
 
     /**
      * @param string $content
      *
-     * @return SplFileInfo|\PHPUnit_Framework_MockObject_MockObject
+     * @return SplFileInfo
      */
     private function createFile(string $content): SplFileInfo
     {
@@ -141,7 +147,7 @@ private function createFile(string $content): SplFileInfo
             ->method("getSize")
             ->willReturn(\strlen($content));
 
-        $handle = $this->getMockBuilder(\SplFileObject::class)
+        $handle = $this->getMockBuilder(SplFileObject::class)
             ->enableOriginalConstructor()
             ->setConstructorArgs([tempnam(sys_get_temp_dir(), "")])
             ->getMock();
@@ -160,7 +166,7 @@ private function createFile(string $content): SplFileInfo
     /**
      * @return Parser[][]|FileIteratorInterface[][]
      */
-    public function unparsableFilesProvider(): array
+    public function nonParsingFilesProvider(): array
     {
         $parser = $this->createMock(Parser::class);