softberg / quantum-php-core

src/Router/Route.php

Braces +2 added lines, -2 removed lines

@@ -209,7 +209,7 @@ 
 
 				if (!$shouldCache && key_exists('cache', $this->virtualRoutes['*'][$lastKey])) {
 					unset($this->virtualRoutes['*'][$lastKey]['cache']);
-				}else{
+				} else{
 					$this->assignCacheToCurrentRoute($this->virtualRoutes['*'][$lastKey], $shouldCache, $ttl);
 				}
 
@@ -222,7 +222,7 @@ 
 			foreach ($this->virtualRoutes[$lastKeyOfFirstRound] as &$route) {
 				if (!$shouldCache && key_exists('cache', $route)) {
 					unset($route['cache']);
-				}else{
+				} else{
 					$this->assignCacheToCurrentRoute($route, $shouldCache, $ttl);
 				}
 			}

Spacing +6 added lines, -6 removed lines

@@ -77,7 +77,7 @@ 
         $this->moduleName = key($module);
         $this->moduleOptions = $module[key($module)];
 
-		if (config()->has('resource_cache') && !config()->has('view_cache')){
+		if (config()->has('resource_cache') && !config()->has('view_cache')) {
 			config()->import(new Setup('config', 'view_cache'));
 		}
     }
@@ -98,7 +98,7 @@ 
             'module' => $this->moduleName
         ];
 
-	    if ($this->canSetCacheToCurrentRoute()){
+	    if ($this->canSetCacheToCurrentRoute()) {
 		    $this->currentRoute['cache'] = [
 			    'shouldCache' => true,
 			    'ttl' => config()->get('view_cache.ttl', 300),
@@ -202,14 +202,14 @@ 
 			$ttl = config()->get('view_cache.ttl', 300);
 		}
 
-		if (!empty(session()->getId())){
-			if (!$this->isGroup){
+		if (!empty(session()->getId())) {
+			if (!$this->isGroup) {
 				end($this->virtualRoutes['*']);
 				$lastKey = key($this->virtualRoutes['*']);
 
 				if (!$shouldCache && key_exists('cache', $this->virtualRoutes['*'][$lastKey])) {
 					unset($this->virtualRoutes['*'][$lastKey]['cache']);
-				}else{
+				} else {
 					$this->assignCacheToCurrentRoute($this->virtualRoutes['*'][$lastKey], $shouldCache, $ttl);
 				}
 
@@ -222,7 +222,7 @@ 
 			foreach ($this->virtualRoutes[$lastKeyOfFirstRound] as &$route) {
 				if (!$shouldCache && key_exists('cache', $route)) {
 					unset($route['cache']);
-				}else{
+				} else {
 					$this->assignCacheToCurrentRoute($route, $shouldCache, $ttl);
 				}
 			}

Indentation +58 added lines, -58 removed lines

@@ -77,9 +77,9 @@ 
         $this->moduleName = key($module);
         $this->moduleOptions = $module[key($module)];
 
-		if (config()->has('resource_cache') && !config()->has('view_cache')){
-			config()->import(new Setup('config', 'view_cache'));
-		}
+        if (config()->has('resource_cache') && !config()->has('view_cache')){
+            config()->import(new Setup('config', 'view_cache'));
+        }
     }
 
     /**
@@ -98,12 +98,12 @@ 
             'module' => $this->moduleName
         ];
 
-	    if ($this->canSetCacheToCurrentRoute()){
-		    $this->currentRoute['cache'] = [
-			    'shouldCache' => true,
-			    'ttl' => config()->get('view_cache.ttl', 300),
-		    ];
-	    }
+        if ($this->canSetCacheToCurrentRoute()){
+            $this->currentRoute['cache'] = [
+                'shouldCache' => true,
+                'ttl' => config()->get('view_cache.ttl', 300),
+            ];
+        }
 
         if (is_callable($params[0])) {
             $this->currentRoute['callback'] = $params[0];
@@ -196,40 +196,40 @@ 
         return $this;
     }
 
-	public function cacheable(bool $shouldCache, int $ttl = null): Route
-	{
-		if (!$ttl) {
-			$ttl = config()->get('view_cache.ttl', 300);
-		}
-
-		if (!empty(session()->getId())){
-			if (!$this->isGroup){
-				end($this->virtualRoutes['*']);
-				$lastKey = key($this->virtualRoutes['*']);
-
-				if (!$shouldCache && key_exists('cache', $this->virtualRoutes['*'][$lastKey])) {
-					unset($this->virtualRoutes['*'][$lastKey]['cache']);
-				}else{
-					$this->assignCacheToCurrentRoute($this->virtualRoutes['*'][$lastKey], $shouldCache, $ttl);
-				}
-
-				return $this;
-			}
-
-			end($this->virtualRoutes);
-			$lastKeyOfFirstRound = key($this->virtualRoutes);
-
-			foreach ($this->virtualRoutes[$lastKeyOfFirstRound] as &$route) {
-				if (!$shouldCache && key_exists('cache', $route)) {
-					unset($route['cache']);
-				}else{
-					$this->assignCacheToCurrentRoute($route, $shouldCache, $ttl);
-				}
-			}
-		}
-
-		return $this;
-	}
+    public function cacheable(bool $shouldCache, int $ttl = null): Route
+    {
+        if (!$ttl) {
+            $ttl = config()->get('view_cache.ttl', 300);
+        }
+
+        if (!empty(session()->getId())){
+            if (!$this->isGroup){
+                end($this->virtualRoutes['*']);
+                $lastKey = key($this->virtualRoutes['*']);
+
+                if (!$shouldCache && key_exists('cache', $this->virtualRoutes['*'][$lastKey])) {
+                    unset($this->virtualRoutes['*'][$lastKey]['cache']);
+                }else{
+                    $this->assignCacheToCurrentRoute($this->virtualRoutes['*'][$lastKey], $shouldCache, $ttl);
+                }
+
+                return $this;
+            }
+
+            end($this->virtualRoutes);
+            $lastKeyOfFirstRound = key($this->virtualRoutes);
+
+            foreach ($this->virtualRoutes[$lastKeyOfFirstRound] as &$route) {
+                if (!$shouldCache && key_exists('cache', $route)) {
+                    unset($route['cache']);
+                }else{
+                    $this->assignCacheToCurrentRoute($route, $shouldCache, $ttl);
+                }
+            }
+        }
+
+        return $this;
+    }
 
     /**
      * Sets a unique name for a route
@@ -304,19 +304,19 @@ 
         }
     }
 
-	private function assignCacheToCurrentRoute(array &$route, bool $shouldCache, int $ttl)
-	{
-		$route['cache'] = [
-			'shouldCache' => $shouldCache,
-			'ttl' => $ttl,
-		];
-	}
-
-	private function canSetCacheToCurrentRoute(): bool
-	{
-		return config()->get('resource_cache') &&
-			!empty(session()->getId()) &&
-			!empty($this->moduleOptions) &&
-			!empty($this->moduleOptions['cacheable']);
-	}
+    private function assignCacheToCurrentRoute(array &$route, bool $shouldCache, int $ttl)
+    {
+        $route['cache'] = [
+            'shouldCache' => $shouldCache,
+            'ttl' => $ttl,
+        ];
+    }
+
+    private function canSetCacheToCurrentRoute(): bool
+    {
+        return config()->get('resource_cache') &&
+            !empty(session()->getId()) &&
+            !empty($this->moduleOptions) &&
+            !empty($this->moduleOptions['cacheable']);
+    }
 }

src/Libraries/Auth/WebAuth.php

Indentation +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
         if (filter_var(config()->get('2FA'), FILTER_VALIDATE_BOOLEAN)) {
             return $this->twoStepVerification($user);
         } else {
-	        session()->regenerateId();
+            session()->regenerateId();
             session()->set($this->authUserKey, $this->getVisibleFields($user));
             return true;
         }
@@ -119,7 +119,7 @@ 
     {
         if (session()->has($this->authUserKey)) {
             session()->delete($this->authUserKey);
-	        session()->regenerateId();
+            session()->regenerateId();
             $this->removeRememberToken();
 
             return true;

src/Libraries/ResourceCache/ResourceCacheInterface.php

Indentation +3 added lines, -3 removed lines

@@ -4,9 +4,9 @@
 
 interface ResourceCacheInterface
 {
-	public function put();
+    public function put();
 
-	public function get();
+    public function get();
 
-	public function delete();
+    public function delete();
 }
\ No newline at end of file

src/Console/Commands/ResourceCacheClearCommand.php

Indentation +211 added lines, -211 removed lines

@@ -30,215 +30,215 @@
 class ResourceCacheClearCommand extends QtCommand
 {
 
-	/**
-	 * Command name
-	 * @var string
-	 */
-	protected $name = 'cache:clear';
-
-	/**
-	 * Command description
-	 * @var string
-	 */
-	protected $description = 'Clearing resource caches';
-
-	/**
-	 * Command help text
-	 * @var string
-	 */
-	protected $help = 'The command will clear the resource caches.';
-
-	/**
-	 * Command options
-	 * @var array
-	 */
-	protected $options = [
-		['all', 'all', 'none', ''],
-		['type', 't', 'required', ''],
-		['module', 'm', 'required', '']
-	];
-
-	/**
-	 * @var array
-	 */
-	protected $types = ['views', 'asserts'];
-
-	/**
-	 * @var array
-	 */
-	protected $modules;
-
-	/**
-	 * @var string|null
-	 */
-	protected $type = null;
-
-	/**
-	 * @var string|null
-	 */
-	protected $module = null;
-
-	/**
-	 * @var string
-	 */
-	protected $cacheDir;
-
-	/**
-	 * @var object
-	 */
-	protected $fs;
-
-	/**
-	 * @return void
-	 * @throws DiException
-	 * @throws ReflectionException
-	 */
-	public function exec()
-	{
-		$this->fs = Di::get(FileSystem::class);
-
-		try {
-			$this->importConfig();
-			$this->initModule();
-			$this->initType();
-		}catch (Exception $e){
-			$this->error($e->getMessage());
-			return;
-		}
-
-
-		if ($this->fs->isDirectory($this->cacheDir)) {
-			if ($this->module || $this->type) {
-				$this->clearResourceFiles($this->cacheDir, $this->module, $this->type);
-			} elseif (!empty($this->getOption('all'))) {
-				$this->removeFilesInDirectory($this->cacheDir);
-			} else {
-				$this->error('You must set at least one of these options {--all, --module=moduleName, --type=typeName}!');
-				return;
-			}
-		} else {
-			$this->error('Cache directory does not exist or is not accessible.');
-			return;
-		}
-
-		$this->info('Resource cache cleared successfully.');
-	}
-
-	/**
-	 * @return void
-	 */
-	private function importModules()
-	{
-		try {
-			if (!config()->has('modules')) {
-				config()->import(new Setup('config', 'modules'));
-			}
-			$this->modules = array_keys(array_change_key_case(config()->get('modules.modules')));
-		} catch (ConfigException|DiException|ReflectionException $e) {
-			$this->error($e->getMessage());
-			return;
-		}
-	}
-
-	/**
-	 * @return void
-	 * @throws ConfigException
-	 * @throws DiException
-	 * @throws ReflectionException
-	 */
-	private function importConfig(): void
-	{
-		if (!config()->has('view_cache')) {
-			config()->import(new Setup('config', 'view_cache'));
-		}
-
-		$this->cacheDir = base_dir() . DS . config()->get('view_cache.cache_dir', 'cache');
-	}
-
-	/**
-	 * @return void
-	 * @throws Exception
-	 */
-	private function initModule(): void
-	{
-		$moduleOption = $this->getOption('module');
-
-		if (!empty($moduleOption)) {
-			$this->importModules();
-			$module = strtolower($moduleOption);
-
-			if (in_array($module, $this->modules)) {
-				$this->module = $module;
-			} else {
-				throw new Exception('Module {'. $module .'} does not exist.');
-			}
-		}
-	}
-
-	/**
-	 * @return void
-	 * @throws Exception
-	 */
-	private function initType(): void
-	{
-		$typeOption = $this->getOption('type');
-
-		if (!empty($typeOption)) {
-			$type = strtolower($typeOption);
-
-			if (in_array($type, $this->types)) {
-				$this->type = $type;
-			} else {
-				throw new Exception('Cache type {'. $type .'} is invalid.');
-			}
-		}
-	}
-
-	/**
-	 * @param string $dir
-	 * @param string|null $moduleName
-	 * @param string|null $type
-	 * @return void
-	 */
-	private function clearResourceFiles(string $dir, ?string $moduleName = null, ?string $type = null): void
-	{
-		if ($type) {
-			$dir = $dir . DS . strtolower($type);
-		}
-
-		if ($moduleName) {
-			if (!$type) {
-				$dir = $dir . DS . '*';
-			}
-			$dir = $dir . DS . strtolower($moduleName);
-		}
-
-		$this->removeFilesInDirectory($dir);
-	}
-
-	/**
-	 * @param string $dir
-	 * @return void
-	 */
-	private function removeFilesInDirectory(string $dir): void
-	{
-		$folders = $this->fs->glob($dir);
-		$files = $this->fs->glob($dir . DS . '*');
-
-		foreach ($files as $file) {
-			if ($this->fs->isDirectory($file)) {
-				$this->removeFilesInDirectory($file);
-			} else {
-				$this->fs->remove($file);
-			}
-		}
-
-		foreach ($folders as $folder) {
-			if (count($this->fs->glob($folder . DS . '*')) === 0 &&
-				basename($dir) !== config()->get('view_cache.cache_dir', 'cache')
-			) {
-				$this->fs->removeDirectory($folder);
-			}
-		}
-	}
+    /**
+     * Command name
+     * @var string
+     */
+    protected $name = 'cache:clear';
+
+    /**
+     * Command description
+     * @var string
+     */
+    protected $description = 'Clearing resource caches';
+
+    /**
+     * Command help text
+     * @var string
+     */
+    protected $help = 'The command will clear the resource caches.';
+
+    /**
+     * Command options
+     * @var array
+     */
+    protected $options = [
+        ['all', 'all', 'none', ''],
+        ['type', 't', 'required', ''],
+        ['module', 'm', 'required', '']
+    ];
+
+    /**
+     * @var array
+     */
+    protected $types = ['views', 'asserts'];
+
+    /**
+     * @var array
+     */
+    protected $modules;
+
+    /**
+     * @var string|null
+     */
+    protected $type = null;
+
+    /**
+     * @var string|null
+     */
+    protected $module = null;
+
+    /**
+     * @var string
+     */
+    protected $cacheDir;
+
+    /**
+     * @var object
+     */
+    protected $fs;
+
+    /**
+     * @return void
+     * @throws DiException
+     * @throws ReflectionException
+     */
+    public function exec()
+    {
+        $this->fs = Di::get(FileSystem::class);
+
+        try {
+            $this->importConfig();
+            $this->initModule();
+            $this->initType();
+        }catch (Exception $e){
+            $this->error($e->getMessage());
+            return;
+        }
+
+
+        if ($this->fs->isDirectory($this->cacheDir)) {
+            if ($this->module || $this->type) {
+                $this->clearResourceFiles($this->cacheDir, $this->module, $this->type);
+            } elseif (!empty($this->getOption('all'))) {
+                $this->removeFilesInDirectory($this->cacheDir);
+            } else {
+                $this->error('You must set at least one of these options {--all, --module=moduleName, --type=typeName}!');
+                return;
+            }
+        } else {
+            $this->error('Cache directory does not exist or is not accessible.');
+            return;
+        }
+
+        $this->info('Resource cache cleared successfully.');
+    }
+
+    /**
+     * @return void
+     */
+    private function importModules()
+    {
+        try {
+            if (!config()->has('modules')) {
+                config()->import(new Setup('config', 'modules'));
+            }
+            $this->modules = array_keys(array_change_key_case(config()->get('modules.modules')));
+        } catch (ConfigException|DiException|ReflectionException $e) {
+            $this->error($e->getMessage());
+            return;
+        }
+    }
+
+    /**
+     * @return void
+     * @throws ConfigException
+     * @throws DiException
+     * @throws ReflectionException
+     */
+    private function importConfig(): void
+    {
+        if (!config()->has('view_cache')) {
+            config()->import(new Setup('config', 'view_cache'));
+        }
+
+        $this->cacheDir = base_dir() . DS . config()->get('view_cache.cache_dir', 'cache');
+    }
+
+    /**
+     * @return void
+     * @throws Exception
+     */
+    private function initModule(): void
+    {
+        $moduleOption = $this->getOption('module');
+
+        if (!empty($moduleOption)) {
+            $this->importModules();
+            $module = strtolower($moduleOption);
+
+            if (in_array($module, $this->modules)) {
+                $this->module = $module;
+            } else {
+                throw new Exception('Module {'. $module .'} does not exist.');
+            }
+        }
+    }
+
+    /**
+     * @return void
+     * @throws Exception
+     */
+    private function initType(): void
+    {
+        $typeOption = $this->getOption('type');
+
+        if (!empty($typeOption)) {
+            $type = strtolower($typeOption);
+
+            if (in_array($type, $this->types)) {
+                $this->type = $type;
+            } else {
+                throw new Exception('Cache type {'. $type .'} is invalid.');
+            }
+        }
+    }
+
+    /**
+     * @param string $dir
+     * @param string|null $moduleName
+     * @param string|null $type
+     * @return void
+     */
+    private function clearResourceFiles(string $dir, ?string $moduleName = null, ?string $type = null): void
+    {
+        if ($type) {
+            $dir = $dir . DS . strtolower($type);
+        }
+
+        if ($moduleName) {
+            if (!$type) {
+                $dir = $dir . DS . '*';
+            }
+            $dir = $dir . DS . strtolower($moduleName);
+        }
+
+        $this->removeFilesInDirectory($dir);
+    }
+
+    /**
+     * @param string $dir
+     * @return void
+     */
+    private function removeFilesInDirectory(string $dir): void
+    {
+        $folders = $this->fs->glob($dir);
+        $files = $this->fs->glob($dir . DS . '*');
+
+        foreach ($files as $file) {
+            if ($this->fs->isDirectory($file)) {
+                $this->removeFilesInDirectory($file);
+            } else {
+                $this->fs->remove($file);
+            }
+        }
+
+        foreach ($folders as $folder) {
+            if (count($this->fs->glob($folder . DS . '*')) === 0 &&
+                basename($dir) !== config()->get('view_cache.cache_dir', 'cache')
+            ) {
+                $this->fs->removeDirectory($folder);
+            }
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -101,7 +101,7 @@ 
 			$this->importConfig();
 			$this->initModule();
 			$this->initType();
-		}catch (Exception $e){
+		} catch (Exception $e) {
 			$this->error($e->getMessage());
 			return;
 		}
@@ -134,7 +134,7 @@ 
 				config()->import(new Setup('config', 'modules'));
 			}
 			$this->modules = array_keys(array_change_key_case(config()->get('modules.modules')));
-		} catch (ConfigException|DiException|ReflectionException $e) {
+		} catch (ConfigException | DiException | ReflectionException $e) {
 			$this->error($e->getMessage());
 			return;
 		}
@@ -170,7 +170,7 @@ 
 			if (in_array($module, $this->modules)) {
 				$this->module = $module;
 			} else {
-				throw new Exception('Module {'. $module .'} does not exist.');
+				throw new Exception('Module {' . $module . '} does not exist.');
 			}
 		}
 	}
@@ -189,7 +189,7 @@ 
 			if (in_array($type, $this->types)) {
 				$this->type = $type;
 			} else {
-				throw new Exception('Cache type {'. $type .'} is invalid.');
+				throw new Exception('Cache type {' . $type . '} is invalid.');
 			}
 		}
 	}

Braces +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 			$this->importConfig();
 			$this->initModule();
 			$this->initType();
-		}catch (Exception $e){
+		} catch (Exception $e){
 			$this->error($e->getMessage());
 			return;
 		}

src/Mvc/QtView.php

Indentation +20 added lines, -20 removed lines

@@ -143,22 +143,22 @@ 
         $this->params = [];
     }
 
-	/**
-	 * @param string $view
-	 * @param array $params
-	 * @return string|null
-	 * @throws AssetException
-	 * @throws DiException
-	 * @throws LangException
-	 * @throws LoaderError
-	 * @throws ReflectionException
-	 * @throws RuntimeError
-	 * @throws SyntaxError
-	 * @throws ViewException
-	 * @throws ConfigException
-	 * @throws DatabaseException
-	 * @throws SessionException
-	 */
+    /**
+     * @param string $view
+     * @param array $params
+     * @return string|null
+     * @throws AssetException
+     * @throws DiException
+     * @throws LangException
+     * @throws LoaderError
+     * @throws ReflectionException
+     * @throws RuntimeError
+     * @throws SyntaxError
+     * @throws ViewException
+     * @throws ConfigException
+     * @throws DatabaseException
+     * @throws SessionException
+     */
     public function render(string $view, array $params = []): ?string
     {
         if (!$this->layout) {
@@ -179,11 +179,11 @@ 
             AssetManager::getInstance()->register($this->assets);
         }
 
-		$content = $this->renderFile($this->layout);
+        $content = $this->renderFile($this->layout);
 
-	    if (route_cache()){
-		    (new ViewCache())->set(route_uri(), $content, session()->getId());
-	    }
+        if (route_cache()){
+            (new ViewCache())->set(route_uri(), $content, session()->getId());
+        }
 
         return $content;
     }

Spacing +2 added lines, -2 removed lines

@@ -175,13 +175,13 @@
             Debugger::updateStoreCell(Debugger::ROUTES, LogLevel::INFO, ['View' => current_module() . '/Views/' . $view]);
         }
 
-        if(!empty($this->assets)) {
+        if (!empty($this->assets)) {
             AssetManager::getInstance()->register($this->assets);
         }
 
 		$content = $this->renderFile($this->layout);
 
-	    if (route_cache()){
+	    if (route_cache()) {
 		    (new ViewCache())->set(route_uri(), $content, session()->getId());
 	    }
 

src/Mvc/MvcManager.php

Indentation +120 added lines, -120 removed lines

@@ -39,125 +39,125 @@
 class MvcManager
 {
 
-	/**
-	 * @param Request $request
-	 * @param Response $response
-	 * @return void
-	 * @throws ConfigException
-	 * @throws ControllerException
-	 * @throws CryptorException
-	 * @throws CsrfException
-	 * @throws DiException
-	 * @throws MiddlewareException
-	 * @throws ReflectionException
-	 * @throws DatabaseException
-	 * @throws LangException
-	 * @throws SessionException
-	 */
-	public static function handle(Request $request, Response $response)
-	{
-		if (current_middlewares()) {
-			list($request, $response) = (new MiddlewareManager())->applyMiddlewares($request, $response);
-		}
-
-		$callback = route_callback();
-
-		if (route_cache() &&
-			ViewCache::exists(route_uri(), session()->getId(), route_cache()['ttl'])
-		){
-			call_user_func_array(function () use (&$response) {
-				$content = (new ViewCache())->get(route_uri(), session()->getId(), route_cache()['ttl']);
-				$response->html($content);
-			}, []);
-
-		}elseif ($callback) {
-			call_user_func_array($callback, self::getArgs($callback));
-		} else {
-			$controller = self::getController();
-			$action = self::getAction($controller);
-
-			if ($controller->csrfVerification && in_array($request->getMethod(), Csrf::METHODS)) {
-				csrf()->checkToken($request);
-			}
-
-			if (method_exists($controller, '__before')) {
-				call_user_func_array([$controller, '__before'], self::getArgs([$controller, '__before']));
-			}
-
-			call_user_func_array([$controller, $action], self::getArgs([$controller, $action]));
-
-			if (method_exists($controller, '__after')) {
-				call_user_func_array([$controller, '__after'], self::getArgs([$controller, '__after']));
-			}
-		}
-	}
-
-	/**
-	 * Get Controller
-	 * @return QtController
-	 * @throws DiException
-	 * @throws ReflectionException
-	 * @throws ControllerException
-	 */
-	private static function getController(): QtController
-	{
-		$fs = Di::get(FileSystem::class);
-
-		$controllerPath = modules_dir() . DS . current_module() . DS . 'Controllers' . DS . current_controller() . '.php';
-
-		if (!$fs->exists($controllerPath)) {
-			throw ControllerException::controllerNotFound(current_controller());
-		}
-
-		require_once $controllerPath;
-
-		$controllerClass = '\\Modules\\' . current_module() . '\\Controllers\\' . current_controller();
-
-		if (!class_exists($controllerClass, false)) {
-			throw ControllerException::controllerNotDefined(current_controller());
-		}
-
-		return new $controllerClass();
-	}
-
-	/**
-	 * Get Action
-	 * @param QtController $controller
-	 * @return string|null
-	 * @throws ControllerException
-	 */
-	private static function getAction(QtController $controller): ?string
-	{
-		$action = current_action();
-
-		if ($action && !method_exists($controller, $action)) {
-			throw ControllerException::actionNotDefined($action);
-		}
-
-		return $action;
-	}
-
-	/**
-	 * Get arguments
-	 * @param callable $callable
-	 * @return array
-	 * @throws DiException
-	 * @throws ReflectionException
-	 */
-	private static function getArgs(callable $callable): array
-	{
-		return Di::autowire($callable, self::routeParams());
-	}
-
-	/**
-	 * Gets the route parameters
-	 * @return array
-	 */
-	private static function routeParams(): array
-	{
-		return array_map(function ($param) {
-			return $param['value'];
-		}, route_params());
-	}
+    /**
+     * @param Request $request
+     * @param Response $response
+     * @return void
+     * @throws ConfigException
+     * @throws ControllerException
+     * @throws CryptorException
+     * @throws CsrfException
+     * @throws DiException
+     * @throws MiddlewareException
+     * @throws ReflectionException
+     * @throws DatabaseException
+     * @throws LangException
+     * @throws SessionException
+     */
+    public static function handle(Request $request, Response $response)
+    {
+        if (current_middlewares()) {
+            list($request, $response) = (new MiddlewareManager())->applyMiddlewares($request, $response);
+        }
+
+        $callback = route_callback();
+
+        if (route_cache() &&
+            ViewCache::exists(route_uri(), session()->getId(), route_cache()['ttl'])
+        ){
+            call_user_func_array(function () use (&$response) {
+                $content = (new ViewCache())->get(route_uri(), session()->getId(), route_cache()['ttl']);
+                $response->html($content);
+            }, []);
+
+        }elseif ($callback) {
+            call_user_func_array($callback, self::getArgs($callback));
+        } else {
+            $controller = self::getController();
+            $action = self::getAction($controller);
+
+            if ($controller->csrfVerification && in_array($request->getMethod(), Csrf::METHODS)) {
+                csrf()->checkToken($request);
+            }
+
+            if (method_exists($controller, '__before')) {
+                call_user_func_array([$controller, '__before'], self::getArgs([$controller, '__before']));
+            }
+
+            call_user_func_array([$controller, $action], self::getArgs([$controller, $action]));
+
+            if (method_exists($controller, '__after')) {
+                call_user_func_array([$controller, '__after'], self::getArgs([$controller, '__after']));
+            }
+        }
+    }
+
+    /**
+     * Get Controller
+     * @return QtController
+     * @throws DiException
+     * @throws ReflectionException
+     * @throws ControllerException
+     */
+    private static function getController(): QtController
+    {
+        $fs = Di::get(FileSystem::class);
+
+        $controllerPath = modules_dir() . DS . current_module() . DS . 'Controllers' . DS . current_controller() . '.php';
+
+        if (!$fs->exists($controllerPath)) {
+            throw ControllerException::controllerNotFound(current_controller());
+        }
+
+        require_once $controllerPath;
+
+        $controllerClass = '\\Modules\\' . current_module() . '\\Controllers\\' . current_controller();
+
+        if (!class_exists($controllerClass, false)) {
+            throw ControllerException::controllerNotDefined(current_controller());
+        }
+
+        return new $controllerClass();
+    }
+
+    /**
+     * Get Action
+     * @param QtController $controller
+     * @return string|null
+     * @throws ControllerException
+     */
+    private static function getAction(QtController $controller): ?string
+    {
+        $action = current_action();
+
+        if ($action && !method_exists($controller, $action)) {
+            throw ControllerException::actionNotDefined($action);
+        }
+
+        return $action;
+    }
+
+    /**
+     * Get arguments
+     * @param callable $callable
+     * @return array
+     * @throws DiException
+     * @throws ReflectionException
+     */
+    private static function getArgs(callable $callable): array
+    {
+        return Di::autowire($callable, self::routeParams());
+    }
+
+    /**
+     * Gets the route parameters
+     * @return array
+     */
+    private static function routeParams(): array
+    {
+        return array_map(function ($param) {
+            return $param['value'];
+        }, route_params());
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -64,8 +64,8 @@ 
 
 		if (route_cache() &&
 			ViewCache::exists(route_uri(), session()->getId(), route_cache()['ttl'])
-		){
-			call_user_func_array(function () use (&$response) {
+		) {
+			call_user_func_array(function() use (&$response) {
 				$content = (new ViewCache())->get(route_uri(), session()->getId(), route_cache()['ttl']);
 				$response->html($content);
 			}, []);
@@ -155,7 +155,7 @@ 
 	 */
 	private static function routeParams(): array
 	{
-		return array_map(function ($param) {
+		return array_map(function($param) {
 			return $param['value'];
 		}, route_params());
 	}

Braces +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 				$response->html($content);
 			}, []);
 
-		}elseif ($callback) {
+		} elseif ($callback) {
 			call_user_func_array($callback, self::getArgs($callback));
 		} else {
 			$controller = self::getController();

src/Helpers/mvc.php

Indentation +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
  */
 function route_cache()
 {
-	return RouteController::getCurrentRoute()['cache'] ?? null;
+    return RouteController::getCurrentRoute()['cache'] ?? null;
 }
 
 /**

src/Libraries/ResourceCache/ViewCache.php

Indentation +134 added lines, -134 removed lines

@@ -11,138 +11,138 @@
 
 class ViewCache
 {
-	/**
-	 * @var string
-	 */
-	private $cacheDir;
-
-	/**
-	 * @var string
-	 */
-	private $mimeType = '.tmp';
-
-	/**
-	 * @var object
-	 */
-	private static $fs;
-
-	/**
-	 * @param bool $fromCommand
-	 * @throws ConfigException
-	 * @throws DiException
-	 * @throws ReflectionException
-	 */
-	public function __construct(bool $fromCommand = false)
-	{
-		self::$fs = Di::get(FileSystem::class);
-
-		if (!config()->has('view_cache') && !$fromCommand) {
-			throw ConfigException::configCollision('view_cache');
-		}
-
-		$configCacheDir = config()->get('view_cache.cache_dir', 'cache');
-		$module = strtolower(current_module());
-
-		$this->cacheDir = base_dir() . DS . $configCacheDir . DS . 'views' . DS;
-
-		if ($module) {
-			$this->cacheDir = base_dir() . DS . $configCacheDir . DS . 'views' . DS . $module . DS;
-		}
-
-		if (!self::$fs->isDirectory($this->cacheDir) && !$fromCommand) {
-			mkdir($this->cacheDir, 0777, true);
-		}
-	}
-
-	/**
-	 * @param string $key
-	 * @param string $content
-	 * @param string $sessionId
-	 * @return void
-	 */
-	public function set(string $key, string $content, string $sessionId): void
-	{
-		if (config()->has('view_cache.minify')) {
-			$content = $this->minify($content);
-		}
-
-		$cacheFile = $this->getCacheFile($key, $sessionId);
-		file_put_contents($cacheFile, $content);
-	}
-
-	/**
-	 * @param string $key
-	 * @param string $sessionId
-	 * @param int $ttl
-	 * @return mixed|null
-	 */
-	public function get(string $key, string $sessionId, int $ttl): ?string
-	{
-		$cacheFile = $this->getCacheFile($key, $sessionId);
-		if (!file_exists($cacheFile)) {
-			return null;
-		}
-
-		$data = file_get_contents($cacheFile);
-		if (time() > (self::$fs->lastModified($cacheFile) + $ttl)) {
-			self::$fs->remove($cacheFile);
-			return null;
-		}
-
-		return $data;
-	}
-
-	/**
-	 * @param string $key
-	 * @param string $sessionId
-	 * @return void
-	 */
-	public function delete(string $key, string $sessionId): void
-	{
-		$cacheFile = $this->getCacheFile($key, $sessionId);
-		if (file_exists($cacheFile)) {
-			self::$fs->remove($cacheFile);
-		}
-	}
-
-	/**
-	 * @param string $key
-	 * @param string $sessionId
-	 * @param int $ttl
-	 * @return bool
-	 */
-	public static function exists(string $key, string $sessionId, int $ttl): bool
-	{
-		$cacheFile = (new self())->getCacheFile($key, $sessionId);
-
-		if (!file_exists($cacheFile)) {
-			return false;
-		}
-
-		if (time() > (self::$fs->lastModified($cacheFile) + $ttl)) {
-			self::$fs->remove($cacheFile);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param string $key
-	 * @param string $sessionId
-	 * @return string
-	 */
-	private function getCacheFile(string $key, string $sessionId): string
-	{
-		return $this->cacheDir . md5($key . $sessionId) . $this->mimeType;
-	}
-
-	/**
-	 * @param string $content
-	 * @return string
-	 */
-	private function minify(string $content): string
-	{
-		return (new HtmlMin())->minify($content);
-	}
+    /**
+     * @var string
+     */
+    private $cacheDir;
+
+    /**
+     * @var string
+     */
+    private $mimeType = '.tmp';
+
+    /**
+     * @var object
+     */
+    private static $fs;
+
+    /**
+     * @param bool $fromCommand
+     * @throws ConfigException
+     * @throws DiException
+     * @throws ReflectionException
+     */
+    public function __construct(bool $fromCommand = false)
+    {
+        self::$fs = Di::get(FileSystem::class);
+
+        if (!config()->has('view_cache') && !$fromCommand) {
+            throw ConfigException::configCollision('view_cache');
+        }
+
+        $configCacheDir = config()->get('view_cache.cache_dir', 'cache');
+        $module = strtolower(current_module());
+
+        $this->cacheDir = base_dir() . DS . $configCacheDir . DS . 'views' . DS;
+
+        if ($module) {
+            $this->cacheDir = base_dir() . DS . $configCacheDir . DS . 'views' . DS . $module . DS;
+        }
+
+        if (!self::$fs->isDirectory($this->cacheDir) && !$fromCommand) {
+            mkdir($this->cacheDir, 0777, true);
+        }
+    }
+
+    /**
+     * @param string $key
+     * @param string $content
+     * @param string $sessionId
+     * @return void
+     */
+    public function set(string $key, string $content, string $sessionId): void
+    {
+        if (config()->has('view_cache.minify')) {
+            $content = $this->minify($content);
+        }
+
+        $cacheFile = $this->getCacheFile($key, $sessionId);
+        file_put_contents($cacheFile, $content);
+    }
+
+    /**
+     * @param string $key
+     * @param string $sessionId
+     * @param int $ttl
+     * @return mixed|null
+     */
+    public function get(string $key, string $sessionId, int $ttl): ?string
+    {
+        $cacheFile = $this->getCacheFile($key, $sessionId);
+        if (!file_exists($cacheFile)) {
+            return null;
+        }
+
+        $data = file_get_contents($cacheFile);
+        if (time() > (self::$fs->lastModified($cacheFile) + $ttl)) {
+            self::$fs->remove($cacheFile);
+            return null;
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param string $key
+     * @param string $sessionId
+     * @return void
+     */
+    public function delete(string $key, string $sessionId): void
+    {
+        $cacheFile = $this->getCacheFile($key, $sessionId);
+        if (file_exists($cacheFile)) {
+            self::$fs->remove($cacheFile);
+        }
+    }
+
+    /**
+     * @param string $key
+     * @param string $sessionId
+     * @param int $ttl
+     * @return bool
+     */
+    public static function exists(string $key, string $sessionId, int $ttl): bool
+    {
+        $cacheFile = (new self())->getCacheFile($key, $sessionId);
+
+        if (!file_exists($cacheFile)) {
+            return false;
+        }
+
+        if (time() > (self::$fs->lastModified($cacheFile) + $ttl)) {
+            self::$fs->remove($cacheFile);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $key
+     * @param string $sessionId
+     * @return string
+     */
+    private function getCacheFile(string $key, string $sessionId): string
+    {
+        return $this->cacheDir . md5($key . $sessionId) . $this->mimeType;
+    }
+
+    /**
+     * @param string $content
+     * @return string
+     */
+    private function minify(string $content): string
+    {
+        return (new HtmlMin())->minify($content);
+    }
 }
\ No newline at end of file