Merge pull request #102 from OwlyCode/fix-php7-errors

mcg-web · web-flow · commit 01c3a7d93ff1 · 2017-01-17T11:14:33.000+01:00
Added php7 errors compatibility
diff --git a/Error/ErrorHandler.php b/Error/ErrorHandler.php
@@ -164,9 +164,9 @@ public function handleErrors(ExecutionResult $executionResult, $throwRawExceptio
      *
      * @param \Exception $rawException
      *
-     * @return \Exception
+     * @return \Exception|\Error
      */
-    protected function convertException(\Exception $rawException = null)
+    protected function convertException($rawException = null)
     {
         if (null === $rawException) {
             return;

Original file line number	Diff line number	Diff line change
`@@ -164,9 +164,9 @@ public function handleErrors(ExecutionResult $executionResult, $throwRawExceptio`
`164`	`164`	`*`
`165`	`165`	`* @param \Exception $rawException`
`166`	`166`	`*`
`167`		`- * @return \Exception`
	`167`	`+ * @return \Exception\|\Error`
`168`	`168`	`*/`
`169`		`- protected function convertException(\Exception $rawException = null)`
	`169`	`+ protected function convertException($rawException = null)`
`170`	`170`	`{`
`171`	`171`	`if (null === $rawException) {`
`172`	`172`	`return;`