Fix PHP 7 compatibility

barbushin · barbushin · commit c0dfee53705a · 2016-02-19T12:12:03.000+08:00
ref #111
diff --git a/src/PhpConsole/Dispatcher/Errors.php b/src/PhpConsole/Dispatcher/Errors.php
@@ -68,9 +68,9 @@ public function dispatchError($code = null, $text = null, $file = null, $line =
 
 	/**
 	 * Send exception message to client
-	 * @param \Exception $exception
+	 * @param \Exception|\Throwable $exception
 	 */
-	public function dispatchException(\Exception $exception) {
+	public function dispatchException($exception) {
 		if($this->isActive()) {
 			if($this->dispatchPreviousExceptions && $exception->getPrevious()) {
 				$this->dispatchException($exception->getPrevious());
diff --git a/src/PhpConsole/EvalProvider.php b/src/PhpConsole/EvalProvider.php
@@ -41,6 +41,9 @@ public function evaluate($code) {
 		try {
 			$result->return = static::executeCode($code, $this->sharedVars);
 		}
+		catch(\Throwable $exception) {
+			$result->exception = $exception;
+		}
 		catch(\Exception $exception) {
 			$result->exception = $exception;
 		}
diff --git a/src/PhpConsole/Handler.php b/src/PhpConsole/Handler.php
@@ -208,9 +208,9 @@ protected function isHandlingDisabled() {
 
 	/**
 	 * Handle exception object
-	 * @param \Exception $exception
+	 * @param \Exception|\Throwable $exception
 	 */
-	public function handleException(\Exception $exception) {
+	public function handleException($exception) {
 		if(!$this->isStarted || $this->isHandlingDisabled()) {
 			return;
 		}
@@ -221,6 +221,9 @@ public function handleException(\Exception $exception) {
 				call_user_func($this->oldExceptionsHandler, $exception);
 			}
 		}
+		catch(\Throwable $internalException) {
+			$this->handleException($internalException);
+		}
 		catch(\Exception $internalException) {
 			$this->handleException($internalException);
 		}
diff --git a/src/PhpConsole/OldVersionAdapter.php b/src/PhpConsole/OldVersionAdapter.php
@@ -97,7 +97,7 @@ public function handleError($code = null, $message = null, $file = null, $line =
 			$this->getHandler()->handleError($code, $message, $file, $line, null, 1);
 		}
 
-		public function handleException(\Exception $exception) {
+		public function handleException($exception) {
 			$this->getHandler()->handleException($exception);
 		}
 
diff --git a/src/PhpConsole/PsrLogger.php b/src/PhpConsole/PsrLogger.php
@@ -62,7 +62,7 @@ public function log($level, $message, array $context = array()) {
 			$this->connector->getDebugDispatcher()->dispatchDebug($message, static::$debugLevels[$level], $this->ignoreTraceCalls);
 		}
 		elseif(isset(static::$errorsLevels[$level])) {
-			if(isset($context['exception']) && $context['exception'] instanceof \Exception) {
+			if(isset($context['exception']) && ($context['exception'] instanceof \Exception || $context['exception'] instanceof \Throwable)) {
 				$this->connector->getErrorsDispatcher()->dispatchException($context['exception']);
 			}
 			else {

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,9 @@ public function evaluate($code) {`
`41`	`41`	`try {`
`42`	`42`	`$result->return = static::executeCode($code, $this->sharedVars);`
`43`	`43`	`}`
	`44`	`+ catch(\Throwable $exception) {`
	`45`	`+ $result->exception = $exception;`
	`46`	`+ }`
`44`	`47`	`catch(\Exception $exception) {`
`45`	`48`	`$result->exception = $exception;`
`46`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -208,9 +208,9 @@ protected function isHandlingDisabled() {`
`208`	`208`
`209`	`209`	`/**`
`210`	`210`	`* Handle exception object`
`211`		`- * @param \Exception $exception`
	`211`	`+ * @param \Exception\|\Throwable $exception`
`212`	`212`	`*/`
`213`		`- public function handleException(\Exception $exception) {`
	`213`	`+ public function handleException($exception) {`
`214`	`214`	`if(!$this->isStarted \|\| $this->isHandlingDisabled()) {`
`215`	`215`	`return;`
`216`	`216`	`}`
`@@ -221,6 +221,9 @@ public function handleException(\Exception $exception) {`
`221`	`221`	`call_user_func($this->oldExceptionsHandler, $exception);`
`222`	`222`	`}`
`223`	`223`	`}`
	`224`	`+ catch(\Throwable $internalException) {`
	`225`	`+ $this->handleException($internalException);`
	`226`	`+ }`
`224`	`227`	`catch(\Exception $internalException) {`
`225`	`228`	`$this->handleException($internalException);`
`226`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function handleError($code = null, $message = null, $file = null, $line =`
`97`	`97`	`$this->getHandler()->handleError($code, $message, $file, $line, null, 1);`
`98`	`98`	`}`
`99`	`99`
`100`		`- public function handleException(\Exception $exception) {`
	`100`	`+ public function handleException($exception) {`
`101`	`101`	`$this->getHandler()->handleException($exception);`
`102`	`102`	`}`
`103`	`103`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function log($level, $message, array $context = array()) {`
`62`	`62`	`$this->connector->getDebugDispatcher()->dispatchDebug($message, static::$debugLevels[$level], $this->ignoreTraceCalls);`
`63`	`63`	`}`
`64`	`64`	`elseif(isset(static::$errorsLevels[$level])) {`
`65`		`- if(isset($context['exception']) && $context['exception'] instanceof \Exception) {`
	`65`	`+ if(isset($context['exception']) && ($context['exception'] instanceof \Exception \|\| $context['exception'] instanceof \Throwable)) {`
`66`	`66`	`$this->connector->getErrorsDispatcher()->dispatchException($context['exception']);`
`67`	`67`	`}`
`68`	`68`	`else {`