Merge 638bc7b into 954472c

slimphp · May 16, 2016 · 94d3f5f · 94d3f5f
2 parents 954472c + 638bc7b
commit 94d3f5f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/Slim/Handlers/AbstractError.php b/Slim/Handlers/AbstractError.php
@@ -43,7 +43,7 @@ protected function writeToErrorLog($throwable)
 
         $message = 'Slim Application Error:' . PHP_EOL;
         $message .= $this->renderThrowableAsText($throwable);
-        while ($error = $throwable->getPrevious()) {
+        while ($throwable = $throwable->getPrevious()) {
             $message .= PHP_EOL . 'Previous error:' . PHP_EOL;
             $message .= $this->renderThrowableAsText($throwable);
         }

diff --git a/tests/Handlers/ErrorTest.php b/tests/Handlers/ErrorTest.php
@@ -43,6 +43,25 @@ public function testError($acceptHeader, $contentType, $startOfBody)
         $this->assertEquals(0, strpos((string)$res->getBody(), $startOfBody));
     }
 
+    /**
+     * Test the exception rendering runs to completion (no infinite loop)
+     *
+     * @dataProvider errorProvider
+     */
+    public function testErrorExceptionWithPrevious($acceptHeader, $contentType, $startOfBody)
+    {
+        $error = new Error();
+        $e = new \Exception("Oops", 1, new \Exception());
+
+        /** @var Response $res */
+        $res = $error->__invoke($this->getRequest('GET', $acceptHeader), new Response(), $e);
+
+        $this->assertSame(500, $res->getStatusCode());
+        $this->assertSame($contentType, $res->getHeaderLine('Content-Type'));
+        $this->assertEquals(0, strpos((string)$res->getBody(), $startOfBody));
+        // if we have reached this point, there is no infinite loop, otherwise an out of memory error will occur
+    }
+
     /**
      * @param string $method
      * @return \PHPUnit_Framework_MockObject_MockObject|\Slim\Http\Request