x-systems / epesi-core

src/Providers/EpesiServiceProvider.php

Indentation +54 added lines, -54 removed lines

@@ -12,73 +12,73 @@
 
 class EpesiServiceProvider extends ServiceProvider
 {
-    /**
-     * Booting the package.
-     */
-    public function boot()
-    {
-    	$this->ensureHttps();
+	/**
+	 * Booting the package.
+	 */
+	public function boot()
+	{
+		$this->ensureHttps();
     	
-    	if (env('APP_DEBUG', false)) ModuleManager::clearCache();
+		if (env('APP_DEBUG', false)) ModuleManager::clearCache();
     	
-    	Route::group(['namespace' => 'Epesi\Core', 'middleware' => 'web'], function() {
-    		Route::any('/', 'Controller@index');
-    		Route::get('logo', 'Controller@logo');
-    		Route::any('install', 'Controller@install');
+		Route::group(['namespace' => 'Epesi\Core', 'middleware' => 'web'], function() {
+			Route::any('/', 'Controller@index');
+			Route::get('logo', 'Controller@logo');
+			Route::any('install', 'Controller@install');
     		
-    		Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() {
-    			Route::any('home', 'Controller@home')->name('home');
+			Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() {
+				Route::any('home', 'Controller@home')->name('home');
     			
-    			Route::any('view/{alias}/{method?}/{args?}', 'Controller@view');
-    		});
-    	});
+				Route::any('view/{alias}/{method?}/{args?}', 'Controller@view');
+			});
+		});
 
-    	// call boot methods on all modules
-    	ModuleManager::call('boot');
+		// call boot methods on all modules
+		ModuleManager::call('boot');
     		
 		foreach (ModuleManager::collect('translations') as $path) {
 			$this->loadJsonTranslationsFrom($path);
 		}
 		
-    	// Register admin service provider if in admin mode or in console
-    	// TODO: apply access restriction to admin mode
+		// Register admin service provider if in admin mode or in console
+		// TODO: apply access restriction to admin mode
 //     	if ($this->app->runningInConsole() || (request('admin', false) && Auth::user()->can('modify system'))) {
-    	if ($this->app->runningInConsole() || request('admin', false)) {
-    		$this->app->register(AdminServiceProvider::class);
-    	}
-    }
+		if ($this->app->runningInConsole() || request('admin', false)) {
+			$this->app->register(AdminServiceProvider::class);
+		}
+	}
 
-    /**
-     * Register the provider.
-     */
-    public function register()
-    {
-    	$this->app->singleton(UI::class);
+	/**
+	 * Register the provider.
+	 */
+	public function register()
+	{
+		$this->app->singleton(UI::class);
     	
-    	$this->app->singleton(
-    			SQL::class,
-    			function ($app) {
-    				/**
-    				 * Database Manager
-    				 *
-    				 * @var \Illuminate\Database\DatabaseManager $db
-    				 */
-    				$db = DB::getFacadeRoot();
+		$this->app->singleton(
+				SQL::class,
+				function ($app) {
+					/**
+					 * Database Manager
+					 *
+					 * @var \Illuminate\Database\DatabaseManager $db
+					 */
+					$db = DB::getFacadeRoot();
     				
-    				return new SQL($db);
-    	});
-    }
+					return new SQL($db);
+		});
+	}
     
-    /**
-     * Force to set https scheme if https enabled.
-     *
-     * @return void
-     */
-    protected function ensureHttps()
-    {
-    	if (config('epesi.https') || config('epesi.secure')) {
-    		url()->forceScheme('https');
-    		$this->app['request']->server->set('HTTPS', true);
-    	}
-    }
+	/**
+	 * Force to set https scheme if https enabled.
+	 *
+	 * @return void
+	 */
+	protected function ensureHttps()
+	{
+		if (config('epesi.https') || config('epesi.secure')) {
+			url()->forceScheme('https');
+			$this->app['request']->server->set('HTTPS', true);
+		}
+	}
 }

src/UI.php

Indentation +30 added lines, -30 removed lines

@@ -25,10 +25,10 @@ 
 	{
 		parent::__construct([
 				'title' => config('epesi.ui.title', 'EPESI'),
-		        'cdn' => array_merge($this->cdn, (array) config('epesi.ui.cdn')),
+				'cdn' => array_merge($this->cdn, (array) config('epesi.ui.cdn')),
 				//TODO: set the skin from admin / user selection
-		        'skin' => config('epesi.ui.skin', $this->skin),
-		        'template_dir' => array_merge(ModuleManager::collect('templates', [$this->skin]), (array) $this->template_dir),
+				'skin' => config('epesi.ui.skin', $this->skin),
+				'template_dir' => array_merge(ModuleManager::collect('templates', [$this->skin]), (array) $this->template_dir),
 // 		        'catch_error_types' => config('app.debug') ? 
 // 		                  // debug mode
 // 		                  E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_USER_DEPRECATED : 
@@ -39,7 +39,7 @@ 
 	
 	final public static function module()
 	{
-	    return System\SystemCore::class;
+		return System\SystemCore::class;
 	}
 	
 	public function response()
@@ -58,7 +58,7 @@ 
 	
 	public function render()
 	{			
-	    System\SystemCore::requireCSS('epesi.css');
+		System\SystemCore::requireCSS('epesi.css');
 	    
 		$this->addCsrfToken();
 		
@@ -81,18 +81,18 @@ 
 	 */
 	public function renderException($exception)
 	{
-	    ob_start();
-	    if ($exception instanceof TokenMismatchException) {
-	        $this->jsRedirectHomepage(__('Session expired! Redirecting to login screen ...'));
-	    }
-	    elseif ($exception instanceof NotFoundHttpException) {
-	        $this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...'));
-	    }	    
-	    else {
-	        $this->caughtException($exception);
-	    }
+		ob_start();
+		if ($exception instanceof TokenMismatchException) {
+			$this->jsRedirectHomepage(__('Session expired! Redirecting to login screen ...'));
+		}
+		elseif ($exception instanceof NotFoundHttpException) {
+			$this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...'));
+		}	    
+		else {
+			$this->caughtException($exception);
+		}
 	    
-	    return ob_get_clean();
+		return ob_get_clean();
 	}
 	
 	/**
@@ -102,20 +102,20 @@ 
 	 */
 	public function jsRedirectHomepage($message)
 	{
-	    $homepageUrl = url(HomePage\Model\HomePage::pathOfUser());
+		$homepageUrl = url(HomePage\Model\HomePage::pathOfUser());
 	    
-	    $redirectJs = $this->jsRedirectConfirm($homepageUrl, $message)->jsRender();
+		$redirectJs = $this->jsRedirectConfirm($homepageUrl, $message)->jsRender();
 	    
-	    if ($this->isJsonRequest()) {
-	        $this->outputResponseJSON([
-	                'success'   => true,
-	                'message'   => $message,
-	                'atkjs'   => $redirectJs
-	        ]);
-	    }
-	    else {
-	        $this->outputResponseHTML($this->getTag('script', $redirectJs));
-	    }
+		if ($this->isJsonRequest()) {
+			$this->outputResponseJSON([
+					'success'   => true,
+					'message'   => $message,
+					'atkjs'   => $redirectJs
+			]);
+		}
+		else {
+			$this->outputResponseHTML($this->getTag('script', $redirectJs));
+		}
 	}
 	
 	/**
@@ -127,9 +127,9 @@ 
 	 */
 	public function jsRedirectConfirm($page, $message)
 	{
-	    $redirectJs = $this->jsRedirect($page)->jsRender();
+		$redirectJs = $this->jsRedirect($page)->jsRender();
 	    
-	    return new \atk4\ui\JsExpression("if (confirm([])) { $redirectJs }", [$message]);
+		return new \atk4\ui\JsExpression("if (confirm([])) { $redirectJs }", [$message]);
 	}
 	
 	/**

src/helpers.php

Indentation +15 added lines, -15 removed lines

@@ -2,35 +2,35 @@
 
 if (! function_exists('ui')) {
 	function ui() : Epesi\Core\UI
-    {
-    	return resolve(Epesi\Core\UI::class);
-    }
+	{
+		return resolve(Epesi\Core\UI::class);
+	}
 }
 
 if (! function_exists('eval_css')) {
 	function eval_css($css)
-    {
-    	ui()->addStyle($css);
-    }
+	{
+		ui()->addStyle($css);
+	}
 }
 
 if (! function_exists('eval_js')) {
 	function eval_js($js, $args = [])
-    {
-    	ui()->addJs($js, $args);
-    }
+	{
+		ui()->addJs($js, $args);
+	}
 }
 
 if (! function_exists('load_css')) {
 	function load_css($url)
-    {
-    	return ui()->requireCss($url);
-    }
+	{
+		return ui()->requireCss($url);
+	}
 }
 
 if (! function_exists('load_js')) {
 	function load_js($url)
-    {
-    	return ui()->requireJs($url);
-    }
+	{
+		return ui()->requireJs($url);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -1,34 +1,34 @@
 <?php
 
-if (! function_exists('ui')) {
+if (!function_exists('ui')) {
 	function ui() : Epesi\Core\UI
     {
     	return resolve(Epesi\Core\UI::class);
     }
 }
 
-if (! function_exists('eval_css')) {
+if (!function_exists('eval_css')) {
 	function eval_css($css)
     {
     	ui()->addStyle($css);
     }
 }
 
-if (! function_exists('eval_js')) {
+if (!function_exists('eval_js')) {
 	function eval_js($js, $args = [])
     {
     	ui()->addJs($js, $args);
     }
 }
 
-if (! function_exists('load_css')) {
+if (!function_exists('load_css')) {
 	function load_css($url)
     {
     	return ui()->requireCss($url);
     }
 }
 
-if (! function_exists('load_js')) {
+if (!function_exists('load_js')) {
 	function load_js($url)
     {
     	return ui()->requireJs($url);

src/System/ModuleAdministration.php

Spacing +9 added lines, -9 removed lines

@@ -30,8 +30,8 @@ 
 	{
 		$modules = collect(ModuleManager::getAll());
 
-		return $modules->filter(function ($subModuleClass) use ($modules) {
-			return ! $modules->map(function($moduleClass){
+		return $modules->filter(function($subModuleClass) use ($modules) {
+			return !$modules->map(function($moduleClass) {
 				return $moduleClass::namespace();
 			})->contains($subModuleClass::parentNamespace());
 		})->sort();
@@ -65,7 +65,7 @@ 
 
 			$section->add($label, 'title')->setStyle('float', 'right');
 			
-			$submodules = collect(ModuleManager::getAll())->filter(function ($subModuleClass) use ($moduleClass) {
+			$submodules = collect(ModuleManager::getAll())->filter(function($subModuleClass) use ($moduleClass) {
 				return $subModuleClass::isSubModuleOf($moduleClass);
 			});
 			
@@ -79,11 +79,11 @@ 
 	
 	public function formatModuleInfo($moduleClass)
 	{
-		$moduleInfo = (array) ($moduleClass::info()?: __(' No details provided by author'));
+		$moduleInfo = (array) ($moduleClass::info() ?: __(' No details provided by author'));
 		
 		$ret = [];
 		foreach ($moduleInfo as $label => $text) {
-			$ret[] = (is_string($label)? "<strong>$label</strong>: ": '') . $text;
+			$ret[] = (is_string($label) ? "<strong>$label</strong>: " : '') . $text;
 		}
 		
 		return implode('<br>', $ret);
@@ -123,12 +123,12 @@ 
 					
 					$form = Form::addTo($view);
 					foreach ($recommended as $childModule) {
-						if (! ModuleManager::isAvailable($childModule)) continue;
+						if (!ModuleManager::isAvailable($childModule)) continue;
 						
 						$form->addControl($childModule::alias(), ['CheckBox', 'caption' => $childModule::label()]);
 					}
 					
-					$form->onSubmit(function ($form) use ($moduleClass) {
+					$form->onSubmit(function($form) use ($moduleClass) {
 						ob_start();
 						ModuleManager::install($moduleClass, array_keys($form->getValues(), true));
 						
@@ -137,7 +137,7 @@ 
 				}
 				
 				\atk4\ui\Button::addTo($view, [__('Install'), 'primary'])->on('click', [
-						isset($form)? $form->submit(): $installCallback
+						isset($form) ? $form->submit() : $installCallback
 				]);
 			});
 			
@@ -163,7 +163,7 @@ 
 			];
 		});
 		
-		if ($dependents = ModuleManager::listDependents()[$moduleClass]?? []) {
+		if ($dependents = ModuleManager::listDependents()[$moduleClass] ?? []) {
 			$modal = \atk4\ui\Modal::addTo($this, ['title' => __(':module Module Installation', ['module' => $moduleClass::label()])])->set(function($view) use ($moduleClass, $dependents, $uninstallCallback) {
 				$message = \atk4\ui\Message::addTo($view, [__('Module is required by following modules')]);
 					

src/System/Modules/ModuleManager.php

Indentation +15 added lines, -16 removed lines

@@ -54,7 +54,7 @@ 
 	{
 		return self::$installed = self::$installed ?? self::getCached('epesi-modules-installed', function() {
 			try {
-			    $installedModules = Module::pluck('class', 'alias');
+				$installedModules = Module::pluck('class', 'alias');
 			} catch (\Exception $e) {
 				$installedModules = collect();
 			}
@@ -87,32 +87,31 @@ 
 	 */
 	protected static function discoverModuleClasses(string $namespace, string $basePath): array
 	{
-	    $ret = collect();
+		$ret = collect();
 	    
-	    $moduleNamespace = trim($namespace, '\\');
+		$moduleNamespace = trim($namespace, '\\');
 	    
-	    $names = array_slice(explode('\\', $moduleNamespace), - 1);
+		$names = array_slice(explode('\\', $moduleNamespace), - 1);
 	    
-	    if ($name = $names? reset($names): '') {
-	        $moduleClass = $moduleNamespace . '\\' . $name . 'Core';
+		if ($name = $names? reset($names): '') {
+			$moduleClass = $moduleNamespace . '\\' . $name . 'Core';
 	        
-	        if (is_subclass_of($moduleClass, ModuleCore::class)) {
-	            $ret->add($moduleClass);
-	        }
-	    }
+			if (is_subclass_of($moduleClass, ModuleCore::class)) {
+				$ret->add($moduleClass);
+			}
+		}
 	    
-	    foreach (glob($basePath . '/*', GLOB_ONLYDIR|GLOB_NOSORT) as $path) {
-	        $subModuleNamespace = $moduleNamespace . '\\' . basename($path);
+		foreach (glob($basePath . '/*', GLOB_ONLYDIR|GLOB_NOSORT) as $path) {
+			$subModuleNamespace = $moduleNamespace . '\\' . basename($path);
 	        
-	        $ret = $ret->merge(self::discoverModuleClasses($subModuleNamespace, $path));
-	    }
+			$ret = $ret->merge(self::discoverModuleClasses($subModuleNamespace, $path));
+		}
 	    
-	    return $ret->all();
+		return $ret->all();
 	}
 	
 	/**
 	 * Common method to use for caching of data within module manager
-
 	 * @return mixed
 	 */
 	protected static function getCached(string $key, \Closure $default)

Spacing +16 added lines, -16 removed lines

@@ -38,7 +38,7 @@ 
 	 */
 	public static function getClass(string $classOrAlias, bool $installedOnly = false): ?string
 	{
-		$modules = $installedOnly? self::getInstalled(): self::getAll();
+		$modules = $installedOnly ? self::getInstalled() : self::getAll();
 
 		if (collect($modules)->contains($classOrAlias)) {
 			return $classOrAlias;
@@ -68,9 +68,9 @@ 
 	 */
 	public static function getAll(): array
 	{
-		return self::getCached('epesi-modules-available', function () {
+		return self::getCached('epesi-modules-available', function() {
 			$modules = collect();
-			foreach (array_merge(config('epesi.modules', []), self::packageManifest()->modules()?: []) as $namespace => $path) {
+			foreach (array_merge(config('epesi.modules', []), self::packageManifest()->modules() ?: []) as $namespace => $path) {
 				foreach (self::discoverModuleClasses($namespace, $path) as $moduleClass) {
 					$modules->add(['alias' => $moduleClass::alias(), 'class' => $moduleClass]);
 				}
@@ -93,7 +93,7 @@ 
 	    
 	    $names = array_slice(explode('\\', $moduleNamespace), - 1);
 	    
-	    if ($name = $names? reset($names): '') {
+	    if ($name = $names ? reset($names) : '') {
 	        $moduleClass = $moduleNamespace . '\\' . $name . 'Core';
 	        
 	        if (is_subclass_of($moduleClass, ModuleCore::class)) {
@@ -101,7 +101,7 @@ 
 	        }
 	    }
 	    
-	    foreach (glob($basePath . '/*', GLOB_ONLYDIR|GLOB_NOSORT) as $path) {
+	    foreach (glob($basePath . '/*', GLOB_ONLYDIR | GLOB_NOSORT) as $path) {
 	        $subModuleNamespace = $moduleNamespace . '\\' . basename($path);
 	        
 	        $ret = $ret->merge(self::discoverModuleClasses($subModuleNamespace, $path));
@@ -117,7 +117,7 @@ 
 	 */
 	protected static function getCached(string $key, \Closure $default)
 	{
-		if (! Cache::has($key)) {
+		if (!Cache::has($key)) {
 			Cache::forever($key, $default());
 		}
 
@@ -152,7 +152,7 @@ 
 		$installedModules = collect(self::getInstalled());
 		
 		// if epesi is not installed fake having the system module to enable its functionality
-		if (! $installedModules->contains(\Epesi\Core\System\SystemCore::class)) {
+		if (!$installedModules->contains(\Epesi\Core\System\SystemCore::class)) {
 			$installedModules = collect([
 				'system' => \Epesi\Core\System\SystemCore::class
 			]);
@@ -160,9 +160,9 @@ 
 		
 		$ret = [];
 		foreach ($installedModules as $module) {
-			if (! $list = $module::$method(...$args)) continue;
+			if (!$list = $module::$method(...$args)) continue;
 			
-			$ret = array_merge($ret, is_array($list)? $list: [$list]);
+			$ret = array_merge($ret, is_array($list) ? $list : [$list]);
 		}
 		
 		return $ret;
@@ -179,7 +179,7 @@ 
 			return true;
 		}
 		
-		if (! $moduleClass = self::getClass($classOrAlias)) {			
+		if (!$moduleClass = self::getClass($classOrAlias)) {			
 			throw new \Exception(sprintf('Module "%s" could not be identified', $classOrAlias));
 		}
 		
@@ -209,7 +209,7 @@ 
 		]);
 		
 		if ($installRecommended) {
-			$installRecommended = is_array($installRecommended)? $installRecommended: $module->recommended();
+			$installRecommended = is_array($installRecommended) ? $installRecommended : $module->recommended();
 			
 			foreach ($installRecommended as $recommendedModule) {
 				try {
@@ -238,11 +238,11 @@ 
 		while ($unsatisfiedDependencies = self::unsatisfiedDependencies($moduleClass)) {
 			$parentModule = array_shift($unsatisfiedDependencies);
 				
-			if (self::$processing[$parentModule]?? false) {
+			if (self::$processing[$parentModule] ?? false) {
 				throw new \Exception(sprintf('Cross dependency: %s', $parentModule));
 			}
 				
-			if (! self::isAvailable($parentModule)) {
+			if (!self::isAvailable($parentModule)) {
 				throw new \Exception(sprintf('Module "%s" not found!', $parentModule));
 			}
 	
@@ -314,17 +314,17 @@ 
 	 */
 	public static function uninstall(string $classOrAlias): bool
 	{
-		if (! self::isInstalled($classOrAlias)) {
+		if (!self::isInstalled($classOrAlias)) {
 			print sprintf('Module "%s" is not installed!', $classOrAlias);
 			
 			return true;
 		}
 		
-		if (! $moduleClass = self::getClass($classOrAlias)) {
+		if (!$moduleClass = self::getClass($classOrAlias)) {
 			throw new \Exception(sprintf('Module "%s" could not be identified', $classOrAlias));
 		}
 		
-		foreach (self::listDependents()[$moduleClass]?? [] as $childModule) {
+		foreach (self::listDependents()[$moduleClass] ?? [] as $childModule) {
 			self::uninstall($childModule);
 		}
 		

Braces +3 added lines, -1 removed lines

@@ -160,7 +160,9 @@
 		
 		$ret = [];
 		foreach ($installedModules as $module) {
-			if (! $list = $module::$method(...$args)) continue;
+			if (! $list = $module::$method(...$args)) {
+				continue;
+			}
 			
 			$ret = array_merge($ret, is_array($list)? $list: [$list]);
 		}