x-systems / epesi-core

src/Providers/EpesiServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     	
     	$this->app->singleton(
     			SQL::class,
-    			function ($app) {
+    			function($app) {
     				/**
     				 * Database Manager
     				 *

Indentation +54 added lines, -54 removed lines

@@ -12,73 +12,73 @@
 
 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', 'middleware' => 'web'], function() {
-    		Route::any('/', 'Controller@index');
-    		Route::get('logo', 'Controller@logo');
-    		Route::any('install', 'Controller@install');
+		Route::group(['namespace' => 'Epesi\Core', 'middleware' => 'web'], function() {
+			Route::any('/', 'Controller@index');
+			Route::get('logo', 'Controller@logo');
+			Route::any('install', 'Controller@install');
     		
-    		Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() {
-    			Route::any('home', 'Controller@home')->name('home');
+			Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() {
+				Route::any('home', 'Controller@home')->name('home');
     			
-    			Route::any('view/{alias}/{method?}/{args?}', 'Controller@view');
-    		});
-    	});
+				Route::any('view/{alias}/{method?}/{args?}', 'Controller@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(UI::class);
+	/**
+	 * Register the provider.
+	 */
+	public function register()
+	{
+		$this->app->singleton(UI::class);
     	
-    	$this->app->singleton(
-    			SQL::class,
-    			function ($app) {
-    				/**
-    				 * Database Manager
-    				 *
-    				 * @var \Illuminate\Database\DatabaseManager $db
-    				 */
-    				$db = DB::getFacadeRoot();
+		$this->app->singleton(
+				SQL::class,
+				function ($app) {
+					/**
+					 * Database Manager
+					 *
+					 * @var \Illuminate\Database\DatabaseManager $db
+					 */
+					$db = DB::getFacadeRoot();
     				
-    				return new SQL($db);
-    			});
-    }
+					return new SQL($db);
+				});
+	}
     
-    /**
-     * 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

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

src/System/User/Access/AccessSettings.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
 	
 	protected function showEditPermissions()
 	{
-		$permissionsData = Permission::all(['id', 'name'])->map(function($permission){
+		$permissionsData = Permission::all(['id', 'name'])->map(function($permission) {
 			$permission['name'] = trans(ucwords($permission['name']));
 			
 			return $permission;
@@ -99,19 +99,19 @@ 
 	
 	protected function columns()
 	{
-		return $this->columns = $this->columns?: $this->add('Columns');
+		return $this->columns = $this->columns ?: $this->add('Columns');
 	}
 	
 	protected function permissionId()
 	{
-		return $this->app->stickyGet($this->columns()->name)?: $this->getModuleVariable('permission');
+		return $this->app->stickyGet($this->columns()->name) ?: $this->getModuleVariable('permission');
 	}
 	
 	protected function reload($permissionExpression = null)
 	{
 		$columns = $this->columns();
 		
-		return $this->reload = $this->reload?: new jsReload($columns, [$columns->name => $permissionExpression?: '']);
+		return $this->reload = $this->reload ?: new jsReload($columns, [$columns->name => $permissionExpression ?: '']);
 	}
 	
 	protected function getModel($array)

tests/ModuleManagerTest.php

Indentation +18 added lines, -18 removed lines

@@ -8,28 +8,28 @@
 
 class ModuleManagerTest extends TestCase
 {
-    /**
-     * Setup the test environment.
-     */
-    protected function setUp(): void
-    {
-        parent::setUp();
+	/**
+	 * Setup the test environment.
+	 */
+	protected function setUp(): void
+	{
+		parent::setUp();
         
-        config([
-                'epesi.modules' => [
-                        '\\Epesi\\Core\\' => __DIR__ . implode(DIRECTORY_SEPARATOR, ['..', '..', 'src']),
-                ]
-        ]);
+		config([
+				'epesi.modules' => [
+						'\\Epesi\\Core\\' => __DIR__ . implode(DIRECTORY_SEPARATOR, ['..', '..', 'src']),
+				]
+		]);
         
-        ModuleManager::install('system');
-    }
+		ModuleManager::install('system');
+	}
     
-    public function testContentStorage()
-    {
-        $installedModules = ModuleManager::getInstalled();
+	public function testContentStorage()
+	{
+		$installedModules = ModuleManager::getInstalled();
         
-        $this->assertArrayHasKey('system', $installedModules, 'System module not installed');
-    }
+		$this->assertArrayHasKey('system', $installedModules, 'System module not installed');
+	}
     
 
 }
\ No newline at end of file

tests/VariablesTest.php

Indentation +24 added lines, -24 removed lines

@@ -7,41 +7,41 @@
 
 class VariablesTest extends TestCase
 {
-    /**
-     * Setup the test environment.
-     */
-    protected function setUp(): void
-    {
-        parent::setUp();
+	/**
+	 * Setup the test environment.
+	 */
+	protected function setUp(): void
+	{
+		parent::setUp();
 
-        Variable::migrate();
-    }
+		Variable::migrate();
+	}
     
-    public function testVariableStorage()
-    {
-        $varString = 'test';
+	public function testVariableStorage()
+	{
+		$varString = 'test';
         
-        Variable::memorize('testString', $varString);
+		Variable::memorize('testString', $varString);
         
-        $this->assertEquals($varString, Variable::recall('testString'), 'String variable not stored correctly in database');
+		$this->assertEquals($varString, Variable::recall('testString'), 'String variable not stored correctly in database');
         
-        Variable::forget('testString');
+		Variable::forget('testString');
         
-        $this->assertEmpty(Variable::recall('testString'), 'String variable not cleared correctly from database');
+		$this->assertEmpty(Variable::recall('testString'), 'String variable not cleared correctly from database');
         
-        $varArray = [
-                'aa' => 'test1',
-                'bb' => 'test2'
-        ];
+		$varArray = [
+				'aa' => 'test1',
+				'bb' => 'test2'
+		];
         
-        Variable::memorize('testArray', $varArray);
+		Variable::memorize('testArray', $varArray);
         
-        $this->assertEquals($varArray, Variable::recall('testArray'), 'Array variable not stored correctly in database');
+		$this->assertEquals($varArray, Variable::recall('testArray'), 'Array variable not stored correctly in database');
         
-        Variable::forget('testArray');
+		Variable::forget('testArray');
         
-        $this->assertEmpty(Variable::recall('testArray'), 'String variable not cleared correctly from database');
-    }
+		$this->assertEmpty(Variable::recall('testArray'), 'String variable not cleared correctly from database');
+	}
     
 
 }
\ No newline at end of file

src/HomePage/HomePageSettings.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 		
 		$grid->setModel(HomePage::create());
 
-		$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

Indentation +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
 
 class HomePage extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
 	public $table = 'home_pages';
 	
@@ -29,7 +29,7 @@ 
 		parent::init();
 		
 		$this->addFields([
-		        'path' => [
+				'path' => [
 						'type' => 'enum',
 						'caption' => __('Page'),
 						'values' => self::list(),
@@ -40,7 +40,7 @@ 
 								'filter' => true
 						],
 				],
-		        'role' => [
+				'role' => [
 						'type' => 'enum', 
 						'caption' => __('Role'), 
 						'values' => Role::get()->pluck('name', 'name')->all(), 
@@ -48,16 +48,16 @@ 
 								'filter' => true
 						]
 				],
-		        'date' => [
+				'date' => [
 						'type' => 'date', 
 						'caption' => __('Date'),
-		                'never_persist' => true,
+						'never_persist' => true,
 						'ui' => [
 								'filter' => true
 						]
 				],
 				'priority' => [
-				        'default' => 0
+						'default' => 0
 				],
 		]);
 		

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 		$this->setOrder('priority');
 
 		$this->addHook('beforeInsert', 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;
 		});
 	}
 	
@@ -77,7 +77,7 @@ 
 	{
 		static $cache;
 		
-		if (! isset($cache)) {
+		if (!isset($cache)) {
 			$cache = [];
 			foreach (HomePageJoint::collect() as $joint) {
 				$cache[$joint->link()] = $joint->caption();
@@ -94,7 +94,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();
 	}
@@ -106,6 +106,6 @@ 
 	 */
 	public static function pathOfUser()
 	{
-		return HomePage::ofUser()['path']?: self::$defaultPath;
+		return HomePage::ofUser()['path'] ?: self::$defaultPath;
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -94,7 +94,9 @@
 	 */
 	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/HomePage/HomePageCore.php

Indentation +5 added lines, -5 removed lines

@@ -21,14 +21,14 @@
 	
 	public function install()
 	{
-	    Models\HomePage::migrate();
+		Models\HomePage::migrate();
 	    
 		// setup default home pages
 		Models\HomePage::create()->import([
-	    		[
-			    		'path' => 'view/dashboard',
-			    		'role' => 'Super Admin'
-	    		],
+				[
+						'path' => 'view/dashboard',
+						'role' => 'Super Admin'
+				],
 				[
 						'path' => 'view/dashboard',
 						'role' => 'Employee'

src/System/User/Database/Models/atk4/User.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 class User extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
 	public $table = 'users';
 	

src/System/SystemCore.php

Indentation +3 added lines, -3 removed lines

@@ -24,11 +24,11 @@
 	
 	public function migrate()
 	{
-	    Models\Module::migrate();
+		Models\Module::migrate();
 	    
-	    Models\Variable::migrate();
+		Models\Variable::migrate();
 	    
-	    return parent::migrate();
+		return parent::migrate();
 	}
 	
 }