x-systems / epesi-core

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/Console/SetEnvCommand.php

Indentation +38 added lines, -38 removed lines

@@ -6,48 +6,48 @@
 
 class SetEnvCommand extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'epesi:env {name : Env variable(s) to set} {value? : Env variable value}';
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'epesi:env {name : Env variable(s) to set} {value? : Env variable value}';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Update ENV variable';
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Update ENV variable';
 
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-    	$this->setEnv($this->argument('name'), $this->argument('value'));
-    }
+	/**
+	 * Execute the console command.
+	 */
+	public function handle()
+	{
+		$this->setEnv($this->argument('name'), $this->argument('value'));
+	}
     
-    private static function setEnv($name, $value = null)
-    {
-    	$env = $name;
-    	if (is_string($name) && !isset($value)) {
-    		$env = [
-    				$name => $value
-    		];
-    	}
+	private static function setEnv($name, $value = null)
+	{
+		$env = $name;
+		if (is_string($name) && !isset($value)) {
+			$env = [
+					$name => $value
+			];
+		}
     	
-    	foreach ($env as $key => $value) {
-    		$oldSetting = $key . '=' . env($key);
-    		$newSetting = $key . '=' . $value;
+		foreach ($env as $key => $value) {
+			$oldSetting = $key . '=' . env($key);
+			$newSetting = $key . '=' . $value;
     		
-    		putenv($newSetting);
+			putenv($newSetting);
     		
-    		file_put_contents(app()->environmentFilePath(), str_replace(
-    			$oldSetting,
-    			$newSetting,
-    			file_get_contents(app()->environmentFilePath())
-    		));
-    	}
-    }
+			file_put_contents(app()->environmentFilePath(), str_replace(
+				$oldSetting,
+				$newSetting,
+				file_get_contents(app()->environmentFilePath())
+			));
+		}
+	}
 }

src/System/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);
-            $table->string('alias', 128)->unique();
-            $table->smallInteger('priority')->default(0);
-            $table->smallInteger('state')->default(1);
-        });
-    }
+		Schema::create('modules', function (Blueprint $table) {
+			$table->string('class', 512);
+			$table->string('alias', 128)->unique();
+			$table->smallInteger('priority')->default(0);
+			$table->smallInteger('state')->default(1);
+		});
+	}
 
-    /**
-     * 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);
             $table->string('alias', 128)->unique();
             $table->smallInteger('priority')->default(0);

src/System/Integration/Modules/Concerns/HasMigrations.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 	{
 		$paths = $this->migrations();
 		
-		foreach (is_array($paths)? $paths: [$paths] as $path) {
+		foreach (is_array($paths) ? $paths : [$paths] as $path) {
 			\Illuminate\Support\Facades\Artisan::call('migrate', ['--path' => $path, '--force' => true]);
 		}
 		
@@ -31,7 +31,7 @@ 
 	{
 		$paths = $this->migrations();
 		
-		foreach (is_array($paths)? $paths: [$paths] as $path) {
+		foreach (is_array($paths) ? $paths : [$paths] as $path) {
 			\Illuminate\Support\Facades\Artisan::call('migrate:rollback', ['--path' => $path]);
 		}
 		

src/System/Integration/Modules/ModuleManager.php

Spacing +11 added lines, -11 removed lines

@@ -19,7 +19,7 @@ 
 
 	public static function isInstalled($classOrAlias)
 	{
-		return self::getClass($classOrAlias, true)? 1: 0;
+		return self::getClass($classOrAlias, true) ? 1 : 0;
 	}
 	
 	public static function isAvalable($classOrAlias)
@@ -34,7 +34,7 @@ 
 	 * @return string;
 	 */
 	public static function getClass($classOrAlias, $installedOnly = false) {
-		$modules = $installedOnly? self::getInstalled(): self::getAll();
+		$modules = $installedOnly ? self::getInstalled() : self::getAll();
 		
 		if (collect($modules)->contains($classOrAlias)) return $classOrAlias;
 		
@@ -70,9 +70,9 @@ 
 	 */
 	public static function getAll()
 	{
-		return self::getCached('epesi-modules-available', function () {
+		return self::getCached('epesi-modules-available', function() {
 			$modules = collect();
-			foreach (array_merge(config('epesi.modules', []), self::packageManifest()->modules()?: []) as $moduleClass) {
+			foreach (array_merge(config('epesi.modules', []), self::packageManifest()->modules() ?: []) as $moduleClass) {
 				$modules->add(['alias' => $moduleClass::alias(), 'class' => $moduleClass]);
 			}
 
@@ -89,7 +89,7 @@ 
 	 */
 	protected static function getCached($key, \Closure $default)
 	{
-		if (! Cache::has($key)) {
+		if (!Cache::has($key)) {
 			Cache::forever($key, $default());
 		}
 
@@ -125,7 +125,7 @@ 
 	 */
 	public static function collect($method, $args = [])
 	{
-		$args = is_array($args)? $args: [$args];
+		$args = is_array($args) ? $args : [$args];
 		
 		$installedModules = self::getInstalled();
 		
@@ -138,9 +138,9 @@ 
 		
 		$ret = [];
 		foreach ($installedModules as $module) {
-			if (! $list = $module::$method(...$args)) continue;
+			if (!$list = $module::$method(...$args)) continue;
 			
-			$ret = array_merge($ret, is_array($list)? $list: [$list]);
+			$ret = array_merge($ret, is_array($list) ? $list : [$list]);
 		}
 		
 		return $ret;
@@ -159,7 +159,7 @@ 
 			return true;
 		}
 		
-		if (! $moduleClass = self::getClass($classOrAlias)) {			
+		if (!$moduleClass = self::getClass($classOrAlias)) {			
 			throw new \Exception('Module "' . $classOrAlias . '" could not be identified');
 		}
 		
@@ -210,10 +210,10 @@ 
 			$parentModule = array_shift($unsatisfiedDependencies);
 				
 			if (self::$processing[$parentModule]?? false) {
-				throw new Exception('Cross dependency: '. $parentModule);
+				throw new Exception('Cross dependency: ' . $parentModule);
 			}
 				
-			if (! self::isAvalable($parentModule)) {
+			if (!self::isAvalable($parentModule)) {
 				throw new Exception('Module not found: "' . $parentModule . '"');
 			}
 	

Braces +6 added lines, -2 removed lines

@@ -36,7 +36,9 @@ 
 	public static function getClass($classOrAlias, $installedOnly = false) {
 		$modules = $installedOnly? self::getInstalled(): self::getAll();
 		
-		if (collect($modules)->contains($classOrAlias)) return $classOrAlias;
+		if (collect($modules)->contains($classOrAlias)) {
+			return $classOrAlias;
+		}
 		
 		return $modules[$classOrAlias]?? null;
 	}
@@ -138,7 +140,9 @@ 
 		
 		$ret = [];
 		foreach ($installedModules as $module) {
-			if (! $list = $module::$method(...$args)) continue;
+			if (! $list = $module::$method(...$args)) {
+				continue;
+			}
 			
 			$ret = array_merge($ret, is_array($list)? $list: [$list]);
 		}

src/Providers/EpesiServiceProvider.php

Indentation +44 added lines, -44 removed lines

@@ -9,61 +9,61 @@
 
 class EpesiServiceProvider extends ServiceProvider
 {
-    /**
-     * Booting the package.
-     */
-    public function boot()
-    {
-    	$this->ensureHttps();
+	/**
+	 * Booting the package.
+	 */
+	public function boot()
+	{
+		$this->ensureHttps();
     	
-    	Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => ['web']], function() {
-    		header("Cache-Control: no-cache, no-store, must-revalidate"); //HTTP 1.1
-    		header("Pragma: no-cache"); //HTTP 1.0
-    		header("Expires: 0");
+		Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => ['web']], function() {
+			header("Cache-Control: no-cache, no-store, must-revalidate"); //HTTP 1.1
+			header("Pragma: no-cache"); //HTTP 1.0
+			header("Expires: 0");
     		
-    		Route::any('view/{alias}/{method?}/{args?}', 'ModuleController@view')->middleware('auth');
+			Route::any('view/{alias}/{method?}/{args?}', 'ModuleController@view')->middleware('auth');
     		
-    		Route::any('install', 'InstallController@index');
-    	});
+			Route::any('install', 'InstallController@index');
+		});
 
-    	// call boot methods on all modules
-    	ModuleManager::call('boot');
+		// call boot methods on all modules
+		ModuleManager::call('boot');
     		
 		foreach (ModuleManager::collect('translations') as $path) {
 			$this->loadJsonTranslationsFrom($path);
 		}
 		
-    	// Register admin service provider if in admin mode or in console
-    	// TODO: apply access restriction to admin mode
+		// Register admin service provider if in admin mode or in console
+		// TODO: apply access restriction to admin mode
 //     	if ($this->app->runningInConsole() || (request('admin', false) && Auth::user()->can('modify system'))) {
-    	if ($this->app->runningInConsole() || request('admin', false)) {
-    		$this->app->register(AdminServiceProvider::class);
-    	}
-    }
+		if ($this->app->runningInConsole() || request('admin', false)) {
+			$this->app->register(AdminServiceProvider::class);
+		}
+	}
 
-    /**
-     * Register the provider.
-     */
-    public function register()
-    {
-    	$this->app->singleton(App::class);
-    }
+	/**
+	 * Register the provider.
+	 */
+	public function register()
+	{
+		$this->app->singleton(App::class);
+	}
     
-    /**
-     * Force to set https scheme if https enabled.
-     *
-     * @return void
-     */
-    protected function ensureHttps()
-    {
-    	if (config('epesi.https') || config('epesi.secure')) {
-    		url()->forceScheme('https');
-    		$this->app['request']->server->set('HTTPS', true);
-    	}
-    }
+	/**
+	 * Force to set https scheme if https enabled.
+	 *
+	 * @return void
+	 */
+	protected function ensureHttps()
+	{
+		if (config('epesi.https') || config('epesi.secure')) {
+			url()->forceScheme('https');
+			$this->app['request']->server->set('HTTPS', true);
+		}
+	}
     
-    protected function registerStorageDisk()
-    {
-    	$this->app['config']['filesystems.disks.epesi'] = config('epesi.disk');
-    }
+	protected function registerStorageDisk()
+	{
+		$this->app['config']['filesystems.disks.epesi'] = config('epesi.disk');
+	}
 }