x-systems / epesi-core

src/Layout/View/ActionBar.php

Indentation +7 added lines, -7 removed lines

@@ -7,7 +7,7 @@ 
 
 class ActionBar extends Menu
 {
-    public $ui = 'actionbar menu';
+	public $ui = 'actionbar menu';
     
 	protected static $buttons = [];
 	
@@ -46,12 +46,12 @@ 
 	}
 	
 	public function renderView()
-    {
-        $this->elements = collect($this->elements)->sortByDesc(function ($element) {
-            return $element->weight ?? 10;
-        })->toArray();
+	{
+		$this->elements = collect($this->elements)->sortByDesc(function ($element) {
+			return $element->weight ?? 10;
+		})->toArray();
 
-        return parent::renderView();
+		return parent::renderView();
 	}
 	
 	/**
@@ -81,7 +81,7 @@ 
 	
 	public static function addMenuButton($menu)
 	{
-	    return self::instance()->addMenu($menu);
+		return self::instance()->addMenu($menu);
 	}
 
 	public static function clear()

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
 	
 	public function renderView()
     {
-        $this->elements = collect($this->elements)->sortByDesc(function ($element) {
+        $this->elements = collect($this->elements)->sortByDesc(function($element) {
             return $element->weight ?? 10;
         })->toArray();
 
@@ -63,9 +63,9 @@ 
 	 */
 	public static function addItemButton($button, $defaults = [])
 	{
-		$button = is_string($button)? self::getPredefined($button): $button;
+		$button = is_string($button) ? self::getPredefined($button) : $button;
 		
-		$button = is_array($button)? new ActionBarItem($button): $button;
+		$button = is_array($button) ? new ActionBarItem($button) : $button;
 		
 		$actionBar = self::instance();
 		

src/Layout/View/NavMenu.php

Indentation +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 
 class NavMenu extends BaseMenu
 {
-    public $ui = 'inverted nav menu';
+	public $ui = 'inverted nav menu';
     
 	public function init()
 	{		
@@ -58,12 +58,12 @@ 
 				self::addItems($submenu, collect($subitems));
 			}
 			elseif ($subitems = $entry['group'] ?? []) {
-			    $subgroup = $menu->addGroup($entry['item']);
+				$subgroup = $menu->addGroup($entry['item']);
 
 				self::addItems($subgroup, collect($subitems));
 			}
 			else {
-			    $menu->addItem($entry['item'], $entry['action'] ?? '');
+				$menu->addItem($entry['item'], $entry['action'] ?? '');
 			}
 		});
 	}

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($entry, $caption) use ($menu) {
-			if (! ($entry['access'] ?? true)) return;
+			if (!($entry['access'] ?? true)) return;
 			
 			if (!is_array($entry)) {
 				$entry = ['action' => $entry];

Braces +5 added lines, -5 removed lines

@@ -41,7 +41,9 @@ 
 			
 			return $weight1 <=> $weight2;
 		})->map(function($entry, $caption) use ($menu) {
-			if (! ($entry['access'] ?? true)) return;
+			if (! ($entry['access'] ?? true)) {
+				return;
+			}
 
 			if (!is_array($entry)) {
 				$entry = ['action' => $entry];
@@ -60,13 +62,11 @@ 
 // 				$submenu->js = ['transition' => 'swing left', 'on' => 'click'];
 
 				self::addItems($submenu, collect($subitems));
-			}
-			elseif ($subitems = $entry['group'] ?? []) {
+			} elseif ($subitems = $entry['group'] ?? []) {
 			    $subgroup = $menu->addGroup($entry['item']);
 
 				self::addItems($subgroup, collect($subitems));
-			}
-			else {
+			} else {
 			    $menu->addItem($entry['item'], $entry['action'] ?? '');
 			}
 		});

src/Layout/View/RightMenu.php

Spacing +7 added lines, -7 removed lines

@@ -39,12 +39,12 @@ 
 				'icon' => 'th'
 		], new LaunchPad($this));
 		
-		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);
 			}			
 		}
@@ -62,7 +62,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('logout')]])->setElement('form')->addStyle(['display' => 'none']);
 					$logoutForm->id = 'logout-form';
 					$logoutForm->add(['View', 'attr' => ['type' => 'hidden', 'name' => '_token', 'value' => csrf_token()]])->setElement('input');
@@ -79,14 +79,14 @@ 
 	
 	public function getUserMenuLabel()
 	{
-		return $this->userMenuLabel?: Auth::user()->name;
+		return $this->userMenuLabel ?: Auth::user()->name;
 	}
 	
 	public function addEntry($entry)
 	{
 		$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);
 	}
@@ -114,7 +114,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/View/ActionBarItem.php

Indentation +26 added lines, -26 removed lines

@@ -7,40 +7,40 @@
 
 class ActionBarItem extends Item
 {
-    public $weight = 10;
+	public $weight = 10;
     
-    public $callback;
+	public $callback;
     
-    public $hint;
+	public $hint;
     
-    public function renderView()
-    {
-        $this->addCallback();
+	public function renderView()
+	{
+		$this->addCallback();
         
-        if ($this->hint) {
-            $this->attr['title'] = $this->hint;
-        }
+		if ($this->hint) {
+			$this->attr['title'] = $this->hint;
+		}
         
-        parent::renderView();
-    }
+		parent::renderView();
+	}
     
-    public function callback($callable)
-    {
-        $this->callback = $callable;
+	public function callback($callable)
+	{
+		$this->callback = $callable;
         
-        return $this;
-    }
+		return $this;
+	}
     
-    public function addCallback()
-    {
-        if (is_callable($callable = $this->callback)) {
-            $callable = $this->add('jsCallback')->set($callable);
-        }
+	public function addCallback()
+	{
+		if (is_callable($callable = $this->callback)) {
+			$callable = $this->add('jsCallback')->set($callable);
+		}
         
-        if ($callable instanceof jsCallback) {
-            $this->on('click', $callable);
-        }
+		if ($callable instanceof jsCallback) {
+			$this->on('click', $callable);
+		}
         
-        return $this;
-    }
+		return $this;
+	}
 }

src/System/View/Form.php

Spacing +11 added lines, -11 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,
@@ -109,17 +109,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;
@@ -132,7 +132,7 @@ 
 	
 	public function confirmLeave($confirm = true)
 	{
-		$this->canLeave = ! $confirm;
+		$this->canLeave = !$confirm;
 		
 		return $this;
 	}

Braces +6 added lines, -2 removed lines

@@ -89,7 +89,9 @@ 
 	}
 	
 	public function addFieldRules($field, $rules = []) {
-		if (! $rules) return;
+		if (! $rules) {
+			return;
+		}
 		
 		$this->fieldRules[$field] = $rules['rules']?? [
 				'identifier' => $field,
@@ -112,7 +114,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);
 				

src/System/View/ActionButton.php

Indentation +51 added lines, -51 removed lines

@@ -8,79 +8,79 @@
 
 class ActionButton extends View
 {
-    public $defaultTemplate = 'action_button.html';
+	public $defaultTemplate = 'action_button.html';
 
-    public $ui = 'basic inverted action button';
+	public $ui = 'basic inverted action button';
 
-    /**
-     * Icon that will appear on the button (top).
-     *
-     * @var string|array|Icon
-     */
-    public $icon;
+	/**
+	 * Icon that will appear on the button (top).
+	 *
+	 * @var string|array|Icon
+	 */
+	public $icon;
     
-    public $label;
+	public $label;
 
-    public $element = 'a';
+	public $element = 'a';
     
-    public $weight = 10;
+	public $weight = 10;
     
-    public $callback;
+	public $callback;
 
-    public function renderView()
-    {
-        $this->addIcon();
+	public function renderView()
+	{
+		$this->addIcon();
         
-        $this->addLabel();
+		$this->addLabel();
         
-        $this->addCallback();
+		$this->addCallback();
 
-        parent::renderView();
-    }
+		parent::renderView();
+	}
     
-    protected function addIcon()
-    {
-    	if (! $icon = $this->getIcon()) return;
+	protected function addIcon()
+	{
+		if (! $icon = $this->getIcon()) return;
     	
-    	$this->add($icon, 'Icon')->id = null;
+		$this->add($icon, 'Icon')->id = null;
     	
-    	$this->addClass('icon');
+		$this->addClass('icon');
     	
-    	return $this;
-    }
+		return $this;
+	}
     
-    protected function addLabel()
-    {
-    	$this->content = $this->label?: $this->content;
+	protected function addLabel()
+	{
+		$this->content = $this->label?: $this->content;
     	
-    	return $this;
-    }
+		return $this;
+	}
 
-    public function getIcon()
-    {
-    	return is_object($this->icon)? $this->icon: new Icon($this->icon);
-    }
+	public function getIcon()
+	{
+		return is_object($this->icon)? $this->icon: new Icon($this->icon);
+	}
     
-    public function callback($callable)
-    {
-    	$this->callback = $callable;
+	public function callback($callable)
+	{
+		$this->callback = $callable;
     	
-    	return $this;
-    }
+		return $this;
+	}
     
-    public function addCallback()
-    {
-    	if (!$callable = $this->callback) return;
+	public function addCallback()
+	{
+		if (!$callable = $this->callback) return;
     	
-    	if (is_callable($callable)) {
-    		$callable = $this->add('jsCallback')->set($callable);
-    	}
+		if (is_callable($callable)) {
+			$callable = $this->add('jsCallback')->set($callable);
+		}
     	
-    	if ($callable instanceof jsCallback) {
-    		$this->on('click', $callable);
-    	}
+		if ($callable instanceof jsCallback) {
+			$this->on('click', $callable);
+		}
     	
-    	return $this;
-    }
+		return $this;
+	}
 
 }

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
     
     protected function addIcon()
     {
-    	if (! $icon = $this->getIcon()) return;
+    	if (!$icon = $this->getIcon()) return;
     	
     	$this->add($icon, 'Icon')->id = null;
     	
@@ -51,14 +51,14 @@ 
     
     protected function addLabel()
     {
-    	$this->content = $this->label?: $this->content;
+    	$this->content = $this->label ?: $this->content;
     	
     	return $this;
     }
 
     public function getIcon()
     {
-    	return is_object($this->icon)? $this->icon: new Icon($this->icon);
+    	return is_object($this->icon) ? $this->icon : new Icon($this->icon);
     }
     
     public function callback($callable)

Braces +6 added lines, -2 removed lines

@@ -40,7 +40,9 @@ 
     
     protected function addIcon()
     {
-    	if (! $icon = $this->getIcon()) return;
+    	if (! $icon = $this->getIcon()) {
+    		return;
+    	}
     	
     	$this->add($icon, 'Icon')->id = null;
     	
@@ -70,7 +72,9 @@ 
     
     public function addCallback()
     {
-    	if (!$callable = $this->callback) return;
+    	if (!$callable = $this->callback) {
+    		return;
+    	}
     	
     	if (is_callable($callable)) {
     		$callable = $this->add('jsCallback')->set($callable);

src/System/View/LaunchButton.php

Indentation +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 {
 	public $defaultTemplate = 'launch_button.html';
 	
-    public $ui = 'basic launch pjax button';
+	public $ui = 'basic launch pjax button';
     
-    public $container = 'View';
+	public $container = 'View';
   
 }

src/Layout/LayoutView.php

Indentation +80 added lines, -80 removed lines

@@ -30,51 +30,51 @@ 
  */
 class LayoutView extends ModuleView
 {
-    /**
-     * @var View\NavMenu
-     */
-    public $menuLeft;    // vertical menu
+	/**
+	 * @var View\NavMenu
+	 */
+	public $menuLeft;    // vertical menu
        
-    /**
-     * @var \atk4\ui\Menu
-     */
-    public $menu;        // horizontal menu
+	/**
+	 * @var \atk4\ui\Menu
+	 */
+	public $menu;        // 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;
 
-    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();
         
@@ -83,25 +83,25 @@ 
 // 		if (event.originalEvent.persisted) {
 //         	window.location.reload(); 
 //     	}')]));
-    }
+	}
     
-    public function setMenu()
-    {
-        if ($this->menu) return;
+	public function setMenu()
+	{
+		if ($this->menu) return;
  
-        $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
+		$this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
 
-        // company logo
-        // see \Epesi\Core\Controller::logo
-        $this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']);
+		// company logo
+		// see \Epesi\Core\Controller::logo
+		$this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']);
         
-        if ($this->burger) {
-        	$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
-        }
+		if ($this->burger) {
+			$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
+		}
        	
 		// home icon redirects to /home path 
 		// see \Epesi\Core\Controller::home
-        $this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']);
+		$this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']);
 
 		// location bar
 		$this->locationBar = $this->menu->add(['View',	['ui' => 'epesi-location']]);
@@ -144,52 +144,52 @@ 
 		]), 'RightMenu')->addClass('right menu')->removeClass('item');
 	}
 	
-    public function setMenuLeft()
-    {
-        if ($this->menuLeft) return;
+	public function setMenuLeft()
+	{
+		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) 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 = View\ActionBar::addTo($this, [], ['ActionBar']);
+		$this->actionBar = View\ActionBar::addTo($this, [], ['ActionBar']);
     	
-    	return $this;
-    }
+		return $this;
+	}
     
-    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 +10 added lines, -10 removed lines

@@ -33,17 +33,17 @@ 
     /**
      * @var View\NavMenu
      */
-    public $menuLeft;    // vertical menu
+    public $menuLeft; // vertical menu
        
     /**
      * @var \atk4\ui\Menu
      */
-    public $menu;        // horizontal menu
+    public $menu; // horizontal menu
     
     /**
      * @var \atk4\ui\Menu
      */
-    public $menuRight;   // vertical pull-down
+    public $menuRight; // vertical pull-down
        
     /**
      * @var View\ActionBar
@@ -51,7 +51,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.
@@ -104,7 +104,7 @@ 
         $this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->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)
@@ -150,20 +150,20 @@ 
         
         $this->menuLeft = View\NavMenu::addTo($this, '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

@@ -87,7 +87,9 @@ 
     
     public function setMenu()
     {
-        if ($this->menu) return;
+        if ($this->menu) {
+        	return;
+        }
  
         $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
 
@@ -137,7 +139,9 @@ 
 	
 	public function setMenuRight()
 	{
-		if ($this->menuRight) return;
+		if ($this->menuRight) {
+			return;
+		}
 
 		$this->menuRight = $this->menu->add(new View\RightMenu([
 				'ui' => false
@@ -146,11 +150,15 @@ 
 	
     public function setMenuLeft()
     {
-        if ($this->menuLeft) return;
+        if ($this->menuLeft) {
+        	return;
+        }
         
         $this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
 
-        if (! $this->burger) return;
+        if (! $this->burger) {
+        	return;
+        }
 
         if (! session()->get('menu', 1)) {
         	$this->isMenuLeftVisible = false;
@@ -169,7 +177,9 @@ 
     
     public function setActionBar()
     {
-    	if ($this->actionBar) return;
+    	if ($this->actionBar) {
+    		return;
+    	}
 
     	$this->actionBar = View\ActionBar::addTo($this, [], ['ActionBar']);
     	

src/Data/Persistence/SQL.php

Indentation +16 added lines, -16 removed lines

@@ -7,22 +7,22 @@
 
 class SQL extends \atk4\data\Persistence\SQL
 {
-    /**
-     * Take a laravel connection and pass it to ATK Data
-     *
-     * @param \Illuminate\Database\DatabaseManager $db The Laravel database manager
-     *
-     * @return \atk4\data\Persistence_SQL
-     * @throws \atk4\data\Exception
-     * @throws \atk4\dsql\Exception
-     */
-    public function __construct(DatabaseManager $database)
-    {
-    	$pdo = $database->connection()->getPdo();
+	/**
+	 * Take a laravel connection and pass it to ATK Data
+	 *
+	 * @param \Illuminate\Database\DatabaseManager $db The Laravel database manager
+	 *
+	 * @return \atk4\data\Persistence_SQL
+	 * @throws \atk4\data\Exception
+	 * @throws \atk4\dsql\Exception
+	 */
+	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));
+	}
 }