Fix handling exceptions / errors with PHP 7

Restrict compatibility with PHP 7.4 This implies major changes, with no BC, require more tests
Sowapps · May 12, 2020 · ce659b8 · ce659b8
1 parent 64cafad
commit ce659b8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -12,6 +12,7 @@
 	}
   },
   "require": {
+	"php": "7.4.*",
 	"orpheus/orpheus-core": "1.*",
 	"orpheus/orpheus-entitydescriptor": "1.*",
 	"orpheus/orpheus-inputcontroller": "1.*",

diff --git a/src/Rest/Controller/Api/RestController.php b/src/Rest/Controller/Api/RestController.php
@@ -5,13 +5,13 @@
 
 namespace Orpheus\Rest\Controller\Api;
 
-use Exception;
 use Orpheus\EntityDescriptor\User\AbstractUser;
 use Orpheus\EntityDescriptor\User\UserApiConnectible;
 use Orpheus\Exception\UserException;
 use Orpheus\InputController\HTTPController\HTTPController;
 use Orpheus\InputController\HTTPController\HTTPRequest;
 use Orpheus\InputController\HTTPController\JSONHTTPResponse;
+use Throwable;
 
 /**
  * Class RestController
@@ -74,7 +74,7 @@ public function renderOutput($data) {
 		return new JSONHTTPResponse($data);
 	}
 
-	public function processException(Exception $exception, $values = []) {
+	public function processException(Throwable $exception, $values = []) {
 		return JSONHTTPResponse::generateFromException($exception);
 	}
 

diff --git a/src/Rest/Controller/TemplateController.php b/src/Rest/Controller/TemplateController.php
@@ -7,7 +7,6 @@
 
 use Orpheus\Config\YAML\YAML;
 use Orpheus\Exception\ForbiddenException;
-use Orpheus\InputController\HTTPController\JSONHTTPResponse;
 use Orpheus\InputController\InputRequest;
 use Orpheus\InputController\OutputResponse;
 use Orpheus\Rest\Controller\Api\RestController;
@@ -21,7 +20,7 @@ class TemplateController extends RestController {
 
 	/**
 	 * @param InputRequest $request
-	 * @return JSONHTTPResponse|OutputResponse|null
+	 * @return OutputResponse
 	 * @throws ForbiddenException
 	 */
 	public function run($request) {

diff --git a/src/Rest/XMLHTTPResponse.php b/src/Rest/XMLHTTPResponse.php
@@ -6,6 +6,7 @@
 use Orpheus\Exception\UserException;
 use Orpheus\Exception\UserReportsException;
 use Orpheus\InputController\HTTPController\HTTPResponse;
+use Throwable;
 
 /**
  * Class XMLHTTPResponse
@@ -76,7 +77,7 @@ public static function returnData($data) {
 	 * @param string $action
 	 * @return XMLHTTPResponse
 	 */
-	public static function generateFromException(Exception $exception, $action = 'Handling the request') {
+	public static function generateFromException(Throwable $exception, $action = 'Handling the request') {
 		$code = $exception->getCode();
 		if( $code < 100 ) {
 			$code = HTTP_INTERNAL_SERVER_ERROR;