Merge pull request laravel#3802 from ezzatron/error-exception-arguments

taylorotwell · taylorotwell · commit 70d94d57d76f · 2014-03-23T23:09:48.000-05:00
Fixed 2 bugs in the error handler implementation
diff --git a/src/Illuminate/Exception/Handler.php b/src/Illuminate/Exception/Handler.php
@@ -126,11 +126,11 @@ protected function registerShutdownHandler()
 	 *
 	 * @throws \ErrorException
 	 */
-	public function handleError($level, $message, $file, $line, $context)
+	public function handleError($level, $message, $file = '', $line = 0, $context = array())
 	{
 		if (error_reporting() & $level)
 		{
-			throw new ErrorException($message, $level, 0, $file, $line);
+			throw new ErrorException($message, 0, $level, $file, $line);
 		}
 	}
 
diff --git a/tests/Exception/HandlerTest.php b/tests/Exception/HandlerTest.php
@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Exception\Handler;
+use Mockery as m;
+
+class HandlerTest extends PHPUnit_Framework_TestCase
+{
+    protected function setUp()
+    {
+        $this->responsePreparer = m::mock('Illuminate\Support\Contracts\ResponsePreparerInterface');
+        $this->plainDisplayer = m::mock('Illuminate\Exception\ExceptionDisplayerInterface');
+        $this->debugDisplayer = m::mock('Illuminate\Exception\ExceptionDisplayerInterface');
+        $this->handler = new Handler($this->responsePreparer, $this->plainDisplayer, $this->debugDisplayer);
+    }
+
+    public function testHandleErrorExceptionArguments()
+    {
+        $error = null;
+        try {
+            $this->handler->handleError(E_USER_ERROR, 'message', '/path/to/file', 111, array());
+        } catch (ErrorException $error) {}
+
+        $this->assertInstanceOf('ErrorException', $error);
+        $this->assertSame(E_USER_ERROR, $error->getSeverity(), 'error handler should not modify severity');
+        $this->assertSame('message', $error->getMessage(), 'error handler should not modify message');
+        $this->assertSame('/path/to/file', $error->getFile(), 'error handler should not modify path');
+        $this->assertSame(111, $error->getLine(), 'error handler should not modify line number');
+        $this->assertSame(0, $error->getCode(), 'error handler should use 0 exception code');
+    }
+
+    public function testHandleErrorOptionalArguments()
+    {
+        $error = null;
+        try {
+            $this->handler->handleError(E_USER_ERROR, 'message');
+        } catch (ErrorException $error) {}
+
+        $this->assertInstanceOf('ErrorException', $error);
+        $this->assertSame('', $error->getFile(), 'error handler should use correct default path');
+        $this->assertSame(0, $error->getLine(), 'error handler should use correct default line');
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -126,11 +126,11 @@ protected function registerShutdownHandler()`
`126`	`126`	`*`
`127`	`127`	`* @throws \ErrorException`
`128`	`128`	`*/`
`129`		`- public function handleError($level, $message, $file, $line, $context)`
	`129`	`+ public function handleError($level, $message, $file = '', $line = 0, $context = array())`
`130`	`130`	`{`
`131`	`131`	`if (error_reporting() & $level)`
`132`	`132`	`{`
`133`		`- throw new ErrorException($message, $level, 0, $file, $line);`
	`133`	`+ throw new ErrorException($message, 0, $level, $file, $line);`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`