x-systems / epesi-core

src/System/User/Database/Models/atk4/User.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 class User extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
 	public $table = 'users';
 	

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     
 	public $table = 'users';
 	
-	function init(){
+	function init() {
 		parent::init();
 		
 		$this->addFields(['name']);

src/System/SystemInstallWizard.php

Spacing +5 added lines, -5 removed lines

@@ -79,7 +79,7 @@ 
 		
 		$form->addField('language', ['DropDown', 'values' => $values, 'caption' => __('Select Language'), 'iconLeft' => 'globe'], ['required'=>true])->set($wizard->recall('language', 'en'));
 		
-		$form->onSubmit(function ($form) use ($wizard) {
+		$form->onSubmit(function($form) use ($wizard) {
 			$wizard->memorize('language', $form->model['language']);
 			
 			App::setLocale($form->model['language']);
@@ -111,7 +111,7 @@ 
 		$form->addField('support', ['CheckBox', 'caption' => __('I will not remove "Support -> About" credit page from the application menu.')], ['required'=>true]);
 		$form->addField('store', ['CheckBox', 'caption' => __('I will not remove or rename ":epesi Store" links from the application.', ['epesi' => config('epesi.app.title')])], ['required'=>true]);
 		
-		$form->onSubmit(function ($form) use ($wizard) {
+		$form->onSubmit(function($form) use ($wizard) {
 			return $wizard->jsNext();
 		});
 			
@@ -139,12 +139,12 @@ 
 		$form->addField('create', ['CheckBox', 'caption' => __('Create New Database')])->on('change', new jsExpression('if ($(event.target).is(":checked")) alert([])', [__('WARNING: Make sure you have CREATE access level to do this!')]));
 
 		foreach ($wizard->recall('connection', []) as $name => $value) {
-			if (! $field = $form->fields[$name]?? null) continue;
+			if (!$field = $form->fields[$name]?? null) continue;
 			
 			$field->set($value);
 		}
 
-		$form->onSubmit(function ($form) use ($wizard) {
+		$form->onSubmit(function($form) use ($wizard) {
 			$connection = $form->model->get();
 
 			$wizard->memorize('connection', $connection);
@@ -192,7 +192,7 @@ 
 		
 		$form->model->set($wizard->recall('user'));
 		
-		$form->validate(function ($form) use ($wizard) {
+		$form->validate(function($form) use ($wizard) {
 			$wizard->memorize('user', $form->model->get());
 			
 			return $wizard->jsNext();

src/System/SystemCore.php

Indentation +3 added lines, -3 removed lines

@@ -24,11 +24,11 @@
 	
 	public function migrate()
 	{
-	    Models\Module::migrate();
+		Models\Module::migrate();
 	    
-	    Models\Variable::migrate();
+		Models\Variable::migrate();
 	    
-	    return parent::migrate();
+		return parent::migrate();
 	}
 	
 }

src/System/ModuleAdministration.php

Indentation +12 added lines, -12 removed lines

@@ -43,7 +43,7 @@ 
 		$accordion = $container->add(['Accordion', 'type' => ['styled', 'fluid'], 'settings' => ['animateChildren' => false]])->setStyle(['max-width' => '800px', 'margin-left' => 'auto', 'margin-right' => 'auto']);
 		
 		if ($container == $this) {
-		    $this->accordion = $accordion;
+			$this->accordion = $accordion;
 		}
 		
 		foreach ($modules as $moduleClass) {
@@ -92,17 +92,17 @@ 
 	
 	public function addInstallButton($container, $moduleClass)
 	{
-	    $button = $container->add(['Button', __('Install'), 'class' => ['green']]);
+		$button = $container->add(['Button', __('Install'), 'class' => ['green']]);
 	    
-	    $callback = $installCallback = $this->add('jsCallback')->set(function() use ($moduleClass, $container) {
+		$callback = $installCallback = $this->add('jsCallback')->set(function() use ($moduleClass, $container) {
 			ob_start();
 			ModuleManager::install($moduleClass);
 			
 			$message = ob_get_clean();
 			
 			return [
-			        $this->notifySuccess($message),
-			        new jsReload($this->accordion),
+					$this->notifySuccess($message),
+					new jsReload($this->accordion),
 			];
 		});
 		
@@ -150,17 +150,17 @@ 
 	
 	public function addUninstallButton($container, $moduleClass)
 	{
-	    $button = $container->add(['Button', __('Uninstall'), 'class' => ['red']]);
+		$button = $container->add(['Button', __('Uninstall'), 'class' => ['red']]);
 	    
-	    $callback = $uninstallCallback = $button->add(['jsCallback', 'confirm' => __('Are you sure you want to uninstall :module', ['module' => $moduleClass::label()])])->set(function() use ($moduleClass) {
-		    ob_start();
+		$callback = $uninstallCallback = $button->add(['jsCallback', 'confirm' => __('Are you sure you want to uninstall :module', ['module' => $moduleClass::label()])])->set(function() use ($moduleClass) {
+			ob_start();
 			ModuleManager::uninstall($moduleClass);
 			
 			$message = ob_get_clean();
 			
 			return [
-			        $this->notifySuccess($message),
-			        new jsReload($this->accordion),
+					$this->notifySuccess($message),
+					new jsReload($this->accordion),
 			];
 		});
 		
@@ -199,8 +199,8 @@ 
 			ModuleManager::clearCache();
 			
 			return [
-			        new jsReload($this->accordion),
-			        $this->notifySuccess(__('Cache cleared!'))
+					new jsReload($this->accordion),
+					$this->notifySuccess(__('Cache cleared!'))
 			];
 		});
 	}

src/System/Models/Module.php

Indentation +11 added lines, -11 removed lines

@@ -7,18 +7,18 @@
 
 class Module extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
-    public $table = 'modules';
+	public $table = 'modules';
     
-    function init() {
-        parent::init();
+	function init() {
+		parent::init();
         
-        $this->addFields([
-                'class',
-                'alias',
-                'priority' => ['default' => 0],
-                'state' => ['default' => 1]
-        ]);
-    }
+		$this->addFields([
+				'class',
+				'alias',
+				'priority' => ['default' => 0],
+				'state' => ['default' => 1]
+		]);
+	}
 }

src/System/Models/Variable.php

Indentation +14 added lines, -14 removed lines

@@ -8,7 +8,7 @@ 
 
 class Variable extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
 	/**
 	 * @var Collection
@@ -26,20 +26,20 @@ 
 	}
 	
 	public function init() {
-	    parent::init();
+		parent::init();
 	    
-	    $this->addFields([
-	            'name',
-	            'value' => ['type' => 'text']
-	    ]);
+		$this->addFields([
+				'name',
+				'value' => ['type' => 'text']
+		]);
 
-	    $this->addHook('beforeSave', function(Variable $variable) {
-	        $variable['value'] = json_encode($variable['value']);
-	    });
+		$this->addHook('beforeSave', function(Variable $variable) {
+			$variable['value'] = json_encode($variable['value']);
+		});
 	    
-	    $this->addHook('beforeLoad', function(Variable $variable) {
-	        $variable['value'] = $variable['value']? json_decode($variable['value']): '';
-	    });
+		$this->addHook('beforeLoad', function(Variable $variable) {
+			$variable['value'] = $variable['value']? json_decode($variable['value']): '';
+		});
 	}
 	
 	public static function recall($name, $default = null) {
@@ -64,10 +64,10 @@ 
 		$variable = self::create()->addCondition('name', $name)->tryLoadAny();
 		
 		if ($variable->loaded()) {
-		    $variable->save(compact('value'));
+			$variable->save(compact('value'));
 		}
 		else {
-		    $variable->insert(compact('name', 'value'));
+			$variable->insert(compact('name', 'value'));
 		}
 	}
 	

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
 	public $strict_types = false;
 	
 	private static function cache() {
-		if(isset(self::$variables)) return;
+		if (isset(self::$variables)) return;
 		
 		self::$variables = self::pluck('value', 'name');
 	}
@@ -38,14 +38,14 @@ 
 	    });
 	    
 	    $this->addHook('beforeLoad', function(Variable $variable) {
-	        $variable['value'] = $variable['value']? json_decode($variable['value']): '';
+	        $variable['value'] = $variable['value'] ? json_decode($variable['value']) : '';
 	    });
 	}
 	
 	public static function recall($name, $default = null) {
 		self::cache();
 		
-		if (! self::$variables->has($name)) return $default;
+		if (!self::$variables->has($name)) return $default;
 		
 		return self::$variables->get($name, $default)?? $default;
 	}
@@ -71,10 +71,10 @@ 
 		}
 	}
 	
-	public static function forget($name, $throwError=true) {
+	public static function forget($name, $throwError = true) {
 		self::cache();
 		
-		if (! self::$variables->has($name) && $throwError) {
+		if (!self::$variables->has($name) && $throwError) {
 			throw new \Exception('No such variable in database: ' . $name);
 		}
 		

Braces +7 added lines, -4 removed lines

@@ -20,7 +20,9 @@ 
 	public $strict_types = false;
 	
 	private static function cache() {
-		if(isset(self::$variables)) return;
+		if(isset(self::$variables)) {
+			return;
+		}
 		
 		self::$variables = self::pluck('value', 'name');
 	}
@@ -45,7 +47,9 @@ 
 	public static function recall($name, $default = null) {
 		self::cache();
 		
-		if (! self::$variables->has($name)) return $default;
+		if (! self::$variables->has($name)) {
+			return $default;
+		}
 		
 		return self::$variables->get($name, $default)?? $default;
 	}
@@ -65,8 +69,7 @@ 
 		
 		if ($variable->loaded()) {
 		    $variable->save(compact('value'));
-		}
-		else {
+		} else {
 		    $variable->insert(compact('name', 'value'));
 		}
 	}

src/System/Modules/Concerns/Notifies.php

Indentation +15 added lines, -15 removed lines

@@ -4,24 +4,24 @@
 
 trait Notifies
 {
-    public function notify($options)
-    {
-        $options = array_merge(['duration'=> 1500], is_array($options)? $options: ['message' => $options]);
+	public function notify($options)
+	{
+		$options = array_merge(['duration'=> 1500], is_array($options)? $options: ['message' => $options]);
 
-        return new \atk4\ui\jsToast($options);
-    }
+		return new \atk4\ui\jsToast($options);
+	}
     
-    public function notifySuccess($options)
-    {
-        $options = array_merge(['class' => 'success'], is_array($options)? $options: ['message' => $options]);
+	public function notifySuccess($options)
+	{
+		$options = array_merge(['class' => 'success'], is_array($options)? $options: ['message' => $options]);
         
-        return $this->notify($options);
-    }
+		return $this->notify($options);
+	}
     
-    public function notifyError($options)
-    {
-        $options = array_merge(['class' => 'error'], is_array($options)? $options: ['message' => $options]);
+	public function notifyError($options)
+	{
+		$options = array_merge(['class' => 'error'], is_array($options)? $options: ['message' => $options]);
         
-        return $this->notify($options);
-    }
+		return $this->notify($options);
+	}
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -6,21 +6,21 @@
 {
     public function notify($options)
     {
-        $options = array_merge(['duration'=> 1500], is_array($options)? $options: ['message' => $options]);
+        $options = array_merge(['duration'=> 1500], is_array($options) ? $options : ['message' => $options]);
 
         return new \atk4\ui\jsToast($options);
     }
     
     public function notifySuccess($options)
     {
-        $options = array_merge(['class' => 'success'], is_array($options)? $options: ['message' => $options]);
+        $options = array_merge(['class' => 'success'], is_array($options) ? $options : ['message' => $options]);
         
         return $this->notify($options);
     }
     
     public function notifyError($options)
     {
-        $options = array_merge(['class' => 'error'], is_array($options)? $options: ['message' => $options]);
+        $options = array_merge(['class' => 'error'], is_array($options) ? $options : ['message' => $options]);
         
         return $this->notify($options);
     }

src/System/Modules/Concerns/HasLinks.php

Indentation +2 added lines, -2 removed lines

@@ -48,8 +48,8 @@
 		$alias = class_exists($module)? $module::alias(): $module;
 		
 		if (is_array($method) && !$args) {
-		    $args = $method;
-		    $method = 'body';
+			$args = $method;
+			$method = 'body';
 		}
 		
 		return url(implode('/', ['view', $alias, $method, self::encodeArgs($args)]));

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 	{
 		$defaultView = self::module()::view();
 		
-		$viewClass = is_a(static::class, ModuleView::class, true)? static::class: $defaultView;
+		$viewClass = is_a(static::class, ModuleView::class, true) ? static::class : $defaultView;
 		
 		$viewAlias = null;
 		if ($viewClass !== $defaultView) {
@@ -45,7 +45,7 @@ 
 	 */
 	final public static function moduleLink($module, $method = 'body', $args = [])
 	{
-		$alias = class_exists($module)? $module::alias(): $module;
+		$alias = class_exists($module) ? $module::alias() : $module;
 		
 		if (is_array($method) && !$args) {
 		    $args = $method;
@@ -64,7 +64,7 @@ 
 	 * @throws \Illuminate\Http\Exceptions\HttpResponseException
 	 */
 	final public static function decodeArgs($hash) {
-		if (! $hash) return [];
+		if (!$hash) return [];
 		
 		$args = session($hash);
 
@@ -82,7 +82,7 @@ 
 	final public static function encodeArgs($args) {
 		$args = (array) $args;
 		
-		if (! $args) return;
+		if (!$args) return;
 		
 		$hash = md5(serialize($args));
 		

Braces +9 added lines, -3 removed lines

@@ -64,11 +64,15 @@ 
 	 * @throws \Illuminate\Http\Exceptions\HttpResponseException
 	 */
 	final public static function decodeArgs($hash) {
-		if (! $hash) return [];
+		if (! $hash) {
+			return [];
+		}
 		
 		$args = session($hash);
 
-		if (is_null($args)) abort(419);
+		if (is_null($args)) {
+			abort(419);
+		}
 		
 		return (array) $args;
 	}
@@ -82,7 +86,9 @@ 
 	final public static function encodeArgs($args) {
 		$args = (array) $args;
 		
-		if (! $args) return;
+		if (! $args) {
+			return;
+		}
 		
 		$hash = md5(serialize($args));
 		

src/System/Modules/ModuleManager.php

Indentation +15 added lines, -16 removed lines

@@ -64,7 +64,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();
 			}
@@ -104,27 +104,27 @@ 
 	 */
 	protected static function discoverModuleClasses($namespace, $basePath)
 	{
-	    $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;
+		return $ret;
 	}
 	
 	/**
@@ -356,7 +356,6 @@ 
 	 * 
 	 * @param string $classOrAlias
 	 * @throws \Exception
-
 	 * @return boolean
 	 */
 	public static function uninstall($classOrAlias)

Spacing +17 added lines, -17 removed lines

@@ -26,7 +26,7 @@ 
 	 */
 	public static function isInstalled($classOrAlias)
 	{
-		return self::getClass($classOrAlias, true)? 1: 0;
+		return self::getClass($classOrAlias, true) ? 1 : 0;
 	}
 	
 	/**
@@ -48,7 +48,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;
 		
@@ -80,9 +80,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]);
 				}
@@ -110,7 +110,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)) {
@@ -118,7 +118,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));
@@ -136,7 +136,7 @@ 
 	 */
 	protected static function getCached($key, \Closure $default)
 	{
-		if (! Cache::has($key)) {
+		if (!Cache::has($key)) {
 			Cache::forever($key, $default());
 		}
 
@@ -174,12 +174,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
 			]);
@@ -187,9 +187,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;
@@ -208,7 +208,7 @@ 
 			return true;
 		}
 		
-		if (! $moduleClass = self::getClass($classOrAlias)) {			
+		if (!$moduleClass = self::getClass($classOrAlias)) {			
 			throw new \Exception('Module "' . $classOrAlias . '" could not be identified');
 		}
 		
@@ -238,7 +238,7 @@ 
 		]);
 		
 		if ($installRecommended) {
-			$installRecommended = is_array($installRecommended)? $installRecommended: $module->recommended();
+			$installRecommended = is_array($installRecommended) ? $installRecommended : $module->recommended();
 			
 			foreach ($installRecommended as $recommendedModule) {
 				try {
@@ -271,10 +271,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 . '"');
 			}
 	
@@ -361,13 +361,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');
 		}
 		

Braces +6 added lines, -2 removed lines

@@ -36,7 +36,9 @@ 
 	public static function getClass($classOrAlias, $installedOnly = false) {
 		$modules = $installedOnly? self::getInstalled(): self::getAll();
 		
-		if (collect($modules)->contains($classOrAlias)) return $classOrAlias;
+		if (collect($modules)->contains($classOrAlias)) {
+			return $classOrAlias;
+		}
 		
 		return $modules[$classOrAlias]?? null;
 	}
@@ -138,7 +140,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]);
 		}