x-systems / epesi-core

src/System/Integration/Modules/ModuleCore.php

Spacing +4 added lines, -4 removed lines

@@ -46,11 +46,11 @@ 
 	{
 		$templatesDir = static::path() . DIRECTORY_SEPARATOR . 'Templates';
 		
-		if (! is_dir($templatesDir)) return;
+		if (!is_dir($templatesDir)) return;
 		
 		$skinDir = $templatesDir . DIRECTORY_SEPARATOR . $skin;
 		
-		return is_dir($skinDir)? $skinDir: $templatesDir;
+		return is_dir($skinDir) ? $skinDir : $templatesDir;
 	}
 	
 	public static function translations()
@@ -88,7 +88,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]);
 		}
 	}
@@ -97,7 +97,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]);
 		}
 	}

Braces +3 added lines, -1 removed lines

@@ -46,7 +46,9 @@
 	{
 		$templatesDir = static::path() . DIRECTORY_SEPARATOR . 'Templates';
 		
-		if (! is_dir($templatesDir)) return;
+		if (! is_dir($templatesDir)) {
+			return;
+		}
 		
 		$skinDir = $templatesDir . DIRECTORY_SEPARATOR . $skin;
 		

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

Spacing +3 added lines, -3 removed lines

@@ -6,16 +6,16 @@
 {
 	public function notify($options, $attachTo = null)
 	{
-		$options = array_merge(['duration'=> 1500], is_array($options)? $options: ['content' => $options]);
+		$options = array_merge(['duration'=> 1500], is_array($options) ? $options : ['content' => $options]);
 		
-		$attachTo = $attachTo?: $this;
+		$attachTo = $attachTo ?: $this;
 		
 		return (new \atk4\ui\jsNotify($options, $attachTo));
 	}
 	
 	public function notifyError($options, $attachTo = null)
 	{
-		$options = array_merge(['color' => 'red'], is_array($options)? $options: ['content' => $options]);
+		$options = array_merge(['color' => 'red'], is_array($options) ? $options : ['content' => $options]);
 		
 		return $this->notify($options, $attachTo);
 	}

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

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 	
 	final public static function packageManifest()
 	{
-		return self::$packageManifest = self::$packageManifest?: new PackageManifest(new Filesystem(), app()->basePath(), self::getCachedManifestPath());
+		return self::$packageManifest = self::$packageManifest ?: new PackageManifest(new Filesystem(), app()->basePath(), self::getCachedManifestPath());
 	}
 	
 	final public static function getCachedManifestPath()

src/System/SystemInstallWizard.php

Spacing +5 added lines, -5 removed lines

@@ -63,7 +63,7 @@ 
 		
 		$column = $columns->addColumn();
 
-		if (! function_exists('locale_get_display_language')) {
+		if (!function_exists('locale_get_display_language')) {
 			$column->addClass('middle aligned');
 			$column->add(['Label', __('Install php-intl extension to enable language selection!'), 'class' => ['red']]);
 			
@@ -83,7 +83,7 @@ 
 		
 		$form->addField('language', ['DropDown', 'values' => $values, 'caption' => __('Select Language')], ['required'=>true])->set($wizard->recall('language', 'en'));
 		
-		$form->onSubmit(function ($form) use ($wizard) {
+		$form->onSubmit(function($form) use ($wizard) {
 			$wizard->memorize('language', $form->model['language']);
 			
 			App::setLocale($form->model['language']);
@@ -109,7 +109,7 @@ 
 		$form->addField('support', ['Checkbox', 'caption' => __('I will not remove "Support -> About" credit page from the application menu.')], ['required'=>true]);
 		$form->addField('store', ['Checkbox', 'caption' => __('I will not remove or rename "EPESI Store" links from the application.')], ['required'=>true]);
 		
-		$form->onSubmit(function ($form) use ($wizard) {
+		$form->onSubmit(function($form) use ($wizard) {
 			return $wizard->jsNext();
 		});
 			
@@ -137,12 +137,12 @@ 
 		$form->addField('create', ['Checkbox', 'caption' => __('Create New Database')])->on('change', new jsExpression('if ($(event.target).is(":checked")) alert([])', [__('WARNING: Make sure you have CREATE access level to do this!')]));
 
 		foreach ($wizard->recall('connection', []) as $name => $value) {
-			if (! $field = $form->fields[$name]?? null) continue;
+			if (!$field = $form->fields[$name]?? null) continue;
 			
 			$field->set($value);
 		}
 
-		$form->onSubmit(function ($form) use ($wizard) {
+		$form->onSubmit(function($form) use ($wizard) {
 			$connection = $form->model->get();
 
 			$wizard->memorize('connection', $connection);

Braces +3 added lines, -1 removed lines

@@ -137,7 +137,9 @@
 		$form->addField('create', ['Checkbox', 'caption' => __('Create New Database')])->on('change', new jsExpression('if ($(event.target).is(":checked")) alert([])', [__('WARNING: Make sure you have CREATE access level to do this!')]));
 
 		foreach ($wizard->recall('connection', []) as $name => $value) {
-			if (! $field = $form->fields[$name]?? null) continue;
+			if (! $field = $form->fields[$name]?? null) {
+				continue;
+			}
 			
 			$field->set($value);
 		}

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

src/System/Seeds/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);
 				

src/Providers/EpesiServiceProvider.php

Indentation +42 added lines, -42 removed lines

@@ -9,22 +9,22 @@ 
 
 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');
+		});
     	
 		// Register providers declared in modules
 		foreach (ModuleManager::collect('providers') as $provider) {
@@ -34,37 +34,37 @@ 
 			$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');
+	}
 }

src/Providers/AdminServiceProvider.php

Indentation +17 added lines, -17 removed lines

@@ -20,23 +20,23 @@
 			ModuleInstallCommand::class
 	];
 	
-    /**
-     * Booting the package.
-     */
-    public function boot()
-    {
-    	// Register migrations from installed modules
-    	$this->loadMigrationsFrom(ModuleManager::collect('migrations'));
+	/**
+	 * Booting the package.
+	 */
+	public function boot()
+	{
+		// Register migrations from installed modules
+		$this->loadMigrationsFrom(ModuleManager::collect('migrations'));
 
-    	// Publish epesi configuration files
-    	$this->publishes([__DIR__.'/../../config' => config_path()], 'epesi.config');
-    }
+		// Publish epesi configuration files
+		$this->publishes([__DIR__.'/../../config' => config_path()], 'epesi.config');
+	}
 
-    /**
-     * Register the provider.
-     */
-    public function register()
-    {
-    	$this->commands($this->commands);
-    }
+	/**
+	 * Register the provider.
+	 */
+	public function register()
+	{
+		$this->commands($this->commands);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     	$this->loadMigrationsFrom(ModuleManager::collect('migrations'));
 
     	// Publish epesi configuration files
-    	$this->publishes([__DIR__.'/../../config' => config_path()], 'epesi.config');
+    	$this->publishes([__DIR__ . '/../../config' => config_path()], 'epesi.config');
     }
 
     /**

src/App.php

Spacing +10 added lines, -10 removed lines

@@ -33,7 +33,7 @@ 
 		//TODO: set the skin from admin / user selection
 		$this->skin = config('epesi.app.skin', $this->skin);
 
-		$this->template_dir = array_merge(ModuleManager::collect('templates', $this->skin), $this->template_dir?: []);
+		$this->template_dir = array_merge(ModuleManager::collect('templates', $this->skin), $this->template_dir ?: []);
 	}
 	
 	final public static function module()
@@ -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);