Version 5.0.0 beta 1

system/Api/Exception.php

@@ -11,26 +11,30 @@
 namespace IPS\Api;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use Exception as PHPException;
+use function defined;
+
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
-	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
 }
 
 /**
  * API Exception
  */
-class _Exception extends \Exception
+class Exception extends PHPException
 {
 	/**
 	 * @brief	Exception code
 	 */
-	public $exceptionCode;
+	public string $exceptionCode = '';
 	
 	/**
 	 * @brief	OAUth Error
 	 */
-	public $oauthError;
+	public string $oauthError = '';
 	
 	/**
 	 * Constructor
@@ -41,10 +45,10 @@ class _Exception extends \Exception
 	 * @param	string	$oauthError	Error Message for OAuth
 	 * @return	void
 	 */
-	public function __construct( $message, $code, $httpCode, $oauthError = 'invalid_request' )
+	public function __construct( string $message, string $code, int $httpCode, string $oauthError = 'invalid_request' )
 	{
 		$this->exceptionCode = $code;
 		$this->oauthError = $oauthError;
-		return parent::__construct( $message, $httpCode );
+		parent::__construct( $message, $httpCode );
 	}
 }