x-systems / epesi-core

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/Data/HasEpesiConnection.php

Indentation +20 added lines, -20 removed lines

@@ -41,33 +41,33 @@
 	 */
 	public static function pluck($value, $key = null)
 	{
-	    return collect(self::create()->export())->pluck($value, $key);
+		return collect(self::create()->export())->pluck($value, $key);
 	}
 	
 	// to be removed for atk4/data 2.0
 	public function addFields($fields = [], $defaults = [])
 	{
-	    foreach ($fields as $key => $field) {
-	        if (!is_int($key)) {
-	            // field name can be passed as array key
-	            $name = $key;
-	        } elseif (is_string($field)) {
-	            // or it can be simple string = field name
-	            $name = $field;
-	            $field = [];
-	        } elseif (is_array($field) && isset($field[0]) && is_string($field[0])) {
-	            // or field name can be passed as first element of seed array (old behaviour)
-	            $name = array_shift($field);
-	        } else {
-	            // some unsupported format, maybe throw exception here?
-	            continue;
-	        }
+		foreach ($fields as $key => $field) {
+			if (!is_int($key)) {
+				// field name can be passed as array key
+				$name = $key;
+			} elseif (is_string($field)) {
+				// or it can be simple string = field name
+				$name = $field;
+				$field = [];
+			} elseif (is_array($field) && isset($field[0]) && is_string($field[0])) {
+				// or field name can be passed as first element of seed array (old behaviour)
+				$name = array_shift($field);
+			} else {
+				// some unsupported format, maybe throw exception here?
+				continue;
+			}
 	        
-	        $seed = array_merge($defaults, (array) $field);
+			$seed = array_merge($defaults, (array) $field);
 	        
-	        $this->addField($name, $seed);
-	    }
+			$this->addField($name, $seed);
+		}
 	    
-	    return $this;
+		return $this;
 	}
 }
\ No newline at end of file

src/App.php

Braces +3 added lines, -6 removed lines

@@ -86,11 +86,9 @@ 
 	    ob_start();
 	    if ($exception instanceof TokenMismatchException) {
 	        $this->jsRedirectHomepage(__('Session expired! Redirecting to your home page ...'));
-	    }
-	    elseif ($exception instanceof NotFoundHttpException) {
+	    } elseif ($exception instanceof NotFoundHttpException) {
 	        $this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...'));
-	    }	    
-	    else {
+	    } else {
 	        $this->caughtException($exception);
 	    }
 	    
@@ -109,8 +107,7 @@ 
 	                'message'   => $message,
 	                'atkjs'   => $redirectJs
 	        ]);
-	    }
-	    else {
+	    } else {
 	        $this->outputResponseHTML('<script>' . $redirectJs . '</script>');
 	    }
 	}

Indentation +28 added lines, -28 removed lines

@@ -28,10 +28,10 @@ 
 	{
 		parent::__construct([
 				'title' => config('epesi.app.title', 'EPESI'),
-		        'cdn' => array_merge($this->cdn, (array) config('epesi.app.cdn')),
+				'cdn' => array_merge($this->cdn, (array) config('epesi.app.cdn')),
 				//TODO: set the skin from admin / user selection
-		        'skin' => config('epesi.app.skin', $this->skin),
-		        'template_dir' => array_merge(ModuleManager::collect('templates', $this->skin), (array) $this->template_dir)
+				'skin' => config('epesi.app.skin', $this->skin),
+				'template_dir' => array_merge(ModuleManager::collect('templates', $this->skin), (array) $this->template_dir)
 		]);
 	}
 	
@@ -73,43 +73,43 @@ 
 	
 	public function renderException($exception)
 	{
-	    ob_start();
-	    if ($exception instanceof TokenMismatchException) {
-	        $this->jsRedirectHomepage(__('Session expired! Redirecting to your home page ...'));
-	    }
-	    elseif ($exception instanceof NotFoundHttpException) {
-	        $this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...'));
-	    }	    
-	    else {
-	        $this->caughtException($exception);
-	    }
+		ob_start();
+		if ($exception instanceof TokenMismatchException) {
+			$this->jsRedirectHomepage(__('Session expired! Redirecting to your home page ...'));
+		}
+		elseif ($exception instanceof NotFoundHttpException) {
+			$this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...'));
+		}	    
+		else {
+			$this->caughtException($exception);
+		}
 	    
-	    return ob_get_clean();
+		return ob_get_clean();
 	}
 	
 	public function jsRedirectHomepage($message)
 	{
-	    $homepageUrl = url(\Epesi\Core\HomePage\Database\Models\HomePage::pathOfUser());
+		$homepageUrl = url(\Epesi\Core\HomePage\Database\Models\HomePage::pathOfUser());
 	    
-	    $redirectJs = $this->jsRedirectConfirm($homepageUrl, $message)->jsRender();
+		$redirectJs = $this->jsRedirectConfirm($homepageUrl, $message)->jsRender();
 	    
-	    if ($this->isJsonRequest()) {
-	        $this->outputResponseJSON([
-	                'success'   => true,
-	                'message'   => $message,
-	                'atkjs'   => $redirectJs
-	        ]);
-	    }
-	    else {
-	        $this->outputResponseHTML('<script>' . $redirectJs . '</script>');
-	    }
+		if ($this->isJsonRequest()) {
+			$this->outputResponseJSON([
+					'success'   => true,
+					'message'   => $message,
+					'atkjs'   => $redirectJs
+			]);
+		}
+		else {
+			$this->outputResponseHTML('<script>' . $redirectJs . '</script>');
+		}
 	}
 	
 	public function jsRedirectConfirm($page, $message)
 	{
-	    $redirectJs = $this->jsRedirect($page)->jsRender();
+		$redirectJs = $this->jsRedirect($page)->jsRender();
 	    
-	    return new jsExpression("if (confirm([])) { $redirectJs }", [$message]);
+		return new jsExpression("if (confirm([])) { $redirectJs }", [$message]);
 	}
 	
 	/**

Spacing +10 added lines, -10 removed lines

@@ -127,35 +127,35 @@ 
 		
 		// jQuery
 		$urlJs = $this->cdn['jquery']?? $localJs;
-		$this->requireJS($urlJs.'/jquery.min.js');
+		$this->requireJS($urlJs . '/jquery.min.js');
 		
 		// Semantic UI
 		$urlJs = $this->cdn['semantic-ui']?? $localJs;
 		$urlCss = $this->cdn['semantic-ui']?? $localCss;
-		$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']?? $localJs;
-		$this->requireJS($urlJs.'/jquery.serialize-object.min.js');
+		$this->requireJS($urlJs . '/jquery.serialize-object.min.js');
 		
 		// Agile UI
 		$urlJs = $this->cdn['atk']?? $localJs;
 		$urlCss = $this->cdn['atk']?? $localCss;
-		$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']?? $localJs;
-		$this->requireJS($urlJs.'/draggable.bundle.js');
+		$this->requireJS($urlJs . '/draggable.bundle.js');
 		
 		// jQuery niceScroll	
 		$urlJs = $this->cdn['jquery-nicescroll']?? $localJs;
-		$this->requireJS($urlJs.'/jquery.nicescroll.js');
+		$this->requireJS($urlJs . '/jquery.nicescroll.js');
 		
 		// clipboard.js
 		$urlJs = $this->cdn['clipboardjs']?? $localJs;
-		$this->requireJS($urlJs.'/clipboard.js');
+		$this->requireJS($urlJs . '/clipboard.js');
 	}
 	
 	public function addCsrfToken()
@@ -232,7 +232,7 @@ 
 		
 		$key = md5(serialize(func_get_args()));
 		
-		if (! isset($cache[$key])) {
+		if (!isset($cache[$key])) {
 			$cache[$key] = true;
 			
 			parent::requireJS($url, $isAsync, $isDefer);

src/System/Seeds/Form.php

Spacing +11 added lines, -11 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,
@@ -109,17 +109,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;
@@ -132,7 +132,7 @@ 
 	
 	public function confirmLeave($confirm = true)
 	{
-		$this->canLeave = ! $confirm;
+		$this->canLeave = !$confirm;
 		
 		return $this;
 	}

Braces +6 added lines, -2 removed lines

@@ -89,7 +89,9 @@ 
 	}
 	
 	public function addFieldRules($field, $rules = []) {
-		if (! $rules) return;
+		if (! $rules) {
+			return;
+		}
 		
 		$this->fieldRules[$field] = $rules['rules']?? [
 				'identifier' => $field,
@@ -112,7 +114,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);