Merge pull request #599 from SilverFire/fix/frame-unknown-file

Prevent exception from Whoops when caught exception frame is not related to real file
filp · Oct 23, 2018 · 8eb6d53 · 8eb6d53
2 parents a9f129b + 06e7f16
commit 8eb6d53
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Prevent exception in Whoops when caught exception frame is not related to real file
+
 # 2.3.0
 
 * Show previous exception messages.

diff --git a/src/Whoops/Exception/Frame.php b/src/Whoops/Exception/Frame.php
@@ -112,10 +112,10 @@ public function getArgs()
     public function getFileContents()
     {
         if ($this->fileContentsCache === null && $filePath = $this->getFile()) {
-            // Leave the stage early when 'Unknown' is passed
+            // Leave the stage early when 'Unknown' or '[internal]' is passed
             // this would otherwise raise an exception when
             // open_basedir is enabled.
-            if ($filePath === "Unknown") {
+            if ($filePath === "Unknown" || $filePath === '[internal]') {
                 return null;
             }
 

diff --git a/tests/Whoops/Exception/FrameTest.php b/tests/Whoops/Exception/FrameTest.php
@@ -103,6 +103,20 @@ public function testGetFileContents()
         $this->assertStringEqualsFile($data['file'], $frame->getFileContents());
     }
 
+    /**
+     * @covers Whoops\Exception\Frame::getFileContents
+     * @testWith ["[internal]"]
+     *           ["Unknown"]
+     * @see https://github.com/filp/whoops/pull/599
+     */
+    public function testGetFileContentsWhenFrameIsNotRelatedToSpecificFile($fakeFilename)
+    {
+        $data  = array_merge($this->getFrameData(), ['file' => $fakeFilename]);
+        $frame = $this->getFrameInstance($data);
+
+        $this->assertNull($frame->getFileContents());
+    }
+
     /**
      * @covers Whoops\Exception\Frame::getFileLines
      */