Rollback for compatibility with PHP 5.4 - 5.6 😞

exacti · Jul 31, 2021 · 2e50b2c · 2e50b2c
1 parent 672f231
commit 2e50b2c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 23 deletions.
diff --git a/system/engine/front.php b/system/engine/front.php
@@ -9,7 +9,6 @@
 namespace Phacil\Framework;
 
 use Phacil\Framework\Interfaces\Front as frontinterface;
-use Phacil\Framework\Interfaces\Action;
 
 use Exception;
 
@@ -77,7 +76,7 @@ public function dispatch(\Phacil\Framework\Interfaces\Action $action, $error) {
 	 * @return \Phacil\Framework\Interfaces\Action 
 	 * @throws Exception 
 	 */
-	private function execute(object $action) {
+	private function execute($action) {
 		$file = $action->getFile();
 		$class = $action->getClass();
 		$classAlt = $action->getClassAlt();
@@ -96,7 +95,7 @@ private function execute(object $action) {
 
 						break;
 					}
-				} catch (\Throwable $th) {
+				} catch (\Exception $th) {
 					//throw $th;
 				}
 			}
@@ -110,7 +109,7 @@ private function execute(object $action) {
 					$this->error = '';
 					throw new \Exception("The controller can't be loaded", 1);
 				}
-			} catch (\Throwable $th) {
+			} catch (\Exception $th) {
 				//throw $th;
 				$action = new Action($this->error);
 

diff --git a/system/engine/interfaces/action.php b/system/engine/interfaces/action.php
@@ -18,10 +18,10 @@ interface Action {
 	public function __construct($route, $args = array());
 
 	/** @return string  */
-	public function getFile():string;
+	public function getFile();
 
 	/** @return string  */
-	public function getClass():string;
+	public function getClass();
 
 	/**
 	 * 
@@ -31,11 +31,11 @@ public function getClass():string;
 	public function setClass($class);
 
 	/** @return array  */
-	public function getClassAlt():array;
+	public function getClassAlt();
 
 	/** @return string  */
-	public function getMethod():string;
+	public function getMethod();
 
 	/** @return array  */
-	public function getArgs():array;
+	public function getArgs();
 }
diff --git a/system/engine/interfaces/front.php b/system/engine/interfaces/front.php
@@ -8,8 +8,6 @@
 
 namespace Phacil\Framework\Interfaces;
 
-use Phacil\Framework\Action;
-use Phacil\Framework\ActionSystem;
 
 interface Front {
 

diff --git a/system/engine/interfaces/loader.php b/system/engine/interfaces/loader.php
@@ -32,13 +32,13 @@ public function library($library);
 	 * @param string $model 
 	 * @return void 
 	 */
-	public function model(string $model);
+	public function model($model);
 
 	/**
 	 * @param string $helper 
 	 * @return void 
 	 */
-	public function helper(string $helper);
+	public function helper($helper);
 
 	/**
 	 * @param string $control 
@@ -62,7 +62,7 @@ public function controller($control);
 	 * @param string|null $charset 
 	 * @return string[]|string|null 
 	 */
-	public function database(string $driver, $hostname, $username, $password, $database, $port = NULL, $charset = NULL);
+	public function database($driver, $hostname, $username, $password, $database, $port = NULL, $charset = NULL);
 
 	/**
 	 * @param string $config 

diff --git a/system/engine/loader.php b/system/engine/loader.php
@@ -47,7 +47,7 @@ public function library($library) {
 	 * @param string $model 
 	 * @return void 
 	 */
-	public function model(string $model) {
+	public function model($model) {
 
 		$parts = explode('/', str_replace('../', '', (string)$model));
 
@@ -83,7 +83,7 @@ public function model(string $model) {
 	 * @param string $helper 
 	 * @return void 
 	 */
-	public function helper(string $helper) {
+	public function helper($helper) {
 
 		$parts = explode('/', str_replace('../', '', (string)$helper));
 

diff --git a/system/engine/traits/action.php b/system/engine/traits/action.php
@@ -46,17 +46,17 @@ trait Action {
 	private $classAlt = [];
 
 	/** @return string  */
-	public function getFile():string {
+	public function getFile() {
 		return $this->file;
 	}
 
 	/** @return string  */
-	public function getClass():string {
+	public function getClass() {
 		return $this->class;
 	}
 
-	private function mountClass(string $namespace, string $class) {
-		return (defined('NAMESPACE_PREFIX') ? NAMESPACE_PREFIX."\\" : "").str_replace("/", "\\", $namespace)."Controller\\".$class;
+	private function mountClass($namespace, $class) {
+		return (defined('NAMESPACE_PREFIX') ? NAMESPACE_PREFIX."\\" : "").str_replace("/", "\\", (string) $namespace)."Controller\\".(string) $class;
 	}
 
 	/**
@@ -70,17 +70,17 @@ public function setClass($class) {
 	}
 
 	/** @return array  */
-	public function getClassAlt():array {
+	public function getClassAlt() {
 		return $this->classAlt;
 	}
 
 	/** @return string  */
-	public function getMethod():string {
+	public function getMethod() {
 		return $this->method;
 	}
 
 	/** @return array  */
-	public function getArgs():array {
+	public function getArgs() {
 		return $this->args;
 	}
 }