x-systems / epesi-core

src/HomePage/HomePageSettings.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
 		$grid = $this->add([
 				'CRUD',
-		          'menu' => ActionBar::instance(),
+				  'menu' => ActionBar::instance(),
 // 		        'model' => HomePage::create(),
 				'displayFields' => ['path', 'role'],
 				'editFields' => ['path', 'role'],

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 
 // 		$plugin->extendList('path');
 
-		$grid->addDragHandler()->onReorder(function ($order) {
+		$grid->addDragHandler()->onReorder(function($order) {
 			foreach (HomePage::create() as $homepage) {
 				$homepage->save(['priority' => array_search($homepage['id'], $order)]);
 			}

src/HomePage/Models/HomePage.php

Spacing +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
 		$this->setOrder('priority');
 
 		$this->onHook(\atk4\data\Model::HOOK_BEFORE_INSERT, function($model, & $data) {
-			$data['priority'] = $data['priority']?: $this->action('fx', ['max', 'priority'])->getOne() + 1;
+			$data['priority'] = $data['priority'] ?: $this->action('fx', ['max', 'priority'])->getOne() + 1;
 		});
 	}
 	
@@ -78,7 +78,7 @@ 
 	{
 		static $cache;
 		
-		if (! isset($cache)) {
+		if (!isset($cache)) {
 			$cache = [];
 			foreach (HomePageJoint::collect() as $joint) {
 				$cache[$joint->link()] = $joint->caption();
@@ -95,7 +95,7 @@ 
 	 */
 	public static function ofUser()
 	{
-		if (! $user = Auth::user()) return;
+		if (!$user = Auth::user()) return;
 		
 		return self::create()->addCondition('role', $user->roles()->pluck('name')->toArray())->loadAny();
 	}

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/NavMenu.php

Indentation +4 added lines, -4 removed lines

@@ -9,11 +9,11 @@ 
 
 class NavMenu extends BaseMenu
 {
-    public $ui = 'inverted nav menu';
+	public $ui = 'inverted nav menu';
     
 //     public $defaultTemplate = 'layout/maestro-sidenav.html';
     
-    protected function init(): void
+	protected function init(): void
 	{		
 		parent::init();
 		
@@ -64,12 +64,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 +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
 		$this->addHeader($this->getApp()->title);
 		
 		$items = collect();
-		foreach(NavMenuJoint::collect() as $joint) {
+		foreach (NavMenuJoint::collect() as $joint) {
 			$items = $items->merge($joint->items());
 		}
 
@@ -37,13 +37,13 @@ 
 
 	public static function addItems($menu, Collection $items)
 	{
-		$items->sort(function ($entry1, $entry2) {
-			$weight1 = $entry1['weight']?? 10;
-			$weight2 = $entry2['weight']?? 10;
+		$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];

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 = \atk4\ui\View::addTo($item, ['attr' => ['method' => 'POST', 'action' => url('logout')]])->setElement('form')->addStyle(['display' => 'none']);
 					$logoutForm->id = 'logout-form';
 					\atk4\ui\View::addTo($logoutForm, ['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);
 			}

src/Layout/View/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 \atk4\ui\VirtualPage::addTo($this->parent)->set(Closure::fromCallable([$this, 'getContents']))->getJSURL('cut');
-    }
+	{
+		return \atk4\ui\VirtualPage::addTo($this->parent)->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/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(): void
-    {
-        $this->addCallback();
+	public function renderView(): void
+	{
+		$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 = JsCallback::addTo($this)->set($callable);
-        }
+	public function addCallback()
+	{
+		if (is_callable($callable = $this->callback)) {
+			$callable = JsCallback::addTo($this)->set($callable);
+		}
         
-        if ($callable instanceof JsCallback) {
-            $this->on('click', $callable);
-        }
+		if ($callable instanceof JsCallback) {
+			$this->on('click', $callable);
+		}
         
-        return $this;
-    }
+		return $this;
+	}
 }

src/Layout/View/ActionBar.php

Indentation +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 
 class ActionBar extends Menu
 {
-    public $ui = 'actionbar menu';
+	public $ui = 'actionbar menu';
     
 	protected static $buttons = [];
 	
@@ -47,12 +47,12 @@ 
 	}
 	
 	public function renderView(): void
-    {
-        $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();
 
-        parent::renderView();
+		parent::renderView();
 	}
 	
 	/**
@@ -82,7 +82,7 @@ 
 	
 	public static function addMenuButton($menu)
 	{
-	    return self::instance()->addMenu($menu);
+		return self::instance()->addMenu($menu);
 	}
 
 	public static function clear()

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
 						'icon' => 'arrow left',
 						'weight' => 10000,
 						'attr' => [
-								'href' => $_SERVER['HTTP_REFERER']?? 'javascript:window.history.back()'
+								'href' => $_SERVER['HTTP_REFERER'] ?? 'javascript:window.history.back()'
 						],
 				],
 				'save' => [
@@ -48,7 +48,7 @@ 
 	
 	public function renderView(): void
     {
-        $this->elements = collect($this->elements)->sortByDesc(function ($element) {
+        $this->elements = collect($this->elements)->sortByDesc(function($element) {
             return $element->weight ?? 10;
         })->toArray();
 
@@ -64,9 +64,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/LayoutView.php

Indentation +79 added lines, -79 removed lines

@@ -32,53 +32,53 @@ 
  */
 class LayoutView extends \atk4\ui\Layout//ModuleView
 {
-    use SessionTrait;
+	use SessionTrait;
     
-    /**
-     * @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;
 
-    protected function init(): void
-    {
-        parent::init();
+	protected function init(): void
+	{
+		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();
         
@@ -87,28 +87,28 @@ 
 // 		if (event.originalEvent.persisted) {
 //         	window.location.reload(); 
 //     	}')]));
-    }
+	}
     
-    public function setMenu()
-    {
-        if ($this->menu) return;
+	public function setMenu()
+	{
+		if ($this->menu) return;
  
-        $this->menu = Menu::addTo($this, ['atk-topMenu fixed horizontal', 'element' => 'header'], ['TopMenu']);
+		$this->menu = Menu::addTo($this, ['atk-topMenu fixed horizontal', 'element' => 'header'], ['TopMenu']);
 
-        // company logo
-        // see \Epesi\Core\Controller::logo
-        \atk4\ui\View::addTo($this->menu, ['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add([\atk4\ui\Image::class, url('logo')])->setStyle(['max-height' => '32px']);
+		// company logo
+		// see \Epesi\Core\Controller::logo
+		\atk4\ui\View::addTo($this->menu, ['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add([\atk4\ui\Image::class, 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([\atk4\ui\Icon::class, 'home']);
+		$this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add([\atk4\ui\Icon::class, 'home']);
 
 		// location bar
-        $this->locationBar = $this->menu->add([\atk4\ui\View::class, ['ui' => 'epesi-location']]);
+		$this->locationBar = $this->menu->add([\atk4\ui\View::class, ['ui' => 'epesi-location']]);
 	}
 
 	/**
@@ -151,49 +151,49 @@ 
 		]), '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;
 
-        $this->isMenuLeftVisible = $this->learn('menu', $this->isMenuLeftVisible);
+		$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')])
+		]);
+	}
     
-    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(): 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 +7 added lines, -7 removed lines

@@ -37,17 +37,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
@@ -55,7 +55,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.
@@ -122,8 +122,8 @@ 
 		
 		$title = [];
 		foreach ($crumbs as $level) {
-			$label = $level['label']?? $level;
-			$link = $level['link']?? null;
+			$label = $level['label'] ?? $level;
+			$link = $level['link'] ?? null;
 			
 			$crumb->addCrumb($label, $link);
 			
@@ -157,7 +157,7 @@ 
         
         $this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
 
-        if (! $this->burger) return;
+        if (!$this->burger) return;
 
         $this->isMenuLeftVisible = $this->learn('menu', $this->isMenuLeftVisible);
         

Braces +15 added lines, -5 removed lines

@@ -91,7 +91,9 @@ 
     
     public function setMenu()
     {
-        if ($this->menu) return;
+        if ($this->menu) {
+        	return;
+        }
  
         $this->menu = Menu::addTo($this, ['atk-topMenu fixed horizontal', 'element' => 'header'], ['TopMenu']);
 
@@ -144,7 +146,9 @@ 
 	
 	public function setMenuRight()
 	{
-		if ($this->menuRight) return;
+		if ($this->menuRight) {
+			return;
+		}
 
 		$this->menuRight = $this->menu->add(new View\RightMenu([
 				'ui' => false
@@ -153,11 +157,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;
+        }
 
         $this->isMenuLeftVisible = $this->learn('menu', $this->isMenuLeftVisible);
         
@@ -173,7 +181,9 @@ 
     
     public function setActionBar()
     {
-    	if ($this->actionBar) return;
+    	if ($this->actionBar) {
+    		return;
+    	}
 
     	$this->actionBar = View\ActionBar::addTo($this, [], ['ActionBar']);