x-systems / epesi-core

src/System/View/Form.php

Spacing +22 added lines, -22 removed lines

@@ -16,52 +16,52 @@ 
 	protected $validationRules = [];
 	
 	public function addElements($elements, $parent = null) {
-		$parent = $parent?: $this;
+		$parent = $parent ?: $this;
 		
 		foreach ($elements as $name => $desc) {
-			$name = $desc['name']?? $name;
+			$name = $desc['name'] ?? $name;
 			
-			$this->addControlRules($name, $desc['rules']?? []);
+			$this->addControlRules($name, $desc['rules'] ?? []);
 			
-			switch ($desc['type']?? 'field') {
+			switch ($desc['type'] ?? 'field') {
 				case 'field':
-					$desc = is_string($desc)? [
+					$desc = is_string($desc) ? [
 						'decorator' => [$desc]
-					]: $desc;
+					] : $desc;
 					
-					$field = $parent->addControl($name, $desc['decorator']?? [], $desc['options']?? []);
+					$field = $parent->addControl($name, $desc['decorator'] ?? [], $desc['options'] ?? []);
 					
 					if ($default = $desc['default']) {
 						$field->set($default);
 					}
 					
-					if ($desc['display']?? false) {
+					if ($desc['display'] ?? false) {
 						$this->addControlDisplayRules([$name => $desc['display']]);
 					}
 					break;
 					
 				case 'group':
-					$seed = $desc['seed']?? [$name];
+					$seed = $desc['seed'] ?? [$name];
 					
 					$group = $parent->addGroup($seed);
 					
 					$this->addElements($desc['elements'], $group);
 					
-					if ($desc['display']?? false) {
+					if ($desc['display'] ?? false) {
 						$this->addGroupDisplayRules([$name => $desc['display']]);
 					}
 					break;
 					
 				case 'header':
-					$seed = $desc['seed']?? [$name];
+					$seed = $desc['seed'] ?? [$name];
 					
 					$parent->addHeader($seed);
 					break;
 					
 				case 'view':
-					$seed = $desc['seed']?? [Label::class, $name];
+					$seed = $desc['seed'] ?? [Label::class, $name];
 					
-					$region = $desc['region']?? null;
+					$region = $desc['region'] ?? null;
 					
 					$this->add($seed, $region);
 					break;
@@ -76,7 +76,7 @@ 
 	}
 	
 	public function addControlDisplayRules($controlDisplayRules) {
-		$this->setControlsDisplayRules(array_merge($this->controlDisplayRules?: [], $controlDisplayRules));
+		$this->setControlsDisplayRules(array_merge($this->controlDisplayRules ?: [], $controlDisplayRules));
 	}
 	
 	public function addGroupDisplayRules($groupDisplayRules) {
@@ -88,9 +88,9 @@ 
 	}
 	
 	public function addControlRules($field, $rules = []) {
-		if (! $rules) return;
+		if (!$rules) return;
 		
-		$this->controlRules[$field] = $rules['rules']?? [
+		$this->controlRules[$field] = $rules['rules'] ?? [
 				'identifier' => $field,
 				'rules' => $rules
 		];
@@ -110,17 +110,17 @@ 
 				'fields' => $this->controlRules
 		]);
 		
-		$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;
@@ -133,7 +133,7 @@ 
 	
 	public function confirmLeave($confirm = true)
 	{
-		$this->canLeave = ! $confirm;
+		$this->canLeave = !$confirm;
 		
 		return $this;
 	}

Braces +6 added lines, -2 removed lines

@@ -88,7 +88,9 @@ 
 	}
 	
 	public function addControlRules($field, $rules = []) {
-		if (! $rules) return;
+		if (! $rules) {
+			return;
+		}
 		
 		$this->controlRules[$field] = $rules['rules']?? [
 				'identifier' => $field,
@@ -113,7 +115,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/System/ModuleAdministration.php

Spacing +9 added lines, -9 removed lines

@@ -30,8 +30,8 @@ 
 	{
 		$modules = collect(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();
@@ -65,7 +65,7 @@ 
 
 			$section->add($label, 'title')->setStyle('float', 'right');
 			
-			$submodules = collect(ModuleManager::getAll())->filter(function ($subModuleClass) use ($moduleClass) {
+			$submodules = collect(ModuleManager::getAll())->filter(function($subModuleClass) use ($moduleClass) {
 				return $subModuleClass::isSubModuleOf($moduleClass);
 			});
 			
@@ -79,11 +79,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);
@@ -123,12 +123,12 @@ 
 					
 					$form = Form::addTo($view);
 					foreach ($recommended as $childModule) {
-						if (! ModuleManager::isAvailable($childModule)) continue;
+						if (!ModuleManager::isAvailable($childModule)) continue;
 						
 						$form->addControl($childModule::alias(), [\atk4\ui\Form\Control\Checkbox::class, 'caption' => $childModule::label()]);
 					}
 					
-					$form->onSubmit(function ($form) use ($moduleClass) {
+					$form->onSubmit(function($form) use ($moduleClass) {
 						ob_start();
 						ModuleManager::install($moduleClass, array_keys($form->getValues(), true));
 						
@@ -137,7 +137,7 @@ 
 				}
 				
 				\atk4\ui\Button::addTo($view, [__('Install'), 'primary'])->on('click', [
-						isset($form)? $form->submit(): $installCallback
+						isset($form) ? $form->submit() : $installCallback
 				]);
 			});
 			
@@ -163,7 +163,7 @@ 
 			];
 		});
 		
-		if ($dependents = ModuleManager::listDependents()[$moduleClass]?? []) {
+		if ($dependents = ModuleManager::listDependents()[$moduleClass] ?? []) {
 			$modal = \atk4\ui\Modal::addTo($this, ['title' => __(':module Module Installation', ['module' => $moduleClass::label()])])->set(function($view) use ($moduleClass, $dependents, $uninstallCallback) {
 				$message = \atk4\ui\Message::addTo($view, [__('Module is required by following modules')]);
 					

Braces +7 added lines, -4 removed lines

@@ -56,8 +56,7 @@ 
 				$this->addUninstallButton($section, $moduleClass);
 				
 // 				$this->addReinstallButton($section, $moduleClass);
-			}
-			else {
+			} else {
 				$label = [\atk4\ui\Label::class, __('Available'), 'yellow'];
 				
 				$this->addInstallButton($section, $moduleClass);
@@ -69,7 +68,9 @@ 
 				return $subModuleClass::isSubModuleOf($moduleClass);
 			});
 			
-			if ($submodules->isEmpty()) continue;
+			if ($submodules->isEmpty()) {
+				continue;
+			}
 			
 			$this->addAccordion($section, $submodules);
 		}
@@ -123,7 +124,9 @@ 
 					
 					$form = Form::addTo($view);
 					foreach ($recommended as $childModule) {
-						if (! ModuleManager::isAvailable($childModule)) continue;
+						if (! ModuleManager::isAvailable($childModule)) {
+							continue;
+						}
 						
 						$form->addControl($childModule::alias(), [\atk4\ui\Form\Control\Checkbox::class, 'caption' => $childModule::label()]);
 					}