x-systems / epesi-core

src/HomePage/HomePageSettings.php

Spacing +10 added lines, -10 removed lines

@@ -53,7 +53,7 @@ 
 			return [['Template', $availablePages[$row[$column]]?? '[' . __('missing: :path', ['path' => $row[$column]]) . ']']];
 		}]);
 		
-		$this->grid->addDragHandler()->onReorder(function ($order) {
+		$this->grid->addDragHandler()->onReorder(function($order) {
 			$result = true;
 			foreach ($this->getHomepages() as $homepage) {
 				$homepage->priority = array_search($homepage->id, $order);
@@ -61,10 +61,10 @@ 
 				$result &= $homepage->save();
 			}
 			
-			return $result? $this->notify(__('Homepages reordered!')): $this->notifyError(__('Error saving order!'));
+			return $result ? $this->notify(__('Homepages reordered!')) : $this->notifyError(__('Error saving order!'));
 		});
 		
-		$this->grid->addAction(['icon' => 'red trash'], function ($jschain, $id) {
+		$this->grid->addAction(['icon' => 'red trash'], function($jschain, $id) {
 			HomePage::find($id)->delete();
 				
 			return $jschain->closest('tr')->transition('fade left');
@@ -87,11 +87,11 @@ 
 		
 		$rowsEmpty = [];
 		
-		$model = new \atk4\data\Model($rows? new \atk4\data\Persistence_Static($rows): new \atk4\data\Persistence_Array($rowsEmpty));
+		$model = new \atk4\data\Model($rows ? new \atk4\data\Persistence_Static($rows) : new \atk4\data\Persistence_Array($rowsEmpty));
 	
-		$pathField = $rows? $model->hasField('path'): $model->addField('path');
+		$pathField = $rows ? $model->hasField('path') : $model->addField('path');
 			
-		$roleField = $rows? $model->hasField('role'): $model->addField('role');
+		$roleField = $rows ? $model->hasField('role') : $model->addField('role');
 		
 		$pathField->setDefaults(['caption' => __('Page'), 'values' => $availablePages]);
 
@@ -107,7 +107,7 @@ 
 	
 	public function getHomepageForm()
 	{
-		if (! $this->form) {		
+		if (!$this->form) {		
 			$this->form = new Form(['buttonSave' => ['Button', __('Save'), 'primary']]);
 	
 			$this->form->addHook('submit', function($form) {
@@ -139,7 +139,7 @@ 
 	{
 		static $cache;
 		
-		if (! isset($cache)) {
+		if (!isset($cache)) {
 			$cache = [];
 			foreach (HomePageJoint::collect() as $joint) {
 				$cache[$joint->link()] = $joint->caption();
@@ -156,7 +156,7 @@ 
 	 */
 	public static function getUserHomePage()
 	{
-		if (! $user = Auth::user()) return;
+		if (!$user = Auth::user()) return;
 		
 		return HomePage::whereIn('role', $user->roles()->pluck('name'))->orderBy('priority')->first();
 	}
@@ -170,6 +170,6 @@ 
 	{
 		$homepage = self::getUserHomePage();
 		
-		return $homepage? $homepage->path: self::$defaultPath;
+		return $homepage ? $homepage->path : self::$defaultPath;
 	}
 }

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()
@@ -83,31 +83,31 @@ 
 		//TODO: include below in app.js and app.css
 		// jQuery
 		$urlJs = $this->cdn['jquery']?? 'storage/system/js';
-		$this->requireJS($urlJs.'/jquery.min.js');
+		$this->requireJS($urlJs . '/jquery.min.js');
 		
 		// Semantic UI
 		$urlJs = $this->cdn['semantic-ui']?? 'storage/system/js';
 		$urlCss = $this->cdn['semantic-ui']?? 'storage/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']?? 'storage/system/js';
-		$this->requireJS($urlJs.'/jquery.serialize-object.min.js');
+		$this->requireJS($urlJs . '/jquery.serialize-object.min.js');
 		
 		// Agile UI
 		$urlJs = $this->cdn['atk']?? 'storage/system/js';
 		$urlCss = $this->cdn['atk']?? 'storage/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']?? 'storage/system/js';
-		$this->requireJS($urlJs.'/draggable.bundle.js');
+		$this->requireJS($urlJs . '/draggable.bundle.js');
 		
 		// jQuery niceScroll	
 		$urlJs = $this->cdn['jquery-nicescroll']?? 'storage/system/js';
-		$this->requireJS($urlJs.'/jquery.nicescroll.js');
+		$this->requireJS($urlJs . '/jquery.nicescroll.js');
 	}
 	
 	public function addCsrfToken()
@@ -184,7 +184,7 @@ 
 		
 		$key = md5(serialize(func_get_args()));
 		
-		if (! isset($cache[$key])) {
+		if (!isset($cache[$key])) {
 			$cache[$key] = true;
 			
 			parent::requireJS($url, $isAsync, $isDefer);

src/Providers/EpesiServiceProvider.php

Indentation +43 added lines, -43 removed lines

@@ -10,60 +10,60 @@
 
 class EpesiServiceProvider extends ServiceProvider
 {
-    /**
-     * Booting the package.
-     */
-    public function boot()
-    {
-    	$this->ensureHttps();
+	/**
+	 * Booting the package.
+	 */
+	public function boot()
+	{
+		$this->ensureHttps();
     	
-    	if (env('APP_DEBUG', false)) ModuleManager::clearCache();
+		if (env('APP_DEBUG', false)) ModuleManager::clearCache();
     	
-    	Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => 'web'], function() {
-    		Route::any('/', 'SystemController@index');
-    		Route::get('logo', 'SystemController@logo');
-    		Route::any('install', 'SystemController@install');
+		Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => 'web'], function() {
+			Route::any('/', 'SystemController@index');
+			Route::get('logo', 'SystemController@logo');
+			Route::any('install', 'SystemController@install');
     		
-    		Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() {
-    			Route::any('home', 'SystemController@home')->name('home');
+			Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() {
+				Route::any('home', 'SystemController@home')->name('home');
     			
-    			Route::any('view/{alias}/{method?}/{args?}', 'SystemController@view');
-    		});
-    	});
+				Route::any('view/{alias}/{method?}/{args?}', 'SystemController@view');
+			});
+		});
 
-    	// 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);
+		}
+	}
 }

Braces +3 added lines, -1 removed lines

@@ -17,7 +17,9 @@
     {
     	$this->ensureHttps();
     	
-    	if (env('APP_DEBUG', false)) ModuleManager::clearCache();
+    	if (env('APP_DEBUG', false)) {
+    		ModuleManager::clearCache();
+    	}
     	
     	Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => 'web'], function() {
     		Route::any('/', 'SystemController@index');

src/System/ModuleAdministration.php

Spacing +5 added lines, -5 removed lines

@@ -29,8 +29,8 @@ 
 	{
 		$modules = ModuleManager::getAll();
 		
-		return $modules->filter(function ($subModuleClass) use ($modules) {
-			return ! $modules->map(function($moduleClass){
+		return $modules->filter(function($subModuleClass) use ($modules) {
+			return !$modules->map(function($moduleClass) {
 				return $moduleClass::namespace();
 			})->contains($subModuleClass::parentNamespace());
 		})->sort();
@@ -61,7 +61,7 @@ 
 			
 			$section->add($label, 'title')->setStyle('float', 'right');
 			
-			$submodules = ModuleManager::getAll()->filter(function ($subModuleClass) use ($moduleClass) {
+			$submodules = ModuleManager::getAll()->filter(function($subModuleClass) use ($moduleClass) {
 				return $subModuleClass::isSubModuleOf($moduleClass);
 			});
 			
@@ -73,11 +73,11 @@ 
 	
 	public function formatModuleInfo($moduleClass)
 	{
-		$moduleInfo = (array) ($moduleClass::info()?: __(' No details provided by author'));
+		$moduleInfo = (array) ($moduleClass::info() ?: __(' No details provided by author'));
 		
 		$ret = [];
 		foreach ($moduleInfo as $label => $text) {
-			$ret[] = (is_string($label)? "<strong>$label</strong>: ": '') . $text;
+			$ret[] = (is_string($label) ? "<strong>$label</strong>: " : '') . $text;
 		}
 		
 		return implode('<br>', $ret);

Braces +4 added lines, -3 removed lines

@@ -52,8 +52,7 @@ 
 				$this->addUninstallButton($section, $moduleClass);
 				
 				$this->addReinstallButton($section, $moduleClass);
-			}
-			else {
+			} else {
 				$label = ['Label', __('Available'), 'yellow'];
 				
 				$this->addInstallButton($section, $moduleClass);
@@ -65,7 +64,9 @@ 
 				return $subModuleClass::isSubModuleOf($moduleClass);
 			});
 			
-			if ($submodules->isEmpty()) continue;
+			if ($submodules->isEmpty()) {
+				continue;
+			}
 			
 			$this->addAccordion($section, $submodules);
 		}

src/System/Logo/LogoSettings.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 			Storage::delete(self::alias() . '/tmp/' . $token);
 		});
 
-		$logo->onUpload(function ($files) use ($form, $logo) {
+		$logo->onUpload(function($files) use ($form, $logo) {
 			if ($files === 'error')	return $form->error('logo', __('Error uploading image'));
 			
 			$tmpPath = self::alias() . '/tmp/' . $files['name'];

Braces +3 added lines, -1 removed lines

@@ -42,7 +42,9 @@
 		});
 
 		$logo->onUpload(function ($files) use ($form, $logo) {
-			if ($files === 'error')	return $form->error('logo', __('Error uploading image'));
+			if ($files === 'error') {
+				return $form->error('logo', __('Error uploading image'));
+			}
 			
 			$tmpPath = self::alias() . '/tmp/' . $files['name'];
 			

src/System/Seeds/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/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, $default = null) {
 		self::cache();
 		
-		if (! self::$variables->has($name)) return $default;
+		if (!self::$variables->has($name)) return $default;
 		
 		return self::$variables->get($name, $default);
 	}
@@ -44,10 +44,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 +6 added lines, -2 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');
 	}
@@ -25,7 +27,9 @@ 
 	public static function get($name, $default = null) {
 		self::cache();
 		
-		if (! self::$variables->has($name)) return $default;
+		if (! self::$variables->has($name)) {
+			return $default;
+		}
 		
 		return self::$variables->get($name, $default);
 	}

src/System/Integration/Modules/ModuleCore.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
 	 * Label of the module
 	 */
 	public static function label() {
-		return static::$label?: ucwords(str_ireplace('.', ' ', static::alias()));
+		return static::$label ?: ucwords(str_ireplace('.', ' ', static::alias()));
 	}
 	
 	/**
@@ -76,11 +76,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()

src/System/Integration/Modules/ModuleManager.php

Spacing +16 added lines, -16 removed lines

@@ -20,7 +20,7 @@ 
 
 	public static function isInstalled($classOrAlias)
 	{
-		return self::getClass($classOrAlias, true)? 1: 0;
+		return self::getClass($classOrAlias, true) ? 1 : 0;
 	}
 	
 	public static function isAvailable($classOrAlias)
@@ -35,7 +35,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;
 		
@@ -67,9 +67,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 $namespace => $path) {
+			foreach (array_merge(config('epesi.modules', []), self::packageManifest()->modules() ?: []) as $namespace => $path) {
 				foreach (self::discoverModuleClasses($namespace, $path) as $moduleClass) {
 					$modules->add(['alias' => $moduleClass::alias(), 'class' => $moduleClass]);
 				}
@@ -82,14 +82,14 @@ 
 	protected static function discoverModuleClasses($namespace, $basePath)
 	{
 		$ret = collect();
-		foreach (glob($basePath . '/*', GLOB_ONLYDIR|GLOB_NOSORT) as $path) {
+		foreach (glob($basePath . '/*', GLOB_ONLYDIR | GLOB_NOSORT) as $path) {
 			$moduleNamespace = trim($namespace, '\\') . '\\' . basename($path);
 			
 			$ret = $ret->merge(self::discoverModuleClasses($moduleNamespace, $path));
 			
 			$moduleClass = $moduleNamespace . '\\' . basename($path) . 'Core';
 			
-			if (! is_a($moduleClass, ModuleCore::class, true)) continue;
+			if (!is_a($moduleClass, ModuleCore::class, true)) continue;
 			
 			$ret->add($moduleClass);
 		}
@@ -106,7 +106,7 @@ 
 	 */
 	protected static function getCached($key, \Closure $default)
 	{
-		if (! Cache::has($key)) {
+		if (!Cache::has($key)) {
 			Cache::forever($key, $default());
 		}
 
@@ -144,12 +144,12 @@ 
 	 */
 	public static function collect($method, $args = [])
 	{
-		$args = is_array($args)? $args: [$args];
+		$args = is_array($args) ? $args : [$args];
 		
 		$installedModules = self::getInstalled();
 		
 		// if epesi is not installed fake having the system module to enable its functionality
-		if (! $installedModules->contains(\Epesi\Core\System\SystemCore::class)) {
+		if (!$installedModules->contains(\Epesi\Core\System\SystemCore::class)) {
 			$installedModules = collect([
 				'system' => \Epesi\Core\System\SystemCore::class
 			]);
@@ -157,9 +157,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;
@@ -178,7 +178,7 @@ 
 			return true;
 		}
 		
-		if (! $moduleClass = self::getClass($classOrAlias)) {			
+		if (!$moduleClass = self::getClass($classOrAlias)) {			
 			throw new \Exception('Module "' . $classOrAlias . '" could not be identified');
 		}
 		
@@ -237,10 +237,10 @@ 
 			$parentModule = array_shift($unsatisfiedDependencies);
 				
 			if (self::$processing[$parentModule]?? false) {
-				throw new Exception('Cross dependency: '. $parentModule);
+				throw new Exception('Cross dependency: ' . $parentModule);
 			}
 				
-			if (! self::isAvailable($parentModule)) {
+			if (!self::isAvailable($parentModule)) {
 				throw new Exception('Module not found: "' . $parentModule . '"');
 			}
 	
@@ -261,13 +261,13 @@ 
 	
 	public static function uninstall($classOrAlias)
 	{
-		if (! self::isInstalled($classOrAlias)) {
+		if (!self::isInstalled($classOrAlias)) {
 			print ('Module "' . $classOrAlias . '" is not installed!');
 			
 			return true;
 		}
 		
-		if (! $moduleClass = self::getClass($classOrAlias)) {
+		if (!$moduleClass = self::getClass($classOrAlias)) {
 			throw new \Exception('Module "' . $classOrAlias . '" could not be identified');
 		}