Version 5.0.0 beta 1

system/Api/GraphQL/SafeException.php

@@ -11,28 +11,30 @@
 namespace IPS\Api\GraphQL;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+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;
 }
 
+use Exception;
 use GraphQL\Error\ClientAware;
+use function defined;
 
 /**
  * API Exception
  */
-class _SafeException extends \Exception implements ClientAware
+class SafeException extends Exception implements ClientAware
 {
 	/**
 	 * @brief	Exception code
 	 */
-	public $exceptionCode;
+	public ?string $exceptionCode = null;
 	
 	/**
 	 * @brief	OAUth Error
 	 */
-	public $oauthError;
+	public ?string $oauthError = null;
 	
 	/**
 	 * Constructor
@@ -40,21 +42,20 @@ class _SafeException extends \Exception implements ClientAware
 	 * @param	string	$message	Error Message
 	 * @param	string	$code		Code
 	 * @param	int		$httpCode	HTTP Error code
-	 * @param	string	$oauthError	Error Message for OAuth
 	 * @return	void
 	 */
-	public function __construct( $message, $code, $httpCode )
+	public function __construct( string $message, string $code, int $httpCode )
 	{
 		$this->exceptionCode = $code;
-		return parent::__construct( $message, $httpCode );
+		parent::__construct( $message, $httpCode );
 	}
 
-	public function getCategory()
+	public function getCategory() : string
 	{
 		return 'clienterror';
 	}
 
-	public function isClientSafe()
+	public function isClientSafe() : bool
 	{
 		return true;
 	}