x-systems / epesi-core

src/System/SystemCore.php

Indentation +3 added lines, -3 removed lines

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

src/System/Model/Variable.php

Indentation +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 
 class Variable extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
 	/**
 	 * @var Collection
@@ -27,12 +27,12 @@ 
 	
 	protected function init(): void
 	{
-	    parent::init();
+		parent::init();
 	    
-	    $this->addFields([
-	            'name',
-	            'value' => ['type' => 'text', 'serialize' => 'json']
-	    ]);
+		$this->addFields([
+				'name',
+				'value' => ['type' => 'text', 'serialize' => 'json']
+		]);
 	}
 	
 	public static function recall($name, $default = null) {
@@ -57,10 +57,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 +2 added lines, -2 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');
 	}
@@ -64,7 +64,7 @@ 
 		}
 	}
 	
-	public static function forget($name, $throwError=true) {
+	public static function forget($name, $throwError = true) {
 		self::cache();
 		
 		if (!self::$variables->has($name) && $throwError) {

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');
 	}
@@ -38,7 +40,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;
 	}
@@ -58,8 +62,7 @@ 
 
 		if ($variable->loaded()) {
 		    $variable->save(compact('value'));
-		}
-		else {
+		} else {
 		    $variable->insert(compact('name', 'value'));
 		}
 	}

src/System/Model/Module.php

Indentation +12 added lines, -12 removed lines

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

src/Data/Persistence/SQL.php

Indentation +12 added lines, -12 removed lines

@@ -7,18 +7,18 @@
 
 class SQL extends \atk4\data\Persistence\Sql
 {
-    /**
-     * Take a laravel connection and pass it to ATK Data
-     *
-     * @return \atk4\data\Persistence\SQL
-     */
-    public function __construct(DatabaseManager $database)
-    {
-    	$pdo = $database->connection()->getPdo();
+	/**
+	 * Take a laravel connection and pass it to ATK Data
+	 *
+	 * @return \atk4\data\Persistence\SQL
+	 */
+	public function __construct(DatabaseManager $database)
+	{
+		$pdo = $database->connection()->getPdo();
     	
-    	// temporary fix of atk4/data inability to handle PREPARE on 'is null'
-    	$pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, true);
+		// temporary fix of atk4/data inability to handle PREPARE on 'is null'
+		$pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, true);
 
-    	parent::__construct(Connection::connect($pdo));
-    }
+		parent::__construct(Connection::connect($pdo));
+	}
 }

src/Layout/View/Launchpad.php

Indentation +21 added lines, -21 removed lines

@@ -27,27 +27,27 @@
 		return new JsModal($this->title, $this->virtualPage);
 	}
 	
-    protected function getContents(VirtualPage $vp)
-    {
-    	$vp->add([
-    			new LaunchButton([
-    					'label' => 'Test Button 1',
-    					'icon' => 'user'
-    			])
-    	])->link(URL::to('/'));
+	protected function getContents(VirtualPage $vp)
+	{
+		$vp->add([
+				new LaunchButton([
+						'label' => 'Test Button 1',
+						'icon' => 'user'
+				])
+		])->link(URL::to('/'));
     	
-    	$vp->add([
-    			new LaunchButton([
-    					'label' => 'Test Button 2',
-    					'icon' => 'car'
-    			])
-    	]);
+		$vp->add([
+				new LaunchButton([
+						'label' => 'Test Button 2',
+						'icon' => 'car'
+				])
+		]);
     	
-    	$vp->add([
-    			new LaunchButton([
-    					'label' => 'Test Button 3',
-    					'icon' => 'bus'
-    			])
-    	]);
-    }
+		$vp->add([
+				new LaunchButton([
+						'label' => 'Test Button 3',
+						'icon' => 'bus'
+				])
+		]);
+	}
 }

src/Layout/LayoutView.php

Indentation +62 added lines, -62 removed lines

@@ -10,53 +10,53 @@ 
 
 class LayoutView extends \atk4\ui\Layout
 {
-    use SessionTrait;
+	use SessionTrait;
     
-    /**
-     * @var View\NavMenu
-     */
-    public $menuLeft;    // vertical menu
+	/**
+	 * @var View\NavMenu
+	 */
+	public $menuLeft;    // vertical menu
        
-    /**
-     * @var \atk4\ui\Menu
-     */
-    public $menuTop;        // horizontal menu
+	/**
+	 * @var \atk4\ui\Menu
+	 */
+	public $menuTop;        // horizontal menu
     
-    /**
-     * @var \atk4\ui\Menu
-     */
-    public $menuRight;   // vertical pull-down
+	/**
+	 * @var \atk4\ui\Menu
+	 */
+	public $menuRight;   // vertical pull-down
        
-    /**
-     * @var View\ActionBar
-     */
-    public $actionBar;   
-    public $locationBar;
+	/**
+	 * @var View\ActionBar
+	 */
+	public $actionBar;   
+	public $locationBar;
     
-    public $burger = true;      // burger menu item
+	public $burger = true;      // burger menu item
 
-    /*
+	/*
      * Whether or not left Menu is visible on Page load.
      */
-    public $isMenuLeftVisible = true;
+	public $isMenuLeftVisible = true;
 
-    public $defaultTemplate = 'layout/admin.html';
+	public $defaultTemplate = 'layout/admin.html';
     
-    protected $location;
+	protected $location;
 
-    protected function init(): void
-    {
-        parent::init();
+	protected function init(): void
+	{
+		parent::init();
         
-        $this->initMenuTop();
-        $this->initActionBar();
+		$this->initMenuTop();
+		$this->initActionBar();
         
 //         if (request()->pjax()) return;
         
-        $this->initMenuLeft();  
-        $this->initMenuRight();
+		$this->initMenuLeft();  
+		$this->initMenuRight();
         
-        $this->template->trySet('version', $this->getApp()->version);
+		$this->template->trySet('version', $this->getApp()->version);
         
 //         $this->js(true, null, 'body')->niceScroll();
         
@@ -65,7 +65,7 @@ 
 // 		if (event.originalEvent.persisted) {
 //         	window.location.reload(); 
 //     	}')]));
-    }
+	}
     
 	/**
 	 * @return static 
@@ -127,40 +127,40 @@ 
 		$this->menuRight = $this->menuTop->add(new View\RightMenu(['ui' => false]), 'RightMenu')->addClass('right menu')->removeClass('item');
 	}
 	
-    protected function initMenuLeft()
-    {
-        if ($this->menuLeft) return;
+	protected function initMenuLeft()
+	{
+		if ($this->menuLeft) return;
         
-        $this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
+		$this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
 
-        if ($this->burger) {
-        	$this->isMenuLeftVisible = $this->learn('menu', $this->isMenuLeftVisible);
+		if ($this->burger) {
+			$this->isMenuLeftVisible = $this->learn('menu', $this->isMenuLeftVisible);
         	
-        	$this->burger->add([\atk4\ui\Icon::class, 'content'])->on('click', [
-        			(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
-        			(new jQuery('.epesi-logo'))->toggleClass('expanded'),
-        			(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
-        			\atk4\ui\JsCallback::addTo($this->burger)->set(function($jsCallback, $visible) {
-        				$this->memorize('menu', filter_var($visible, FILTER_VALIDATE_BOOLEAN));
-        			}, [$this->menuLeft->js(true)->hasClass('visible')])
-        	]);
-        }
-    }
+			$this->burger->add([\atk4\ui\Icon::class, 'content'])->on('click', [
+					(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
+					(new jQuery('.epesi-logo'))->toggleClass('expanded'),
+					(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
+					\atk4\ui\JsCallback::addTo($this->burger)->set(function($jsCallback, $visible) {
+						$this->memorize('menu', filter_var($visible, FILTER_VALIDATE_BOOLEAN));
+					}, [$this->menuLeft->js(true)->hasClass('visible')])
+			]);
+		}
+	}
     
-    protected function initActionBar()
-    {
-    	if (!$this->actionBar) {
-    		$this->actionBar = View\ActionBar::addTo($this, [], ['ActionBar']);
-    	}
+	protected function initActionBar()
+	{
+		if (!$this->actionBar) {
+			$this->actionBar = View\ActionBar::addTo($this, [], ['ActionBar']);
+		}
     	
-    	return $this;
-    }
+		return $this;
+	}
 
-    public function renderView(): void
-    {
-    	if ($this->menuLeft && $this->isMenuLeftVisible) {
-               $this->menuLeft->addClass('visible');
-        }
-        parent::renderView();
-    }
+	public function renderView(): void
+	{
+		if ($this->menuLeft && $this->isMenuLeftVisible) {
+			   $this->menuLeft->addClass('visible');
+		}
+		parent::renderView();
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -15,17 +15,17 @@ 
     /**
      * @var View\NavMenu
      */
-    public $menuLeft;    // vertical menu
+    public $menuLeft; // vertical menu
        
     /**
      * @var \atk4\ui\Menu
      */
-    public $menuTop;        // horizontal menu
+    public $menuTop; // horizontal menu
     
     /**
      * @var \atk4\ui\Menu
      */
-    public $menuRight;   // vertical pull-down
+    public $menuRight; // vertical pull-down
        
     /**
      * @var View\ActionBar
@@ -33,7 +33,7 @@ 
     public $actionBar;   
     public $locationBar;
     
-    public $burger = true;      // burger menu item
+    public $burger = true; // burger menu item
 
     /*
      * Whether or not left Menu is visible on Page load.

Braces +9 added lines, -3 removed lines

@@ -100,7 +100,9 @@ 
 	
 	protected function initMenuTop()
 	{
-		if ($this->menuTop) return;
+		if ($this->menuTop) {
+			return;
+		}
 		
 		$this->menuTop = Menu::addTo($this, ['atk-topMenu fixed horizontal', 'element' => 'header'], ['TopMenu']);
 		
@@ -122,14 +124,18 @@ 
 
 	protected function initMenuRight()
 	{
-		if ($this->menuRight) return;
+		if ($this->menuRight) {
+			return;
+		}
 
 		$this->menuRight = $this->menuTop->add(new View\RightMenu(['ui' => false]), 'RightMenu')->addClass('right menu')->removeClass('item');
 	}
 	
     protected function initMenuLeft()
     {
-        if ($this->menuLeft) return;
+        if ($this->menuLeft) {
+        	return;
+        }
         
         $this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
 

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/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]);
 		}