x-systems / epesi-core

src/Integration/Concerns/HasLocation.php

Spacing +3 added lines, -3 removed lines

@@ -36,13 +36,13 @@
 			return $this;
 		}
 		
-		$this->label = is_array($this->label)? $this->label: [$this->label];
+		$this->label = is_array($this->label) ? $this->label : [$this->label];
 
 		$this->label = array_map('trans', $this->label);
 		
-		$this->location = is_array($this->location)? $this->location: [$this->location];
+		$this->location = is_array($this->location) ? $this->location : [$this->location];
 
-		return array_merge($this->label, $this->location?: []);
+		return array_merge($this->label, $this->location ?: []);
 	}
 	
 	public function label($label)

src/Integration/Module/ModuleView.php

Spacing +2 added lines, -2 removed lines

@@ -34,10 +34,10 @@
 	 */
 	final public function displayModuleContent($method, $args) {
 		// if method not callbale abort to 'not found'
-		if (! is_callable([$this, $method])) abort(404);
+		if (!is_callable([$this, $method])) abort(404);
 		
 		// if user has no access abort 'no access'
-		if (! $this->access()) abort(401);
+		if (!$this->access()) abort(401);
 		
 		$args = $this->decodeArgs($args);
 		

Braces +6 added lines, -2 removed lines

@@ -34,10 +34,14 @@
 	 */
 	final public function displayModuleContent($method, $args) {
 		// if method not callbale abort to 'not found'
-		if (! is_callable([$this, $method])) abort(404);
+		if (! is_callable([$this, $method])) {
+			abort(404);
+		}
 		
 		// if user has no access abort 'no access'
-		if (! $this->access()) abort(401);
+		if (! $this->access()) {
+			abort(401);
+		}
 		
 		$args = $this->decodeArgs($args);
 		

src/Integration/Module/ModuleJoint.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 			 */
 			$joint = new $class();
 
-			if (! $joint->access()) continue;
+			if (!$joint->access()) continue;
 			
 			$ret->add($joint);
 		}
@@ -69,7 +69,7 @@ 
 	
 	final public static function packageManifest()
 	{
-		return self::$packageManifest = self::$packageManifest?: new PackageManifest(new Filesystem(), app()->basePath(), self::getCachedManifestPath());
+		return self::$packageManifest = self::$packageManifest ?: new PackageManifest(new Filesystem(), app()->basePath(), self::getCachedManifestPath());
 	}
 	
 	final public static function getCachedManifestPath()

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
 			 */
 			$joint = new $class();
 
-			if (! $joint->access()) continue;
+			if (! $joint->access()) {
+				continue;
+			}
 			
 			$ret->add($joint);
 		}

src/helpers.php

Indentation +15 added lines, -15 removed lines

@@ -2,35 +2,35 @@
 
 if (! function_exists('epesi')) {
 	function epesi() : Epesi\Core\App
-    {
-    	return resolve(Epesi\Core\App::class);
-    }
+	{
+		return resolve(Epesi\Core\App::class);
+	}
 }
 
 if (! function_exists('eval_css')) {
 	function eval_css($css)
-    {
-    	epesi()->addStyle($css);
-    }
+	{
+		epesi()->addStyle($css);
+	}
 }
 
 if (! function_exists('eval_js')) {
 	function eval_js($js, $args = [])
-    {
-    	epesi()->addJS($js, $args);
-    }
+	{
+		epesi()->addJS($js, $args);
+	}
 }
 
 if (! function_exists('load_css')) {
 	function load_css($url)
-    {
-    	return epesi()->requireCSS($url);
-    }
+	{
+		return epesi()->requireCSS($url);
+	}
 }
 
 if (! function_exists('load_js')) {
 	function load_js($url)
-    {
-    	return epesi()->requireJS($url);
-    }
+	{
+		return epesi()->requireJS($url);
+	}
 }

Spacing +5 added lines, -5 removed lines

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

src/Integration/Module/PackageManifest.php

Indentation +160 added lines, -160 removed lines

@@ -7,166 +7,166 @@
 
 class PackageManifest
 {
-    /**
-     * The filesystem instance.
-     *
-     * @var \Illuminate\Filesystem\Filesystem
-     */
-    public $files;
-
-    /**
-     * The base path.
-     *
-     * @var string
-     */
-    public $basePath;
-
-    /**
-     * The vendor path.
-     *
-     * @var string
-     */
-    public $vendorPath;
-
-    /**
-     * The manifest path.
-     *
-     * @var string|null
-     */
-    public $manifestPath;
-
-    /**
-     * The loaded manifest array.
-     *
-     * @var array
-     */
-    public $manifest;
-
-    /**
-     * Create a new package manifest instance.
-     *
-     * @param  \Illuminate\Filesystem\Filesystem  $files
-     * @param  string  $basePath
-     * @param  string  $manifestPath
-     * @return void
-     */
-    public function __construct(Filesystem $files, $basePath, $manifestPath)
-    {
-        $this->files = $files;
-        $this->basePath = $basePath;
-        $this->manifestPath = $manifestPath;
-        $this->vendorPath = $basePath.'/vendor';
-    }
-
-    /**
-     * Get all of the integrator class names for all packages.
-     *
-     * @return array
-     */
-    public function joints()
-    {
-        return collect($this->getManifest())->flatMap(function ($configuration) {
-            return (array) ($configuration['joints'] ?? []);
-        })->filter()->all();
-    }
+	/**
+	 * The filesystem instance.
+	 *
+	 * @var \Illuminate\Filesystem\Filesystem
+	 */
+	public $files;
+
+	/**
+	 * The base path.
+	 *
+	 * @var string
+	 */
+	public $basePath;
+
+	/**
+	 * The vendor path.
+	 *
+	 * @var string
+	 */
+	public $vendorPath;
+
+	/**
+	 * The manifest path.
+	 *
+	 * @var string|null
+	 */
+	public $manifestPath;
+
+	/**
+	 * The loaded manifest array.
+	 *
+	 * @var array
+	 */
+	public $manifest;
+
+	/**
+	 * Create a new package manifest instance.
+	 *
+	 * @param  \Illuminate\Filesystem\Filesystem  $files
+	 * @param  string  $basePath
+	 * @param  string  $manifestPath
+	 * @return void
+	 */
+	public function __construct(Filesystem $files, $basePath, $manifestPath)
+	{
+		$this->files = $files;
+		$this->basePath = $basePath;
+		$this->manifestPath = $manifestPath;
+		$this->vendorPath = $basePath.'/vendor';
+	}
+
+	/**
+	 * Get all of the integrator class names for all packages.
+	 *
+	 * @return array
+	 */
+	public function joints()
+	{
+		return collect($this->getManifest())->flatMap(function ($configuration) {
+			return (array) ($configuration['joints'] ?? []);
+		})->filter()->all();
+	}
     
-    /**
-     * Get all of the module root folders for all packages.
-     *
-     * @return array
-     */
-    public function modules()
-    {
-    	return collect($this->getManifest())->flatMap(function ($configuration) {
-    		return (array) ($configuration['modules'] ?? []);
-    	})->filter()->all();
-    }
-
-    /**
-     * Get the current package manifest.
-     *
-     * @return array
-     */
-    protected function getManifest()
-    {
-        if (isset($this->manifest)) {
-            return $this->manifest;
-        }
-
-        if (! file_exists($this->manifestPath)) {
-            $this->build();
-        }
+	/**
+	 * Get all of the module root folders for all packages.
+	 *
+	 * @return array
+	 */
+	public function modules()
+	{
+		return collect($this->getManifest())->flatMap(function ($configuration) {
+			return (array) ($configuration['modules'] ?? []);
+		})->filter()->all();
+	}
+
+	/**
+	 * Get the current package manifest.
+	 *
+	 * @return array
+	 */
+	protected function getManifest()
+	{
+		if (isset($this->manifest)) {
+			return $this->manifest;
+		}
+
+		if (! file_exists($this->manifestPath)) {
+			$this->build();
+		}
         
-        return $this->manifest = file_exists($this->manifestPath) ?
-            $this->files->getRequire($this->manifestPath) : [];
-    }
-
-    /**
-     * Build the manifest and write it to disk.
-     *
-     * @return void
-     */
-    public function build()
-    {
-        $packages = [];
-
-        if ($this->files->exists($path = $this->vendorPath.'/composer/installed.json')) {
-            $packages = json_decode($this->files->get($path), true);
-        }
-
-        $ignoreAll = in_array('*', $ignore = $this->packagesToIgnore());
-
-        $this->write(collect($packages)->mapWithKeys(function ($package) {
-            return [$this->format($package['name']) => $package['extra']['epesi'] ?? []];
-        })->each(function ($configuration) use (&$ignore) {
-            $ignore = array_merge($ignore, $configuration['dont-discover'] ?? []);
-        })->reject(function ($configuration, $package) use ($ignore, $ignoreAll) {
-            return $ignoreAll || in_array($package, $ignore);
-        })->filter()->all());
-    }
-
-    /**
-     * Format the given package name.
-     *
-     * @param  string  $package
-     * @return string
-     */
-    protected function format($package)
-    {
-        return str_replace($this->vendorPath.'/', '', $package);
-    }
-
-    /**
-     * Get all of the package names that should be ignored.
-     *
-     * @return array
-     */
-    protected function packagesToIgnore()
-    {
-        if (! file_exists($this->basePath.'/composer.json')) {
-            return [];
-        }
-
-        return json_decode(file_get_contents(
-            $this->basePath.'/composer.json'
-        ), true)['extra']['epesi']['dont-discover'] ?? [];
-    }
-
-    /**
-     * Write the given manifest array to disk.
-     *
-     * @param  array  $manifest
-     * @return void
-     * @throws \Exception
-     */
-    protected function write(array $manifest)
-    {
-        if (! is_writable(dirname($this->manifestPath))) {
-            throw new Exception('The '.dirname($this->manifestPath).' directory must be present and writable.');
-        }
-
-        $this->files->put(
-            $this->manifestPath, '<?php return '.var_export($manifest, true).';'
-        );
-    }
+		return $this->manifest = file_exists($this->manifestPath) ?
+			$this->files->getRequire($this->manifestPath) : [];
+	}
+
+	/**
+	 * Build the manifest and write it to disk.
+	 *
+	 * @return void
+	 */
+	public function build()
+	{
+		$packages = [];
+
+		if ($this->files->exists($path = $this->vendorPath.'/composer/installed.json')) {
+			$packages = json_decode($this->files->get($path), true);
+		}
+
+		$ignoreAll = in_array('*', $ignore = $this->packagesToIgnore());
+
+		$this->write(collect($packages)->mapWithKeys(function ($package) {
+			return [$this->format($package['name']) => $package['extra']['epesi'] ?? []];
+		})->each(function ($configuration) use (&$ignore) {
+			$ignore = array_merge($ignore, $configuration['dont-discover'] ?? []);
+		})->reject(function ($configuration, $package) use ($ignore, $ignoreAll) {
+			return $ignoreAll || in_array($package, $ignore);
+		})->filter()->all());
+	}
+
+	/**
+	 * Format the given package name.
+	 *
+	 * @param  string  $package
+	 * @return string
+	 */
+	protected function format($package)
+	{
+		return str_replace($this->vendorPath.'/', '', $package);
+	}
+
+	/**
+	 * Get all of the package names that should be ignored.
+	 *
+	 * @return array
+	 */
+	protected function packagesToIgnore()
+	{
+		if (! file_exists($this->basePath.'/composer.json')) {
+			return [];
+		}
+
+		return json_decode(file_get_contents(
+			$this->basePath.'/composer.json'
+		), true)['extra']['epesi']['dont-discover'] ?? [];
+	}
+
+	/**
+	 * Write the given manifest array to disk.
+	 *
+	 * @param  array  $manifest
+	 * @return void
+	 * @throws \Exception
+	 */
+	protected function write(array $manifest)
+	{
+		if (! is_writable(dirname($this->manifestPath))) {
+			throw new Exception('The '.dirname($this->manifestPath).' directory must be present and writable.');
+		}
+
+		$this->files->put(
+			$this->manifestPath, '<?php return '.var_export($manifest, true).';'
+		);
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -55,7 +55,7 @@ 
         $this->files = $files;
         $this->basePath = $basePath;
         $this->manifestPath = $manifestPath;
-        $this->vendorPath = $basePath.'/vendor';
+        $this->vendorPath = $basePath . '/vendor';
     }
 
     /**
@@ -65,7 +65,7 @@ 
      */
     public function joints()
     {
-        return collect($this->getManifest())->flatMap(function ($configuration) {
+        return collect($this->getManifest())->flatMap(function($configuration) {
             return (array) ($configuration['joints'] ?? []);
         })->filter()->all();
     }
@@ -77,7 +77,7 @@ 
      */
     public function modules()
     {
-    	return collect($this->getManifest())->flatMap(function ($configuration) {
+    	return collect($this->getManifest())->flatMap(function($configuration) {
     		return (array) ($configuration['modules'] ?? []);
     	})->filter()->all();
     }
@@ -93,7 +93,7 @@ 
             return $this->manifest;
         }
 
-        if (! file_exists($this->manifestPath)) {
+        if (!file_exists($this->manifestPath)) {
             $this->build();
         }
         
@@ -110,17 +110,17 @@ 
     {
         $packages = [];
 
-        if ($this->files->exists($path = $this->vendorPath.'/composer/installed.json')) {
+        if ($this->files->exists($path = $this->vendorPath . '/composer/installed.json')) {
             $packages = json_decode($this->files->get($path), true);
         }
 
         $ignoreAll = in_array('*', $ignore = $this->packagesToIgnore());
 
-        $this->write(collect($packages)->mapWithKeys(function ($package) {
+        $this->write(collect($packages)->mapWithKeys(function($package) {
             return [$this->format($package['name']) => $package['extra']['epesi'] ?? []];
-        })->each(function ($configuration) use (&$ignore) {
+        })->each(function($configuration) use (&$ignore) {
             $ignore = array_merge($ignore, $configuration['dont-discover'] ?? []);
-        })->reject(function ($configuration, $package) use ($ignore, $ignoreAll) {
+        })->reject(function($configuration, $package) use ($ignore, $ignoreAll) {
             return $ignoreAll || in_array($package, $ignore);
         })->filter()->all());
     }
@@ -133,7 +133,7 @@ 
      */
     protected function format($package)
     {
-        return str_replace($this->vendorPath.'/', '', $package);
+        return str_replace($this->vendorPath . '/', '', $package);
     }
 
     /**
@@ -143,12 +143,12 @@ 
      */
     protected function packagesToIgnore()
     {
-        if (! file_exists($this->basePath.'/composer.json')) {
+        if (!file_exists($this->basePath . '/composer.json')) {
             return [];
         }
 
         return json_decode(file_get_contents(
-            $this->basePath.'/composer.json'
+            $this->basePath . '/composer.json'
         ), true)['extra']['epesi']['dont-discover'] ?? [];
     }
 
@@ -161,12 +161,12 @@ 
      */
     protected function write(array $manifest)
     {
-        if (! is_writable(dirname($this->manifestPath))) {
-            throw new Exception('The '.dirname($this->manifestPath).' directory must be present and writable.');
+        if (!is_writable(dirname($this->manifestPath))) {
+            throw new Exception('The ' . dirname($this->manifestPath) . ' directory must be present and writable.');
         }
 
         $this->files->put(
-            $this->manifestPath, '<?php return '.var_export($manifest, true).';'
+            $this->manifestPath, '<?php return ' . var_export($manifest, true) . ';'
         );
     }
 }

src/UI/Seeds/AdminLayout.php

Indentation +68 added lines, -68 removed lines

@@ -31,36 +31,36 @@ 
  */
 class AdminLayout extends Generic
 {
-    public $menuLeft;    // vertical menu
-    public $menu;        // horizontal menu
-    public $menuRight;   // vertical pull-down
-    public $actionBar;   
-    public $locationBar;
+	public $menuLeft;    // vertical menu
+	public $menu;        // horizontal menu
+	public $menuRight;   // vertical pull-down
+	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;
 
-    public function init()
-    {
-        parent::init();
+	public function init()
+	{
+		parent::init();
 
-        $this->setMenu();
-        $this->setActionBar();
+		$this->setMenu();
+		$this->setActionBar();
         
 //         if (request()->pjax()) return;
         
-        $this->setMenuLeft();        
-        $this->setMenuRight();
+		$this->setMenuLeft();        
+		$this->setMenuRight();
         
-        $this->setVersion();
+		$this->setVersion();
         
 //         $this->js(true, null, 'body')->niceScroll();
 //         $this->js(true, null, new jsExpression('window'))->on('pageshow', new jsFunction(['event'], [
@@ -68,24 +68,24 @@ 
 // 		if (event.originalEvent.persisted) {
 //         	window.location.reload(); 
 //     	}')]));
-    }
+	}
     
-    public function setMenu()
-    {
-        if ($this->menu) return;
+	public function setMenu()
+	{
+		if ($this->menu) return;
 
-        //.ui.sidebar, 
-        $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
+		//.ui.sidebar, 
+		$this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
         
-        $this->app->addStyle('');
+		$this->app->addStyle('');
 
-        // company logo
-        $this->menu->add(['class' => ['epesi-logo']])->add(['Image', url('img/tsm_logo_agile.png')]);
+		// company logo
+		$this->menu->add(['class' => ['epesi-logo']])->add(['Image', url('img/tsm_logo_agile.png')]);
         
-        if ($this->burger) {
-        	/** @scrutinizer ignore-call */
-        	$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
-        }
+		if ($this->burger) {
+			/** @scrutinizer ignore-call */
+			$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
+		}
        	
 		// home icon
 		$this->menu->addItem(['class' => ['icon epesi-home']], url('view/dashboard'))->add(['Icon',	'home']);
@@ -127,50 +127,50 @@ 
 		]), 'RightMenu')->addClass('right menu')->removeClass('item');
 	}
 	
-    public function setMenuLeft()
-    {
-        if ($this->menuLeft) return;
+	public function setMenuLeft()
+	{
+		if ($this->menuLeft) return;
         
-        $this->menuLeft = $this->add(new NavMenu('left vertical labeled sidebar'), 'LeftMenu');
+		$this->menuLeft = $this->add(new NavMenu('left vertical labeled sidebar'), 'LeftMenu');
 
-        if (! $this->burger) return;
+		if (! $this->burger) return;
 
-        if (! session()->get('menu', 1)) {
-        	$this->isMenuLeftVisible = false;
-        }
+		if (! session()->get('menu', 1)) {
+			$this->isMenuLeftVisible = false;
+		}
         
-        $this->burger->add(['Icon',	'content'])->on('click', [
-        		(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
-        		(new jQuery('.epesi-logo'))->toggleClass('expanded'),
-        		(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
-        		$this->burger->add('jsCallback')->set(function($j, $visible) {
-        			session()->put('menu', $visible? 1: 0);
-        			session()->save();
-        		}, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )])
-        ]);
-    }
+		$this->burger->add(['Icon',	'content'])->on('click', [
+				(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
+				(new jQuery('.epesi-logo'))->toggleClass('expanded'),
+				(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
+				$this->burger->add('jsCallback')->set(function($j, $visible) {
+					session()->put('menu', $visible? 1: 0);
+					session()->save();
+				}, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )])
+		]);
+	}
     
-    public function setActionBar()
-    {
-    	if ($this->actionBar) return;
+	public function setActionBar()
+	{
+		if ($this->actionBar) return;
     	
-    	$this->actionBar = $this->add(new ActionBar(), 'ActionBar');
-    }
+		$this->actionBar = $this->add(new ActionBar(), 'ActionBar');
+	}
     
-    public function setVersion()
-    {
-    	$this->template->trySet('version', $this->app->version);
-    }
+	public function setVersion()
+	{
+		$this->template->trySet('version', $this->app->version);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
+	/**
+	 * {@inheritdoc}
+	 */
     
-    public function renderView()
-    {
-    	if ($this->menuLeft && $this->isMenuLeftVisible) {
-               $this->menuLeft->addClass('visible');
-        }
-        parent::renderView();
-    }
+	public function renderView()
+	{
+		if ($this->menuLeft && $this->isMenuLeftVisible) {
+			   $this->menuLeft->addClass('visible');
+		}
+		parent::renderView();
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -31,13 +31,13 @@ 
  */
 class AdminLayout extends Generic
 {
-    public $menuLeft;    // vertical menu
-    public $menu;        // horizontal menu
-    public $menuRight;   // vertical pull-down
+    public $menuLeft; // vertical menu
+    public $menu; // horizontal menu
+    public $menuRight; // vertical pull-down
     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.
@@ -88,10 +88,10 @@ 
         }
        	
 		// home icon
-		$this->menu->addItem(['class' => ['icon epesi-home']], url('view/dashboard'))->add(['Icon',	'home']);
+		$this->menu->addItem(['class' => ['icon epesi-home']], url('view/dashboard'))->add(['Icon', 'home']);
 
 		// location bar
-		$this->locationBar = $this->menu->add(['View',	['ui' => 'epesi-location']]);
+		$this->locationBar = $this->menu->add(['View', ['ui' => 'epesi-location']]);
 	}
 
 	public function setLocation($crumbs)
@@ -133,20 +133,20 @@ 
         
         $this->menuLeft = $this->add(new NavMenu('left vertical labeled sidebar'), 'LeftMenu');
 
-        if (! $this->burger) return;
+        if (!$this->burger) return;
 
-        if (! session()->get('menu', 1)) {
+        if (!session()->get('menu', 1)) {
         	$this->isMenuLeftVisible = false;
         }
         
-        $this->burger->add(['Icon',	'content'])->on('click', [
+        $this->burger->add(['Icon', 'content'])->on('click', [
         		(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
         		(new jQuery('.epesi-logo'))->toggleClass('expanded'),
         		(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
         		$this->burger->add('jsCallback')->set(function($j, $visible) {
-        			session()->put('menu', $visible? 1: 0);
+        			session()->put('menu', $visible ? 1 : 0);
         			session()->save();
-        		}, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )])
+        		}, [new \atk4\ui\jsExpression('$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0')])
         ]);
     }
     

Braces +15 added lines, -5 removed lines

@@ -72,7 +72,9 @@ 
     
     public function setMenu()
     {
-        if ($this->menu) return;
+        if ($this->menu) {
+        	return;
+        }
 
         //.ui.sidebar, 
         $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
@@ -120,7 +122,9 @@ 
 	
 	public function setMenuRight()
 	{
-		if ($this->menuRight) return;
+		if ($this->menuRight) {
+			return;
+		}
 
 		$this->menuRight = $this->menu->add(new RightMenu([
 				'ui' => false
@@ -129,11 +133,15 @@ 
 	
     public function setMenuLeft()
     {
-        if ($this->menuLeft) return;
+        if ($this->menuLeft) {
+        	return;
+        }
         
         $this->menuLeft = $this->add(new NavMenu('left vertical labeled sidebar'), 'LeftMenu');
 
-        if (! $this->burger) return;
+        if (! $this->burger) {
+        	return;
+        }
 
         if (! session()->get('menu', 1)) {
         	$this->isMenuLeftVisible = false;
@@ -152,7 +160,9 @@ 
     
     public function setActionBar()
     {
-    	if ($this->actionBar) return;
+    	if ($this->actionBar) {
+    		return;
+    	}
     	
     	$this->actionBar = $this->add(new ActionBar(), 'ActionBar');
     }

src/UI/Seeds/NavMenu.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 		$this->addHeader($this->app->title);
 		
 		$items = collect();
-		foreach(NavMenuJoint::collect() as $joint) {
+		foreach (NavMenuJoint::collect() as $joint) {
 			$items = $items->merge($joint->items());
 		}
 
@@ -36,13 +36,13 @@ 
 	
 	public static function addItems($menu, Collection $items)
 	{
-		$items->sort(function ($entry1, $entry2) {
+		$items->sort(function($entry1, $entry2) {
 			$weight1 = $entry1['weight']?? 10;
 			$weight2 = $entry2['weight']?? 10;
 			
 			return $weight1 <=> $weight2;
 		})->map(function($item, $caption) use ($menu) {
-			if (! ($item['access']?? true)) return;
+			if (!($item['access']?? true)) return;
 			
 			if (!isset($item['link']) && !is_array($item)) {
 				$item = [

Braces +7 added lines, -9 removed lines

@@ -42,7 +42,9 @@ 
 			
 			return $weight1 <=> $weight2;
 		})->map(function($item, $caption) use ($menu) {
-			if (! ($item['access']?? true)) return;
+			if (! ($item['access']?? true)) {
+				return;
+			}
 			
 			if (!isset($item['link']) && !is_array($item)) {
 				$item = [
@@ -60,8 +62,7 @@ 
 				$submenu = $menu->addMenu($item['caption']);
 				
 				self::addItems($submenu, collect($subitems));
-			}
-			elseif ($subitems = $item['group']?? []) {
+			} elseif ($subitems = $item['group']?? []) {
 				$subgroup = $menu->addGroup($item['caption']);
 				
 				if (($item['toggle']?? false) && !$menu->in_dropdown) {
@@ -70,8 +71,7 @@ 
 				}
 				
 				self::addItems($subgroup, collect($subitems));
-			}
-			elseif ($subitems = $item['accordion']?? []) {
+			} elseif ($subitems = $item['accordion']?? []) {
 				$accordion = $menu->add(['Accordion']);
 				
 				$section = $accordion->addSection($item['caption']);
@@ -94,12 +94,10 @@ 
 					}
 				}
 // 				self::addItems($accordion, collect($subitems));
-			}
-			else {
+			} else {
 				if (is_a($menu, Accordion::class)) {
 					$menu->add(['View', 'Test']);
-				}
-				else {
+				} else {
 					$menu->addItem($item['caption'], $item['link']?? '');
 				}
 				

src/Database/Models/Module.php

Spacing +6 added lines, -6 removed lines

@@ -15,13 +15,13 @@ 
 	private static $cache;
 	
 	private static function cache() {
-		if(isset(self::$cache) || ! Schema::hasTable('modules')) return;
+		if (isset(self::$cache) || !Schema::hasTable('modules')) return;
 		
-		self::$cache = Schema::hasTable('modules')? self::pluck('class', 'alias'): collect();
+		self::$cache = Schema::hasTable('modules') ? self::pluck('class', 'alias') : collect();
 	}
 	
 	public static function isInstalled($classOrAlias) {
-		return self::getClass($classOrAlias)? 1: 0;
+		return self::getClass($classOrAlias) ? 1 : 0;
 	}
 	
 	public static function getClass($classOrAlias) {
@@ -35,7 +35,7 @@ 
 	public static function getInstalled() {
 		self::cache();
 		
-		return self::$cache?: collect();
+		return self::$cache ?: collect();
 	}
 	
 	/**
@@ -48,9 +48,9 @@ 
 	{
 		$ret = [];
 		foreach (self::getInstalled() as $module) {
-			if (! $list = $module::$method()) continue;
+			if (!$list = $module::$method()) continue;
 			
-			$ret = array_merge($ret, is_array($list)? $list: [$list]);
+			$ret = array_merge($ret, is_array($list) ? $list : [$list]);
 		}
 		
 		return $ret;

Braces +9 added lines, -3 removed lines

@@ -15,7 +15,9 @@ 
 	private static $cache;
 	
 	private static function cache() {
-		if(isset(self::$cache) || ! Schema::hasTable('modules')) return;
+		if(isset(self::$cache) || ! Schema::hasTable('modules')) {
+			return;
+		}
 		
 		self::$cache = Schema::hasTable('modules')? self::pluck('class', 'alias'): collect();
 	}
@@ -27,7 +29,9 @@ 
 	public static function getClass($classOrAlias) {
 		self::cache();
 		
-		if (self::$cache->contains($classOrAlias)) return $classOrAlias;
+		if (self::$cache->contains($classOrAlias)) {
+			return $classOrAlias;
+		}
 		
 		return self::$cache[$classOrAlias]?? null;
 	}
@@ -48,7 +52,9 @@ 
 	{
 		$ret = [];
 		foreach (self::getInstalled() as $module) {
-			if (! $list = $module::$method()) continue;
+			if (! $list = $module::$method()) {
+				continue;
+			}
 			
 			$ret = array_merge($ret, is_array($list)? $list: [$list]);
 		}