x-systems / epesi-core

src/Database/Models/Module.php

Spacing +4 added lines, -4 removed lines

@@ -14,13 +14,13 @@ 
 	private static $cache;
 	
 	private static function cache() {
-		if(isset(self::$cache)) return;
+		if (isset(self::$cache)) return;
 		
 		self::$cache = self::pluck('class', 'alias');
 	}
 	
 	public static function isInstalled($classOrAlias) {
-		return self::getClass($classOrAlias)? 1: 0;
+		return self::getClass($classOrAlias) ? 1 : 0;
 	}
 	
 	public static function getClass($classOrAlias) {
@@ -47,9 +47,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

@@ -14,7 +14,9 @@ 
 	private static $cache;
 	
 	private static function cache() {
-		if(isset(self::$cache)) return;
+		if(isset(self::$cache)) {
+			return;
+		}
 		
 		self::$cache = self::pluck('class', 'alias');
 	}
@@ -26,7 +28,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;
 	}
@@ -47,7 +51,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]);
 		}

src/Database/Models/Variable.php

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
 	private static $variables;
 	
 	private static function cache() {
-		if(isset(self::$variables)) return;
+		if (isset(self::$variables)) return;
 		
 		self::$variables = self::pluck('value', 'name');
 	}
@@ -25,7 +25,7 @@ 
 	public static function get($name, $throwError = true) {
 		self::cache();
 		
-		if (! self::$variables->has($name) && $throwError) {
+		if (!self::$variables->has($name) && $throwError) {
 			throw new \Exception('No such variable in database: ' . $name);
 		}
 		
@@ -46,10 +46,10 @@ 
 		return self::updateOrCreate(compact('name'), compact('value'));
 	}
 	
-	public static function forget($name, $throwError=true) {
+	public static function forget($name, $throwError = true) {
 		self::cache();
 		
-		if (! self::$variables->has($name) && $throwError) {
+		if (!self::$variables->has($name) && $throwError) {
 			throw new \Exception('No such variable in database: ' . $name);
 		}
 		

Braces +3 added lines, -1 removed lines

@@ -17,7 +17,9 @@
 	private static $variables;
 	
 	private static function cache() {
-		if(isset(self::$variables)) return;
+		if(isset(self::$variables)) {
+			return;
+		}
 		
 		self::$variables = self::pluck('value', 'name');
 	}

src/Database/Migrations/2019_09_18_173148_create_core_tables.php

Indentation +29 added lines, -29 removed lines

@@ -6,37 +6,37 @@
 
 class CreateCoreTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-    	$this->down();
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		$this->down();
     	
-    	Schema::create('variables', function (Blueprint $table) {
-            $table->string('name', 128)->primary();
-            $table->text('value');
-        });
+		Schema::create('variables', function (Blueprint $table) {
+			$table->string('name', 128)->primary();
+			$table->text('value');
+		});
     	
-    	Schema::create('modules', function (Blueprint $table) {
-            $table->string('class', 512)->unique();
-            $table->string('alias', 128)->unique();
-            $table->smallInteger('priority');
-            $table->smallInteger('state');
-        });
-    }
+		Schema::create('modules', function (Blueprint $table) {
+			$table->string('class', 512)->unique();
+			$table->string('alias', 128)->unique();
+			$table->smallInteger('priority');
+			$table->smallInteger('state');
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    	Schema::dropIfExists('variables');
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('variables');
     	
-    	Schema::dropIfExists('modules');
-    }
+		Schema::dropIfExists('modules');
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -15,12 +15,12 @@
     {
     	$this->down();
     	
-    	Schema::create('variables', function (Blueprint $table) {
+    	Schema::create('variables', function(Blueprint $table) {
             $table->string('name', 128)->primary();
             $table->text('value');
         });
     	
-    	Schema::create('modules', function (Blueprint $table) {
+    	Schema::create('modules', function(Blueprint $table) {
             $table->string('class', 512)->unique();
             $table->string('alias', 128)->unique();
             $table->smallInteger('priority');

src/Controllers/ModuleController.php

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 			}
 		}
 
-		if (empty ($view)) abort(404);
+		if (empty ($view)) {
+			abort(404);
+		}
 
 		$epesi->add($view)->displayModuleContent($method, $args);
 		

src/App.php

Spacing +11 added lines, -11 removed lines

@@ -24,9 +24,9 @@ 
 		//TODO: set the skin from admin / user selection
 		$skin = config('epesi.app.skin', $this->skin);
 		
-		$this->template_dir = $this->template_dir?: [];
+		$this->template_dir = $this->template_dir ?: [];
 		
-		$this->template_dir[] = __DIR__.'/UI/Templates/'. $skin;
+		$this->template_dir[] = __DIR__ . '/UI/Templates/' . $skin;
 		
 		parent::__construct([
 				'title' => config('epesi.app.title', 'EPESI'),
@@ -81,31 +81,31 @@ 
 		//TODO: include below in app.js and app.css
 		// jQuery
 		$urlJs = $this->cdn['jquery']?? 'modules/system/js';
-		$this->requireJS($urlJs.'/jquery.min.js');
+		$this->requireJS($urlJs . '/jquery.min.js');
 		
 		// Semantic UI
 		$urlJs = $this->cdn['semantic-ui']?? 'modules/system/js';
 		$urlCss = $this->cdn['semantic-ui']?? 'modules/system/css';
-		$this->requireJS($urlJs.'/semantic.min.js');
-		$this->requireCSS($urlCss.'/semantic.min.css');
+		$this->requireJS($urlJs . '/semantic.min.js');
+		$this->requireCSS($urlCss . '/semantic.min.css');
 		
 		// Serialize Object
 		$urlJs = $this->cdn['serialize-object']?? 'modules/system/js';
-		$this->requireJS($urlJs.'/jquery.serialize-object.min.js');
+		$this->requireJS($urlJs . '/jquery.serialize-object.min.js');
 		
 		// Agile UI
 		$urlJs = $this->cdn['atk']?? 'modules/system/js';
 		$urlCss = $this->cdn['atk']?? 'modules/system/css';
-		$this->requireJS($urlJs.'/atkjs-ui.min.js');
-		$this->requireCSS($urlCss.'/agileui.css');
+		$this->requireJS($urlJs . '/atkjs-ui.min.js');
+		$this->requireCSS($urlCss . '/agileui.css');
 		
 		// Draggable
 		$urlJs = $this->cdn['draggable']?? 'modules/system/js';
-		$this->requireJS($urlJs.'/draggable.bundle.js');
+		$this->requireJS($urlJs . '/draggable.bundle.js');
 		
 		// jQuery UI	
 		$urlJs = $this->cdn['jquery-ui']?? 'modules/system/js';
-		$this->requireJS($urlJs.'/jquery-ui.js');
+		$this->requireJS($urlJs . '/jquery-ui.js');
 		
 // 		$this->requireJS('https://cdnjs.cloudflare.com/ajax/libs/jquery.nicescroll/3.7.6/jquery.nicescroll.min.js');
 	}
@@ -179,7 +179,7 @@ 
 		
 		$key = md5(serialize(func_get_args()));
 		
-		if (! isset($cache[$key])) {
+		if (!isset($cache[$key])) {
 			$cache[$key] = true;
 			
 			parent::requireJS($url, $isAsync, $isDefer);

src/UI/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/UI/Seeds/LaunchButton.php

Indentation +1 added lines, -1 removed lines

@@ -4,6 +4,6 @@
 
 class LaunchButton extends ActionButton
 {
-    public $ui = 'basic launch pjax button';
+	public $ui = 'basic launch pjax button';
   
 }

src/UI/Seeds/Form.php

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);
 				

Spacing +14 added lines, -14 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']?? []);
 					
@@ -56,7 +56,7 @@ 
 				case 'header':
 					$seed = $desc['seed']?? [$name];
 					
-					$parent->addHeader(is_array($seed)? $seed: [$seed]);
+					$parent->addHeader(is_array($seed) ? $seed : [$seed]);
 					break;
 					
 				case 'view':
@@ -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;
 	}

src/UI/Seeds/NavMenu.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
 // 		$this->addHeader('')->addClass('recent');
 		
 		$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) {
+		$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

@@ -43,7 +43,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 = [
@@ -61,8 +63,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) {
@@ -71,8 +72,7 @@ 
 				}
 				
 				self::addItems($subgroup, collect($subitems));
-			}
-			elseif ($subitems = $item['accordion']?? []) {
+			} elseif ($subitems = $item['accordion']?? []) {
 				$accordion = $menu->add(['Accordion']);
 				
 				$section = $accordion->addSection($item['caption']);
@@ -98,12 +98,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']?? '');
 				}