x-systems / epesi-core

src/System/Logo/LogoSettings.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 			$logo->setThumbnailSrc(asset('storage/' . self::alias() . '/' . self::$defaultLogo));
 		});
 
-		$logo->onUpload(function ($files) use ($form, $logo) {
+		$logo->onUpload(function($files) use ($form, $logo) {
 			if ($files === 'error')	return $form->error('logo', __('Error uploading image'));
 			
 			$tmpPath = self::alias() . '/tmp/' . $files['name'];
@@ -59,7 +59,7 @@ 
 		});
 					
 		$form->onSubmit(function($form) {
-			if ($name = $form->model['custom_logo']? $form->model['logo']: null) {
+			if ($name = $form->model['custom_logo'] ? $form->model['logo'] : null) {
 				$storage = $this->storage();
 				$from = self::alias() . '/tmp/' . $name;
 				$to = self::alias() . '/' . $name;				

src/System/ModuleAdministration.php

Spacing +8 added lines, -8 removed lines

@@ -28,8 +28,8 @@ 
 	{
 		$modules = 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();
@@ -60,7 +60,7 @@ 
 
 			$section->add($label, 'title')->setStyle('float', 'right');
 			
-			$submodules = ModuleManager::getAll()->filter(function ($subModuleClass) use ($moduleClass) {
+			$submodules = ModuleManager::getAll()->filter(function($subModuleClass) use ($moduleClass) {
 				return $subModuleClass::isSubModuleOf($moduleClass);
 			});
 			
@@ -72,11 +72,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);
@@ -109,12 +109,12 @@ 
 					
 					$form = $view->add(new Form());
 					foreach ($recommended as $childModule) {
-						if (! ModuleManager::isAvailable($childModule)) continue;
+						if (!ModuleManager::isAvailable($childModule)) continue;
 						
 						$form->addField($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));
 						
@@ -123,7 +123,7 @@ 
 				}
 				
 				$view->add(['Button', __('Install'), 'primary'])->on('click', [
-						isset($form)? $form->submit(): $installCallback
+						isset($form) ? $form->submit() : $installCallback
 				]);
 			});
 			

Braces +7 added lines, -4 removed lines

@@ -51,8 +51,7 @@ 
 				$this->addUninstallButton($section, $moduleClass);
 				
 // 				$this->addReinstallButton($section, $moduleClass);
-			}
-			else {
+			} else {
 				$label = ['Label', __('Available'), 'yellow'];
 				
 				$this->addInstallButton($section, $moduleClass);
@@ -64,7 +63,9 @@ 
 				return $subModuleClass::isSubModuleOf($moduleClass);
 			});
 			
-			if ($submodules->isEmpty()) continue;
+			if ($submodules->isEmpty()) {
+				continue;
+			}
 			
 			$this->addAccordion($section, $submodules);
 		}
@@ -109,7 +110,9 @@ 
 					
 					$form = $view->add(new Form());
 					foreach ($recommended as $childModule) {
-						if (! ModuleManager::isAvailable($childModule)) continue;
+						if (! ModuleManager::isAvailable($childModule)) {
+							continue;
+						}
 						
 						$form->addField($childModule::alias(), ['CheckBox', 'caption' => $childModule::label()]);
 					}

src/System/Integration/Modules/ModuleManager.php

Spacing +17 added lines, -17 removed lines

@@ -20,7 +20,7 @@ 
 
 	public static function isInstalled($classOrAlias)
 	{
-		return self::getClass($classOrAlias, true)? 1: 0;
+		return self::getClass($classOrAlias, true) ? 1 : 0;
 	}
 	
 	public static function isAvailable($classOrAlias)
@@ -35,7 +35,7 @@ 
 	 * @return string;
 	 */
 	public static function getClass($classOrAlias, $installedOnly = false) {
-		$modules = $installedOnly? self::getInstalled(): self::getAll();
+		$modules = $installedOnly ? self::getInstalled() : self::getAll();
 		
 		if (collect($modules)->contains($classOrAlias)) return $classOrAlias;
 		
@@ -67,9 +67,9 @@ 
 	 */
 	public static function getAll()
 	{
-		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]);
 				}
@@ -82,14 +82,14 @@ 
 	protected static function discoverModuleClasses($namespace, $basePath)
 	{
 		$ret = collect();
-		foreach (glob($basePath . '/*', GLOB_ONLYDIR|GLOB_NOSORT) as $path) {
+		foreach (glob($basePath . '/*', GLOB_ONLYDIR | GLOB_NOSORT) as $path) {
 			$moduleNamespace = trim($namespace, '\\') . '\\' . basename($path);
 			
 			$ret = $ret->merge(self::discoverModuleClasses($moduleNamespace, $path));
 			
 			$moduleClass = $moduleNamespace . '\\' . basename($path) . 'Core';
 			
-			if (! is_a($moduleClass, ModuleCore::class, true)) continue;
+			if (!is_a($moduleClass, ModuleCore::class, true)) continue;
 			
 			$ret->add($moduleClass);
 		}
@@ -106,7 +106,7 @@ 
 	 */
 	protected static function getCached($key, \Closure $default)
 	{
-		if (! Cache::has($key)) {
+		if (!Cache::has($key)) {
 			Cache::forever($key, $default());
 		}
 
@@ -144,12 +144,12 @@ 
 	 */
 	public static function collect($method, $args = [])
 	{
-		$args = is_array($args)? $args: [$args];
+		$args = is_array($args) ? $args : [$args];
 		
 		$installedModules = 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
 			]);
@@ -157,9 +157,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;
@@ -178,7 +178,7 @@ 
 			return true;
 		}
 		
-		if (! $moduleClass = self::getClass($classOrAlias)) {			
+		if (!$moduleClass = self::getClass($classOrAlias)) {			
 			throw new \Exception('Module "' . $classOrAlias . '" could not be identified');
 		}
 		
@@ -208,7 +208,7 @@ 
 		]);
 		
 		if ($installRecommended) {
-			$installRecommended = is_array($installRecommended)? $installRecommended: $module->recommended();
+			$installRecommended = is_array($installRecommended) ? $installRecommended : $module->recommended();
 			
 			foreach ($installRecommended as $recommendedModule) {
 				try {
@@ -241,10 +241,10 @@ 
 			$parentModule = array_shift($unsatisfiedDependencies);
 				
 			if (self::$processing[$parentModule]?? false) {
-				throw new Exception('Cross dependency: '. $parentModule);
+				throw new Exception('Cross dependency: ' . $parentModule);
 			}
 				
-			if (! self::isAvailable($parentModule)) {
+			if (!self::isAvailable($parentModule)) {
 				throw new Exception('Module not found: "' . $parentModule . '"');
 			}
 	
@@ -297,13 +297,13 @@ 
 	
 	public static function uninstall($classOrAlias)
 	{
-		if (! self::isInstalled($classOrAlias)) {
+		if (!self::isInstalled($classOrAlias)) {
 			print ('Module "' . $classOrAlias . '" is not installed!');
 			
 			return true;
 		}
 		
-		if (! $moduleClass = self::getClass($classOrAlias)) {
+		if (!$moduleClass = self::getClass($classOrAlias)) {
 			throw new \Exception('Module "' . $classOrAlias . '" could not be identified');
 		}
 		

src/Controllers/SystemController.php

Indentation +43 added lines, -43 removed lines

@@ -11,66 +11,66 @@
 
 class SystemController extends Controller
 {
-    public function index()
-    {
-    	return SystemCore::isInstalled()? redirect('home'): redirect('install');
-    }
+	public function index()
+	{
+		return SystemCore::isInstalled()? redirect('home'): redirect('install');
+	}
     
-    public function install(Epesi $epesi)
-    {
-    	// make sure the installation information is fresh
-    	ModuleManager::clearCache();
+	public function install(Epesi $epesi)
+	{
+		// make sure the installation information is fresh
+		ModuleManager::clearCache();
     	
-    	if (SystemCore::isInstalled()) return redirect('home');
+		if (SystemCore::isInstalled()) return redirect('home');
     	
-    	$epesi->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]);
+		$epesi->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]);
     	
-    	$epesi->initLayout('Centered');
+		$epesi->initLayout('Centered');
     	
-    	$epesi->layout->set('logo', url('logo'));
-    	$epesi->layout->template->setHTML('copyright', config('epesi.app.copyright'));
+		$epesi->layout->set('logo', url('logo'));
+		$epesi->layout->template->setHTML('copyright', config('epesi.app.copyright'));
     	
-    	$epesi->add(new \Epesi\Core\System\SystemInstallWizard());
+		$epesi->add(new \Epesi\Core\System\SystemInstallWizard());
     	
-    	return $epesi->response();
-    }
+		return $epesi->response();
+	}
     
-    public function home()
-    {
-    	return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\HomePageSettings::getUserHomePagePath(): 'install');
-    }
+	public function home()
+	{
+		return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\HomePageSettings::getUserHomePagePath(): 'install');
+	}
     
-    public function logo()
-    { 
-    	$logoFile = \Epesi\Core\System\Logo\LogoSettings::getLogoFile();
+	public function logo()
+	{ 
+		$logoFile = \Epesi\Core\System\Logo\LogoSettings::getLogoFile();
 
-    	return response(File::get($logoFile), 200, ['Content-type' => File::mimeType($logoFile)])->setMaxAge(604800)->setPublic();
-    }
+		return response(File::get($logoFile), 200, ['Content-type' => File::mimeType($logoFile)])->setMaxAge(604800)->setPublic();
+	}
     
-    public function view(Epesi $epesi, $module, $method = 'body', $args = [])
-    {
-    	$epesi->initLayout(new LayoutView());
+	public function view(Epesi $epesi, $module, $method = 'body', $args = [])
+	{
+		$epesi->initLayout(new LayoutView());
     	
-    	$alias = explode(':', $module);
+		$alias = explode(':', $module);
     	
-    	$moduleAlias = $alias[0];
-    	$viewAlias = $alias[1]?? null;
+		$moduleAlias = $alias[0];
+		$viewAlias = $alias[1]?? null;
     	
-    	$view = null;
-    	if ($module = ModuleManager::getClass($moduleAlias, true)) {
-    		$viewClass = $module::view($viewAlias);
+		$view = null;
+		if ($module = ModuleManager::getClass($moduleAlias, true)) {
+			$viewClass = $module::view($viewAlias);
 
-    		if (class_exists($viewClass)) {
-    			$view = new $viewClass();
-    		}
-    	}
+			if (class_exists($viewClass)) {
+				$view = new $viewClass();
+			}
+		}
 
-    	if (! $view) abort(404);
+		if (! $view) abort(404);
     	
-    	$epesi->add($view)->displayModuleContent($method, $args);
+		$epesi->add($view)->displayModuleContent($method, $args);
     	
-    	$epesi->setLocation($view->location());
+		$epesi->setLocation($view->location());
     	
-    	return $epesi->response();
-    }
+		return $epesi->response();
+	}
 }