From 355ae6e0bf12a20b385a370fcc5fde7179746270 Mon Sep 17 00:00:00 2001
From: "Bruno O. Notario" <bruno@exacti.com.br>
Date: Mon, 18 Sep 2023 00:30:47 -0300
Subject: [PATCH] Exceptions class, refact to PHP 8.2 fit

---
 system/database/databases/mysqli.php          |  4 +-
 system/engine/autoload.php                    |  2 +-
 system/engine/exception.php                   |  4 +-
 system/engine/restful.php                     |  6 ++-
 system/exception/BadFunctionCallException.php | 19 +++++++
 system/exception/BadMethodCallException.php   | 19 +++++++
 system/exception/DomainException.php          | 19 +++++++
 system/exception/InvalidArgumentException.php | 18 +++++++
 system/exception/LengthException.php          | 19 +++++++
 system/exception/LogicException.php           | 18 +++++++
 system/exception/OutOfBoundsException.php     | 19 +++++++
 system/exception/OutOfRangeException.php      | 19 +++++++
 system/exception/OverflowException.php        | 19 +++++++
 system/exception/RESTException.php            | 18 +++++++
 system/exception/RangeException.php           | 19 +++++++
 system/exception/RuntimeException.php         | 18 +++++++
 system/exception/Throwable.php                | 36 +++++++++++++
 system/exception/UnderflowException.php       | 19 +++++++
 system/exception/UnexpectedValueException.php | 19 +++++++
 system/exception/WebApiException.php          | 53 +++++++++++++++++++
 system/json/autoload.php                      |  4 +-
 system/login/autoload.php                     |  2 +
 system/magiql/Api/Syntax/OrderBy.php          | 14 +++++
 system/magiql/Builder.php                     |  4 +-
 system/magiql/Builder/BuilderException.php    |  4 +-
 .../magiql/Manipulation/AbstractBaseQuery.php | 33 ++++++------
 system/magiql/Manipulation/QueryException.php |  5 +-
 system/magiql/Syntax/OrderBy.php              | 12 ++---
 system/session/autoload.php                   |  2 +-
 29 files changed, 411 insertions(+), 36 deletions(-)
 create mode 100644 system/exception/BadFunctionCallException.php
 create mode 100644 system/exception/BadMethodCallException.php
 create mode 100644 system/exception/DomainException.php
 create mode 100644 system/exception/InvalidArgumentException.php
 create mode 100644 system/exception/LengthException.php
 create mode 100644 system/exception/LogicException.php
 create mode 100644 system/exception/OutOfBoundsException.php
 create mode 100644 system/exception/OutOfRangeException.php
 create mode 100644 system/exception/OverflowException.php
 create mode 100644 system/exception/RESTException.php
 create mode 100644 system/exception/RangeException.php
 create mode 100644 system/exception/RuntimeException.php
 create mode 100644 system/exception/Throwable.php
 create mode 100644 system/exception/UnderflowException.php
 create mode 100644 system/exception/UnexpectedValueException.php
 create mode 100644 system/exception/WebApiException.php
 create mode 100644 system/magiql/Api/Syntax/OrderBy.php

diff --git a/system/database/databases/mysqli.php b/system/database/databases/mysqli.php
index 831d9a4..f101f97 100644
--- a/system/database/databases/mysqli.php
+++ b/system/database/databases/mysqli.php
@@ -43,7 +43,9 @@ class MySQLi implements Databases {
 		}
 
 		if (!$this->connection->connect_errno) {
-			$this->connection->report_mode = MYSQLI_REPORT_ERROR;
+			if(isset($this->connection->report_mode))
+				$this->connection->report_mode = MYSQLI_REPORT_ERROR;
+				
 			$this->connection->set_charset($charset);
 			//$this->connection->query("SET SESSION sql_mode = 'NO_ZERO_IN_DATE,NO_ENGINE_SUBSTITUTION'");
 			$this->connection->query("SET SQL_MODE = ''");
diff --git a/system/engine/autoload.php b/system/engine/autoload.php
index d47166c..3c6b3b9 100644
--- a/system/engine/autoload.php
+++ b/system/engine/autoload.php
@@ -123,7 +123,7 @@
 	 * @throws \TypeError 
 	 */
 	static public function run() {
-		return spl_autoload_register(['self', 'load']);
+		return spl_autoload_register([self::class, 'load']);
 	}
 
 	/**
diff --git a/system/engine/exception.php b/system/engine/exception.php
index ba2730d..219ea0a 100644
--- a/system/engine/exception.php
+++ b/system/engine/exception.php
@@ -18,7 +18,7 @@ namespace Phacil\Framework;
  * @package Phacil\Framework
  * @api
  */
-class Exception extends \Exception
+class Exception extends \Exception implements \Phacil\Framework\Exception\Throwable
 {
 	public $errorFormat = 'text';
 
@@ -55,7 +55,7 @@ class Exception extends \Exception
 			'trace' => ($debugging) ? (($this->errorFormat == 'json') ? ($this->heritageTrace ?: $this->getTrace()) : Debug::trace(($this->heritageTrace ?: $this->getTrace()))) : null
 		];
 		$log->write(($this->errorFormat == 'json') ? json_encode($errorStamp) : implode(PHP_EOL, array_map(
-			['self','convertArray'],
+			[self::class,'convertArray'],
 			$errorStamp,
 			array_keys($errorStamp)
 		)));
diff --git a/system/engine/restful.php b/system/engine/restful.php
index f1507ac..3955afc 100644
--- a/system/engine/restful.php
+++ b/system/engine/restful.php
@@ -143,7 +143,11 @@ abstract class RESTful extends Controller {
 			try {
 				//code...
 				call_user_func_array(array($this, $method), $params);
-			} catch (\Throwable $th) {
+			} catch (\Phacil\Framework\Exception\WebApiException $re) {
+				$this->data = is_string($re->getMessage()) ? ['error' => $re->getMessage()] : $re->getMessage();
+				$this->response->code($re->getCode());
+				$this->out();
+			}catch (\Phacil\Framework\Exception\Throwable $th) {
 				if(get_class($th) == 'TypeError'){
 					new Exception($th->getMessage(), $th->getCode());
 					return $this->__callInterrupt($th->getMessage());
diff --git a/system/exception/BadFunctionCallException.php b/system/exception/BadFunctionCallException.php
new file mode 100644
index 0000000..40dc997
--- /dev/null
+++ b/system/exception/BadFunctionCallException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+
+namespace Phacil\Framework\Exception;
+
+/**
+ * Exception thrown if a callback refers to an undefined function or if some arguments are missing.
+ * 
+ * @package Phacil\Framework\Exception
+ */
+class BadFunctionCallException extends \Phacil\Framework\Exception\LogicException {
+
+}
\ No newline at end of file
diff --git a/system/exception/BadMethodCallException.php b/system/exception/BadMethodCallException.php
new file mode 100644
index 0000000..84af70e
--- /dev/null
+++ b/system/exception/BadMethodCallException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+
+namespace Phacil\Framework\Exception;
+
+/**
+ * Exception thrown if a callback refers to an undefined method or if some arguments are missing.
+ * 
+ * @package Phacil\Framework\Exception
+ */
+class BadMethodCallException extends \Phacil\Framework\Exception\BadFunctionCallException {
+
+}
\ No newline at end of file
diff --git a/system/exception/DomainException.php b/system/exception/DomainException.php
new file mode 100644
index 0000000..b981d96
--- /dev/null
+++ b/system/exception/DomainException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+
+namespace Phacil\Framework\Exception;
+
+/**
+ * Exception thrown if a value does not adhere to a defined valid data domain.
+ * 
+ * @package Phacil\Framework\Exception
+ */
+class DomainException extends \Phacil\Framework\Exception\LogicException {
+
+}
\ No newline at end of file
diff --git a/system/exception/InvalidArgumentException.php b/system/exception/InvalidArgumentException.php
new file mode 100644
index 0000000..4188439
--- /dev/null
+++ b/system/exception/InvalidArgumentException.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+
+namespace Phacil\Framework\Exception;
+
+/**
+ * Exception thrown if an argument is not of the expected type.
+ * @package Phacil\Framework\Exception
+ */
+class InvalidArgumentException extends \Phacil\Framework\Exception\LogicException {
+
+}
\ No newline at end of file
diff --git a/system/exception/LengthException.php b/system/exception/LengthException.php
new file mode 100644
index 0000000..79fd0da
--- /dev/null
+++ b/system/exception/LengthException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+
+namespace Phacil\Framework\Exception;
+
+/**
+ * Exception thrown if a length is invalid.
+ * 
+ * @package Phacil\Framework\Exception
+ */
+class LengthException extends \Phacil\Framework\Exception\LogicException {
+
+}
\ No newline at end of file
diff --git a/system/exception/LogicException.php b/system/exception/LogicException.php
new file mode 100644
index 0000000..156a7c7
--- /dev/null
+++ b/system/exception/LogicException.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+namespace Phacil\Framework\Exception;
+
+/**
+ * Exception that represents error in the program logic. This kind of exception should lead directly to a fix in your code.
+ * 
+ * @package Phacil\Framework\Exception
+ */
+class LogicException extends \Phacil\Framework\Exception {
+
+}
\ No newline at end of file
diff --git a/system/exception/OutOfBoundsException.php b/system/exception/OutOfBoundsException.php
new file mode 100644
index 0000000..203bf68
--- /dev/null
+++ b/system/exception/OutOfBoundsException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+
+namespace Phacil\Framework\Exception;
+
+/**
+ * Exception thrown if a value is not a valid key. This represents errors that cannot be detected at compile time.
+ * 
+ * @package Phacil\Framework\Exception
+ */
+class OutOfBoundsException extends \Phacil\Framework\Exception\RuntimeException {
+
+}
\ No newline at end of file
diff --git a/system/exception/OutOfRangeException.php b/system/exception/OutOfRangeException.php
new file mode 100644
index 0000000..41f96c1
--- /dev/null
+++ b/system/exception/OutOfRangeException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+
+namespace Phacil\Framework\Exception;
+
+/**
+ * Exception thrown when an illegal index was requested. This represents errors that should be detected at compile time.
+ * 
+ * @package Phacil\Framework\Exception
+ */
+class OutOfRangeException extends \Phacil\Framework\Exception\LogicException {
+
+}
\ No newline at end of file
diff --git a/system/exception/OverflowException.php b/system/exception/OverflowException.php
new file mode 100644
index 0000000..d103e71
--- /dev/null
+++ b/system/exception/OverflowException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+
+namespace Phacil\Framework\Exception;
+
+/**
+ * Exception thrown when adding an element to a full container.
+ * 
+ * @package Phacil\Framework\Exception
+ */
+class OverflowException extends \Phacil\Framework\Exception\RuntimeException {
+
+}
\ No newline at end of file
diff --git a/system/exception/RESTException.php b/system/exception/RESTException.php
new file mode 100644
index 0000000..5477062
--- /dev/null
+++ b/system/exception/RESTException.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+
+namespace Phacil\Framework\Exception;
+
+/**
+ * Exception for Rest API.
+ * @package Phacil\Framework\Exception
+ */
+class RESTException extends \Phacil\Framework\Exception\WebApiException {
+
+}
\ No newline at end of file
diff --git a/system/exception/RangeException.php b/system/exception/RangeException.php
new file mode 100644
index 0000000..c964e31
--- /dev/null
+++ b/system/exception/RangeException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+
+namespace Phacil\Framework\Exception;
+
+/**
+ * Exception thrown to indicate range errors during program execution. Normally this means there was an arithmetic error other than under/overflow. This is the runtime version of \Phacil\Framework\Exception\DomainException.
+ * 
+ * @package Phacil\Framework\Exception
+ */
+class RangeException extends \Phacil\Framework\Exception\RuntimeException {
+
+}
\ No newline at end of file
diff --git a/system/exception/RuntimeException.php b/system/exception/RuntimeException.php
new file mode 100644
index 0000000..f826d4e
--- /dev/null
+++ b/system/exception/RuntimeException.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+namespace Phacil\Framework\Exception;
+
+/**
+ * Exception thrown if an error which can only be found on runtime occurs.
+ * 
+ * @package Phacil\Framework\Exception
+ */
+class RuntimeException extends \Phacil\Framework\Exception
+{
+}
diff --git a/system/exception/Throwable.php b/system/exception/Throwable.php
new file mode 100644
index 0000000..41de2a9
--- /dev/null
+++ b/system/exception/Throwable.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+namespace Phacil\Framework\Exception;
+
+if (interface_exists('Throwable')) {
+	interface ThrowableBase extends \Throwable {}
+} else {
+	interface ThrowableBase{
+		public function getMessage();
+		public function getCode();
+		public function getFile();
+		public function getLine();
+		public function getTrace();
+		public function getTraceAsString();
+		public function getPrevious();
+		public function __toString();
+	}
+}
+
+/**
+ * Throwable is the base interface for any object that can be thrown via a throw statement, including Error and Exception.
+ * 
+ * Note: PHP classes cannot implement the \Throwable interface directly, and must instead extend \Exception. You can implement this interface on any class.
+ * 
+ * @package Phacil\Framework\Exception
+ */
+interface Throwable extends ThrowableBase {
+
+}
+
diff --git a/system/exception/UnderflowException.php b/system/exception/UnderflowException.php
new file mode 100644
index 0000000..f8061f7
--- /dev/null
+++ b/system/exception/UnderflowException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+
+namespace Phacil\Framework\Exception;
+
+/**
+ * Exception thrown when performing an invalid operation on an empty container, such as removing an element.
+ * 
+ * @package Phacil\Framework\Exception
+ */
+class UnderflowException extends \Phacil\Framework\Exception\RuntimeException {
+
+}
\ No newline at end of file
diff --git a/system/exception/UnexpectedValueException.php b/system/exception/UnexpectedValueException.php
new file mode 100644
index 0000000..4812101
--- /dev/null
+++ b/system/exception/UnexpectedValueException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+
+namespace Phacil\Framework\Exception;
+
+/**
+ * Exception thrown if a value does not match with a set of values. Typically this happens when a function calls another function and expects the return value to be of a certain type or value not including arithmetic or buffer related errors.
+ * 
+ * @package Phacil\Framework\Exception
+ */
+class UnexpectedValueException extends \Phacil\Framework\Exception\RuntimeException {
+
+}
\ No newline at end of file
diff --git a/system/exception/WebApiException.php b/system/exception/WebApiException.php
new file mode 100644
index 0000000..5601bbd
--- /dev/null
+++ b/system/exception/WebApiException.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+
+namespace Phacil\Framework\Exception;
+
+/**
+ * Exception for Rest API
+ * @package Phacil\Framework\Exception
+ */
+class WebApiException extends \Phacil\Framework\Exception {
+
+	/**
+	 * Error HTTP response codes.
+	 */
+	const HTTP_BAD_REQUEST = 400;
+
+	const HTTP_UNAUTHORIZED = 401;
+
+	const HTTP_FORBIDDEN = 403;
+
+	const HTTP_NOT_FOUND = 404;
+
+	const HTTP_METHOD_NOT_ALLOWED = 405;
+
+	const HTTP_NOT_ACCEPTABLE = 406;
+
+	const HTTP_INTERNAL_ERROR = 500;
+
+	/**
+	 * Fault codes that are used in SOAP faults.
+	 */
+	const FAULT_CODE_SENDER = 'Sender';
+	const FAULT_CODE_RECEIVER = 'Receiver';
+
+	/**
+	 * Construct the exception. Note: The message is NOT binary safe.
+	 * 
+	 * @param string|array $message 
+	 * @param int $code 
+	 * @param \Phacil\Framework\Exception\Throwable|null $previous 
+	 * @return void 
+	 */
+	public function __construct($message = "", int $code = 400, $previous = null) {
+		parent::__construct((is_array($message) ? \Phacil\Framework\Json::encode($message) : $message), $code, $previous);
+	}
+
+}
\ No newline at end of file
diff --git a/system/json/autoload.php b/system/json/autoload.php
index ae3899b..f044108 100644
--- a/system/json/autoload.php
+++ b/system/json/autoload.php
@@ -31,7 +31,7 @@ class Json implements Serializer
 	 */
 	static public function encode($data)
 	{
-		$result = json_encode($data);
+		$result = \json_encode($data);
 		if (false === $result) {
 			throw new \InvalidArgumentException("Unable to serialize value. Error: " . self::json_last_error_msg());
 		}
@@ -48,7 +48,7 @@ class Json implements Serializer
 	 */
 	static public function decode($string, $array = true)
 	{
-		$result = json_decode($string, $array);
+		$result = \json_decode($string, $array);
 		if (json_last_error() !== JSON_ERROR_NONE) {
 			throw new \InvalidArgumentException("Unable to unserialize value. Error: " . self::json_last_error_msg());
 		}
diff --git a/system/login/autoload.php b/system/login/autoload.php
index c0e6eea..1461f0c 100644
--- a/system/login/autoload.php
+++ b/system/login/autoload.php
@@ -35,6 +35,8 @@ class Login implements \Phacil\Framework\Login\Interfaces\Login {
 	 * @var \Phacil\Framework\Registry|null
 	 */
 	private $engine = null;
+
+	protected $registry;
 	
 	/**
 	 * @inheritdoc
diff --git a/system/magiql/Api/Syntax/OrderBy.php b/system/magiql/Api/Syntax/OrderBy.php
new file mode 100644
index 0000000..adb998d
--- /dev/null
+++ b/system/magiql/Api/Syntax/OrderBy.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © 2023 ExacTI Technology Solutions. All rights reserved.
+ * GPLv3 General License.
+ * https://exacti.com.br
+ * Phacil PHP Framework - https://github.com/exacti/phacil-framework
+ */
+
+namespace Phacil\Framework\MagiQL\Api\Syntax;
+
+interface OrderBy {
+	const ASC = 'ASC';
+	const DESC = 'DESC';
+}
\ No newline at end of file
diff --git a/system/magiql/Builder.php b/system/magiql/Builder.php
index 011ceba..f404c12 100644
--- a/system/magiql/Builder.php
+++ b/system/magiql/Builder.php
@@ -209,7 +209,7 @@ class Builder implements \Phacil\Framework\MagiQL\Api\BuilderInterface
      *
      * @return string
      *
-     * @throws \RuntimeException
+     * @throws \Phacil\Framework\MagiQL\Builder\BuilderException
      */
     public function write(QueryInterface $query, $resetPlaceholders = true)
     {
@@ -225,7 +225,7 @@ class Builder implements \Phacil\Framework\MagiQL\Api\BuilderInterface
             return $this->queryWriterInstances[$queryPart]->write($query);
         }
 
-        throw new \RuntimeException('Query builder part not defined.');
+        throw new \Phacil\Framework\MagiQL\Builder\BuilderException('Query builder part not defined.');
     }
 
     /**
diff --git a/system/magiql/Builder/BuilderException.php b/system/magiql/Builder/BuilderException.php
index 72aec95..f282190 100644
--- a/system/magiql/Builder/BuilderException.php
+++ b/system/magiql/Builder/BuilderException.php
@@ -8,6 +8,8 @@
 
 namespace Phacil\Framework\MagiQL\Builder;
 
-class BuilderException extends \Exception
+use Phacil\Framework\Exception;
+
+class BuilderException extends Exception
 {
 }
diff --git a/system/magiql/Manipulation/AbstractBaseQuery.php b/system/magiql/Manipulation/AbstractBaseQuery.php
index 661d1b8..ab1651c 100644
--- a/system/magiql/Manipulation/AbstractBaseQuery.php
+++ b/system/magiql/Manipulation/AbstractBaseQuery.php
@@ -27,7 +27,7 @@ abstract class AbstractBaseQuery implements QueryInterface, QueryPartInterface
     protected $comment = '';
 
     /**
-     * @var \Phacil\Framework\MagiQL\Builder\BuilderInterface
+     * @var \Phacil\Framework\MagiQL\Api\BuilderInterface
      */
     protected $builder;
 
@@ -80,10 +80,8 @@ abstract class AbstractBaseQuery implements QueryInterface, QueryPartInterface
 
     /**
      * Stores the builder that created this query.
-     *
-     * @param BuilderInterface $builder
-     *
-     * @return $this
+     * @param \Phacil\Framework\MagiQL\Api\BuilderInterface $builder 
+     * @return $this 
      */
     final public function setBuilder(BuilderInterface $builder)
     {
@@ -93,14 +91,14 @@ abstract class AbstractBaseQuery implements QueryInterface, QueryPartInterface
     }
 
     /**
-     * @return BuilderInterface
-     *
-     * @throws \RuntimeException when builder has not been injected
+     * 
+     * @return \Phacil\Framework\MagiQL\Api\BuilderInterface 
+     * @throws \Phacil\Framework\Exception\RuntimeException 
      */
     final public function getBuilder()
     {
         if (!$this->builder) {
-            throw new \RuntimeException('Query builder has not been injected with setBuilder');
+            throw new \Phacil\Framework\Exception\RuntimeException('Query builder has not been injected with setBuilder');
         }
 
         return $this->builder;
@@ -163,7 +161,8 @@ abstract class AbstractBaseQuery implements QueryInterface, QueryPartInterface
     }
 
     /**
-     * @return Table
+     * 
+     * @return \Phacil\Framework\MagiQL\Syntax\Table|null
      */
     public function getTable()
     {
@@ -221,13 +220,13 @@ abstract class AbstractBaseQuery implements QueryInterface, QueryPartInterface
         return $this->where->getConjunction();
     }
 
-    /**
-     * @param string $column
-     * @param string $direction
-     * @param null   $table
-     *
-     * @return $this
-     */
+     /**
+      * 
+      * @param string $column 
+      * @param string $direction 
+      * @param null|Table $table 
+      * @return $this 
+      */
     public function orderBy($column, $direction = OrderBy::ASC, $table = null)
     {
         $newColumn = array($column);
diff --git a/system/magiql/Manipulation/QueryException.php b/system/magiql/Manipulation/QueryException.php
index 99f91d1..d10deb0 100644
--- a/system/magiql/Manipulation/QueryException.php
+++ b/system/magiql/Manipulation/QueryException.php
@@ -10,8 +10,9 @@
 namespace Phacil\Framework\MagiQL\Manipulation;
 
 /**
- * Class QueryException.
+ * 
+ * @package Phacil\Framework\MagiQL\Manipulation
  */
-class QueryException extends \Exception
+class QueryException extends \Phacil\Framework\Exception
 {
 }
diff --git a/system/magiql/Syntax/OrderBy.php b/system/magiql/Syntax/OrderBy.php
index 899d6c2..b551328 100644
--- a/system/magiql/Syntax/OrderBy.php
+++ b/system/magiql/Syntax/OrderBy.php
@@ -9,13 +9,13 @@
 
 namespace Phacil\Framework\MagiQL\Syntax;
 
+use Phacil\Framework\MagiQL\Api\Syntax\OrderBy as OrderByInterface;
+
 /**
  * Class OrderBy.
  */
-class OrderBy
+class OrderBy implements OrderByInterface
 {
-    const ASC = 'ASC';
-    const DESC = 'DESC';
 
     /**
      * @var Column
@@ -73,14 +73,14 @@ class OrderBy
     /**
      * @param string $direction
      *
-     * @throws \InvalidArgumentException
+     * @throws \Phacil\Framework\Exception\InvalidArgumentException
      *
      * @return $this
      */
     public function setDirection($direction)
     {
-        if (!in_array($direction, array(self::ASC, self::DESC))) {
-            throw new \InvalidArgumentException(
+        if (!in_array($direction, array(OrderByInterface::ASC, OrderByInterface::DESC))) {
+            throw new \Phacil\Framework\Exception\InvalidArgumentException(
                 "Specified direction '$direction' is not allowed. Only ASC or DESC are allowed."
             );
         }
diff --git a/system/session/autoload.php b/system/session/autoload.php
index defc677..77c9d87 100644
--- a/system/session/autoload.php
+++ b/system/session/autoload.php
@@ -247,7 +247,7 @@ final class Session
      * @return mixed|null 
      */
     public function getData($key) {
-        return $this->data[$key] ?? null;
+        return isset($this->data[$key]) ? $this->data[$key] : null;
     }
 
     /**