x-systems / epesi-base

src/Layout/Seeds/RightMenu.php

Spacing +6 added lines, -6 removed lines

@@ -38,12 +38,12 @@ 
 				'title' => __('Launchpad'),
 		]);
 		
-		foreach(UserMenuJoint::collect() as $joint) {
-			foreach ($joint->tools()?: [] as $tool) {
+		foreach (UserMenuJoint::collect() as $joint) {
+			foreach ($joint->tools() ?: [] as $tool) {
 				$this->addTool($tool);
 			}
 
-			foreach ($joint->entries()?: [] as $entry) {
+			foreach ($joint->entries() ?: [] as $entry) {
 				$this->addEntry($entry);
 			}			
 		}
@@ -61,7 +61,7 @@ 
 				'item' => ['Logout', 'icon' => 'sign out', 'attr' => ['onclick' => "event.preventDefault();$('#logout-form').submit();"]],
 				'action' => url('logout'), 
 				'group' => '10000:user',
-				'callback' => function ($item){
+				'callback' => function($item) {
 					$logoutForm = $item->add(['View', 'attr' => ['method' => 'POST', 'action' => URL::to('logout')]])->setElement('form')->addStyle(['display' => 'none']);
 					$logoutForm->id = 'logout-form';
 					$logoutForm->add(['View', 'attr' => ['type' => 'hidden', 'name' => '_token', 'value' => csrf_token()]])->setElement('input');
@@ -73,7 +73,7 @@ 
 	{
 		$entry = collect(array_merge(['item' => $entry, 'group' => '00500:general', 'weight' => 10], $entry));
 		
-		if (! $entry->get('item')) return;
+		if (!$entry->get('item')) return;
 		
 		$this->entries->add($entry);
 	}
@@ -101,7 +101,7 @@ 
 				
 				$item = $this->userMenu->addItem($entry['item'], $entry->get('action'));
 				
-				if (! $callback = $entry->get('callback')) continue;
+				if (!$callback = $entry->get('callback')) continue;
 					
 				$callback($item);
 			}

Braces +9 added lines, -3 removed lines

@@ -73,7 +73,9 @@ 
 	{
 		$entry = collect(array_merge(['item' => $entry, 'group' => '00500:general', 'weight' => 10], $entry));
 		
-		if (! $entry->get('item')) return;
+		if (! $entry->get('item')) {
+			return;
+		}
 		
 		$this->entries->add($entry);
 	}
@@ -94,14 +96,18 @@ 
 	{
 		$empty = true;
 		foreach ($this->entries->groupBy('group')->sortKeys() as $group) {
-			if (!$empty) $this->userMenu->addDivider();
+			if (!$empty) {
+				$this->userMenu->addDivider();
+			}
 		
 			foreach ($group->sortBy('weight') as $entry) {
 				$empty = false;
 				
 				$item = $this->userMenu->addItem($entry['item'], $entry->get('action'));
 				
-				if (! $callback = $entry->get('callback')) continue;
+				if (! $callback = $entry->get('callback')) {
+					continue;
+				}
 					
 				$callback($item);
 			}

src/Layout/Seeds/ActionBar.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
 	
 	protected function prepareButtons()
 	{
-		foreach (self::$buttons->sortByDesc(function ($button) {
+		foreach (self::$buttons->sortByDesc(function($button) {
 			return $button->weight;
 		}) as $button) {
 			$this->add($button);
@@ -83,7 +83,7 @@ 
 	
 	public static function addButtons($buttons)
 	{
-		foreach (is_array($buttons)? $buttons: [$buttons] as $button) {
+		foreach (is_array($buttons) ? $buttons : [$buttons] as $button) {
 			self::addButton($button);
 		}
 	}

src/Layout/Seeds/LaunchPad.php

Indentation +25 added lines, -25 removed lines

@@ -14,7 +14,7 @@ 
 	
 	public function __construct($parent)
 	{
-    	$this->parent = $parent;
+		$this->parent = $parent;
     	
 		parent::__construct('$(this).atkCreateModal([arg])', [
 				'arg' => [
@@ -26,29 +26,29 @@ 
 	}
     
 	protected function getURL()
-    {
-    	return $this->parent->add('VirtualPage')->set(Closure::fromCallable([$this, 'getContents']))->getJSURL('cut');
-    }
+	{
+		return $this->parent->add('VirtualPage')->set(Closure::fromCallable([$this, 'getContents']))->getJSURL('cut');
+	}
     
-    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 3',
-    					'icon' => 'bus'
-    			])
-    	]);
-    }
+	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 3',
+						'icon' => 'bus'
+				])
+		]);
+	}
 }

src/Layout/Seeds/NavMenu.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 		$this->addHeader($this->app->title);
 		
 		$items = collect();
-		foreach(NavMenuJoint::collect() as $joint) {
+		foreach (NavMenuJoint::collect() as $joint) {
 			$items = $items->merge($joint->items());
 		}
 
@@ -34,13 +34,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

@@ -40,7 +40,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 = [
@@ -58,8 +60,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) {
@@ -68,8 +69,7 @@ 
 				}
 				
 				self::addItems($subgroup, collect($subitems));
-			}
-			elseif ($subitems = $item['accordion']?? []) {
+			} elseif ($subitems = $item['accordion']?? []) {
 				$accordion = $menu->add(['Accordion']);
 				
 				$section = $accordion->addSection($item['caption']);
@@ -92,12 +92,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/Layout/LayoutView.php

Indentation +68 added lines, -68 removed lines

@@ -30,36 +30,36 @@ 
  */
 class LayoutView extends ModuleView
 {
-    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'], [
@@ -67,24 +67,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']);
@@ -126,50 +126,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 Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu');
+		$this->menuLeft = $this->add(new Seeds\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 Seeds\ActionBar(), 'ActionBar');
-    }
+		$this->actionBar = $this->add(new Seeds\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

@@ -30,13 +30,13 @@ 
  */
 class LayoutView extends ModuleView
 {
-    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.
@@ -87,10 +87,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)
@@ -132,20 +132,20 @@ 
         
         $this->menuLeft = $this->add(new Seeds\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

@@ -71,7 +71,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');
@@ -119,7 +121,9 @@ 
 	
 	public function setMenuRight()
 	{
-		if ($this->menuRight) return;
+		if ($this->menuRight) {
+			return;
+		}
 
 		$this->menuRight = $this->menu->add(new Seeds\RightMenu([
 				'ui' => false
@@ -128,11 +132,15 @@ 
 	
     public function setMenuLeft()
     {
-        if ($this->menuLeft) return;
+        if ($this->menuLeft) {
+        	return;
+        }
         
         $this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu');
 
-        if (! $this->burger) return;
+        if (! $this->burger) {
+        	return;
+        }
 
         if (! session()->get('menu', 1)) {
         	$this->isMenuLeftVisible = false;
@@ -151,7 +159,9 @@ 
     
     public function setActionBar()
     {
-    	if ($this->actionBar) return;
+    	if ($this->actionBar) {
+    		return;
+    	}
     	
     	$this->actionBar = $this->add(new Seeds\ActionBar(), 'ActionBar');
     }

src/Layout/Form.php

Spacing +13 added lines, -13 removed lines

@@ -17,7 +17,7 @@ 
 	protected $validationRules = [];
 	
 	public function addElements($elements, $parent = null) {
-		$parent = $parent?: $this;
+		$parent = $parent ?: $this;
 		
 		foreach ($elements as $name => $desc) {
 			$name = $desc['name']?? $name;
@@ -26,9 +26,9 @@ 
 			
 			switch ($desc['type']?? 'field') {
 				case 'field':
-					$desc = is_string($desc)? [
+					$desc = is_string($desc) ? [
 					'decorator' => [$desc]
-					]: $desc;
+					] : $desc;
 					
 					$field = $parent->addField($name, $desc['decorator']?? [], $desc['options']?? []);
 					
@@ -77,7 +77,7 @@ 
 	}
 	
 	public function addFieldsDisplayRules($fieldsDisplayRules) {
-		$this->setFieldsDisplayRules(array_merge($this->fieldsDisplayRules?: [], $fieldsDisplayRules));
+		$this->setFieldsDisplayRules(array_merge($this->fieldsDisplayRules ?: [], $fieldsDisplayRules));
 	}
 	
 	public function addGroupDisplayRules($groupDisplayRules) {
@@ -89,7 +89,7 @@ 
 	}
 	
 	public function addFieldRules($field, $rules = []) {
-		if (! $rules) return;
+		if (!$rules) return;
 		
 		$this->fieldRules[$field] = $rules['rules']?? [
 				'identifier' => $field,
@@ -101,8 +101,8 @@ 
 	
 	public function setValues($values)
 	{
-		foreach ($values?: [] as $name => $value) {
-			if (! $field = $this->fields[$name]?? null) continue;
+		foreach ($values ?: [] as $name => $value) {
+			if (!$field = $this->fields[$name]?? null) continue;
 			
 			$field->set($value);
 		}
@@ -125,17 +125,17 @@ 
 				'fields' => $this->fieldRules
 		]);
 		
-		$this->onSubmit(function ($form) use ($callback) {
+		$this->onSubmit(function($form) use ($callback) {
 			$errors = [];
-			foreach ($this->validationRules?: [] as $ruleCallback) {
-				if (! is_callable($ruleCallback)) continue;
+			foreach ($this->validationRules ?: [] as $ruleCallback) {
+				if (!is_callable($ruleCallback)) continue;
 				
 				$ruleErrors = $ruleCallback($form);
 				
-				$errors = array_merge($errors, $ruleErrors?: []);
+				$errors = array_merge($errors, $ruleErrors ?: []);
 			}
 			
-			return $errors?: $callback($this);
+			return $errors ?: $callback($this);
 		});
 			
 			return $this;
@@ -148,7 +148,7 @@ 
 	
 	public function confirmLeave($confirm = true)
 	{
-		$this->canLeave = ! $confirm;
+		$this->canLeave = !$confirm;
 		
 		return $this;
 	}

Braces +9 added lines, -3 removed lines

@@ -89,7 +89,9 @@ 
 	}
 	
 	public function addFieldRules($field, $rules = []) {
-		if (! $rules) return;
+		if (! $rules) {
+			return;
+		}
 		
 		$this->fieldRules[$field] = $rules['rules']?? [
 				'identifier' => $field,
@@ -102,7 +104,9 @@ 
 	public function setValues($values)
 	{
 		foreach ($values?: [] as $name => $value) {
-			if (! $field = $this->fields[$name]?? null) continue;
+			if (! $field = $this->fields[$name]?? null) {
+				continue;
+			}
 			
 			$field->set($value);
 		}
@@ -128,7 +132,9 @@ 
 		$this->onSubmit(function ($form) use ($callback) {
 			$errors = [];
 			foreach ($this->validationRules?: [] as $ruleCallback) {
-				if (! is_callable($ruleCallback)) continue;
+				if (! is_callable($ruleCallback)) {
+					continue;
+				}
 				
 				$ruleErrors = $ruleCallback($form);