x-systems / epesi-core

src/Controller.php

Indentation +42 added lines, -42 removed lines

@@ -11,64 +11,64 @@
 
 class Controller extends BaseController
 {
-    public function index()
-    {
-    	return SystemCore::isInstalled()? redirect('home'): redirect('install');
-    }
+	public function index()
+	{
+		return SystemCore::isInstalled()? redirect('home'): redirect('install');
+	}
     
-    public function install(UI $ui)
-    {
-    	// make sure the installation information is fresh
-    	ModuleManager::clearCache();
+	public function install(UI $ui)
+	{
+		// make sure the installation information is fresh
+		ModuleManager::clearCache();
     	
-    	if (SystemCore::isInstalled()) return redirect('home');
+		if (SystemCore::isInstalled()) return redirect('home');
     	
-    	$ui->title = __(':epesi > Installation', ['epesi' => config('epesi.ui.title')]);
+		$ui->title = __(':epesi > Installation', ['epesi' => config('epesi.ui.title')]);
     	
-    	$ui->initLayout(new Layout\Centered());
+		$ui->initLayout(new Layout\Centered());
     	
-    	$ui->layout->set('logo', url('logo'));
-    	$ui->layout->template->dangerouslySetHTML('copyright', config('epesi.ui.copyright'));
+		$ui->layout->set('logo', url('logo'));
+		$ui->layout->template->dangerouslySetHTML('copyright', config('epesi.ui.copyright'));
     	
-    	$ui->add(new \Epesi\Core\System\SystemInstallWizard());
+		$ui->add(new \Epesi\Core\System\SystemInstallWizard());
     	
-    	return $ui->response();
-    }
+		return $ui->response();
+	}
     
-    public function home()
-    {
-    	return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\Models\HomePage::pathOfUser(): 'install');
-    }
+	public function home()
+	{
+		return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\Models\HomePage::pathOfUser(): 'install');
+	}
     
-    public function logo()
-    { 
-    	$logoFile = \Epesi\Core\System\Logo\LogoSettings::getLogoFile();
+	public function logo()
+	{ 
+		$logoFile = \Epesi\Core\System\Logo\LogoSettings::getLogoFile();
 
-    	return response(File::get($logoFile), 200, ['Content-type' => File::mimeType($logoFile)])->setMaxAge(604800)->setPublic();
-    }
+		return response(File::get($logoFile), 200, ['Content-type' => File::mimeType($logoFile)])->setMaxAge(604800)->setPublic();
+	}
     
-    public function view(UI $ui, $module, $method = 'body', $args = [])
-    {
-    	$ui->initLayout(new LayoutView());
+	public function view(UI $ui, $module, $method = 'body', $args = [])
+	{
+		$ui->initLayout(new LayoutView());
     	
-    	$alias = explode(':', $module);
+		$alias = explode(':', $module);
     	
-    	$moduleAlias = $alias[0];
-    	$viewAlias = $alias[1]?? null;
+		$moduleAlias = $alias[0];
+		$viewAlias = $alias[1]?? null;
     	
-    	$view = null;
-    	if ($module = ModuleManager::getClass($moduleAlias, true)) {
-    		$viewClass = $module::view($viewAlias);
+		$view = null;
+		if ($module = ModuleManager::getClass($moduleAlias, true)) {
+			$viewClass = $module::view($viewAlias);
 
-    		if (class_exists($viewClass)) {
-    			$view = [$viewClass];
-    		}
-    	}
+			if (class_exists($viewClass)) {
+				$view = [$viewClass];
+			}
+		}
 
-    	if (! $view) abort(404);
+		if (! $view) abort(404);
     	
-    	$location = $ui->add($view)->displayModuleContent($method, $args)->location();
+		$location = $ui->add($view)->displayModuleContent($method, $args)->location();
     	
-    	return $ui->setLocation($location)->response();
-    }
+		return $ui->setLocation($location)->response();
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,7 @@ 
 {
     public function index()
     {
-    	return SystemCore::isInstalled()? redirect('home'): redirect('install');
+    	return SystemCore::isInstalled() ? redirect('home') : redirect('install');
     }
     
     public function install(UI $ui)
@@ -37,7 +37,7 @@ 
     
     public function home()
     {
-    	return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\Models\HomePage::pathOfUser(): 'install');
+    	return redirect(SystemCore::isInstalled() ? \Epesi\Core\HomePage\Models\HomePage::pathOfUser() : 'install');
     }
     
     public function logo()
@@ -54,7 +54,7 @@ 
     	$alias = explode(':', $module);
     	
     	$moduleAlias = $alias[0];
-    	$viewAlias = $alias[1]?? null;
+    	$viewAlias = $alias[1] ?? null;
     	
     	$view = null;
     	if ($module = ModuleManager::getClass($moduleAlias, true)) {
@@ -65,7 +65,7 @@ 
     		}
     	}
 
-    	if (! $view) abort(404);
+    	if (!$view) abort(404);
     	
     	$location = $ui->add($view)->displayModuleContent($method, $args)->location();
     	

Braces +6 added lines, -2 removed lines

@@ -21,7 +21,9 @@ 
     	// make sure the installation information is fresh
     	ModuleManager::clearCache();
     	
-    	if (SystemCore::isInstalled()) return redirect('home');
+    	if (SystemCore::isInstalled()) {
+    		return redirect('home');
+    	}
     	
     	$ui->title = __(':epesi > Installation', ['epesi' => config('epesi.ui.title')]);
     	
@@ -65,7 +67,9 @@ 
     		}
     	}
 
-    	if (! $view) abort(404);
+    	if (! $view) {
+    		abort(404);
+    	}
     	
     	$location = $ui->add($view)->displayModuleContent($method, $args)->location();
     	

src/System/ModuleAdministration.php

Indentation +8 added lines, -8 removed lines

@@ -42,7 +42,7 @@ 
 		$accordion = \atk4\ui\Accordion::addTo($container, ['type' => ['styled', 'fluid'], 'settings' => ['animateChildren' => false]])->setStyle(['max-width' => '800px', 'margin-left' => 'auto', 'margin-right' => 'auto']);
 		
 		if ($container == $this) {
-		    $this->accordion = $accordion;
+			$this->accordion = $accordion;
 		}
 		
 		foreach ($modules as $moduleClass) {
@@ -100,8 +100,8 @@ 
 			$message = ob_get_clean();
 			
 			return [
-			        $this->notifySuccess($message),
-			        new \atk4\ui\JsReload($this->accordion),
+					$this->notifySuccess($message),
+					new \atk4\ui\JsReload($this->accordion),
 			];
 		});
 		
@@ -152,14 +152,14 @@ 
 		$button = \atk4\ui\Button::addTo($container, [__('Uninstall'), 'class' => ['red']]);
 	    
 		$callback = $uninstallCallback = \atk4\ui\JsCallback::addTo($button, ['confirm' => __('Are you sure you want to uninstall :module', ['module' => $moduleClass::label()])])->set(function() use ($moduleClass) {
-		    ob_start();
+			ob_start();
 			ModuleManager::uninstall($moduleClass);
 			
 			$message = ob_get_clean();
 			
 			return [
-			        $this->notifySuccess($message),
-			        new \atk4\ui\JsReload($this->accordion),
+					$this->notifySuccess($message),
+					new \atk4\ui\JsReload($this->accordion),
 			];
 		});
 		
@@ -194,12 +194,12 @@ 
 	
 	public function addClearCacheButton()
 	{
-	    ActionBar::addItemButton([__('Clear Cache'), 'icon' => 'refresh', 'hint' => __('Clears module cache and re-discovers all available modules')])->callback(function($callback) {
+		ActionBar::addItemButton([__('Clear Cache'), 'icon' => 'refresh', 'hint' => __('Clears module cache and re-discovers all available modules')])->callback(function($callback) {
 			ModuleManager::clearCache();
 			
 			return [
 					new \atk4\ui\JsReload($this->accordion),
-			        $this->notifySuccess(__('Cache cleared!'))
+					$this->notifySuccess(__('Cache cleared!'))
 			];
 		});
 	}

Spacing +9 added lines, -9 removed lines

@@ -30,8 +30,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();
@@ -65,7 +65,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);
 			});
 			
@@ -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(), ['CheckBox', '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(), ['CheckBox', 'caption' => $childModule::label()]);
 					}

src/System/Logo/LogoSettings.php

Indentation +3 added lines, -3 removed lines

@@ -34,8 +34,8 @@ 
 		$form->addControl('custom_logo', ['CheckBox', 'caption' => __('Use custom logo')]);
 		
 		$form->model->set([
-		        'title' => Variable::recall('system.title'),
-		        'custom_logo' => (bool) Variable::recall('system.logo')
+				'title' => Variable::recall('system.title'),
+				'custom_logo' => (bool) Variable::recall('system.logo')
 		]);
 		
 		$logo = $form->addControl('logo', [
@@ -76,7 +76,7 @@ 
 				$storage->move($from, $to);
 			}
 
-	        Variable::memorize('system.logo', $logo);
+			Variable::memorize('system.logo', $logo);
 			
 			Variable::memorize('system.title', $form->model['title']);
 			

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 	public function body()
 	{
 		$layout = View::addTo($this)->addStyle('max-width:1200px;margin:auto;');
-		\atk4\ui\Header::addTo($layout, [ __($this->label)]);
+		\atk4\ui\Header::addTo($layout, [__($this->label)]);
 		$segment = View::addTo($layout, ['ui' => 'segment']);
 
 		$form = Form::addTo($segment);
@@ -53,7 +53,7 @@ 
 			$logo->setThumbnailSrc(asset('storage/' . self::alias() . '/' . self::$defaultLogo));
 		});
 
-		$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'];
@@ -64,7 +64,7 @@ 
 		});
 					
 		$form->onSubmit(function($form) {
-			if ($logo = $form->model['custom_logo']? $form->model['logo']: null) {
+			if ($logo = $form->model['custom_logo'] ? $form->model['logo'] : null) {
 				$storage = $this->storage();
 				$from = self::alias() . '/tmp/' . $logo;
 				$to = self::alias() . '/' . $logo;				

src/System/View/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(): void
-    {
-        $this->addIcon();
+	public function renderView(): void
+	{
+		$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 = JsCallback::addTo($this)->set($callable);
-    	}
+		if (is_callable($callable)) {
+			$callable = JsCallback::addTo($this)->set($callable);
+		}
     	
-    	if ($callable instanceof JsCallback) {
-    		$this->on('click', $callable);
-    	}
+		if ($callable instanceof JsCallback) {
+			$this->on('click', $callable);
+		}
     	
-    	return $this;
-    }
+		return $this;
+	}
 
 }

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 = JsCallback::addTo($this)->set($callable);

src/System/Modules/ModuleView.php

Spacing +2 added lines, -2 removed lines

@@ -28,10 +28,10 @@
 	final public function displayModuleContent($method, $args)
 	{
 		// if method not callbale abort to 'not found'
-		if (! is_callable([$this, $method])) abort(404);
+		if (!is_callable([$this, $method])) abort(404);
 		
 		// if user has no access abort 'no access'
-		if (! $this->access()) abort(401);
+		if (!$this->access()) abort(401);
 		
 		$args = $this->decodeArgs($args);
 		

Braces +6 added lines, -2 removed lines

@@ -28,10 +28,14 @@
 	final public function displayModuleContent($method, $args)
 	{
 		// if method not callbale abort to 'not found'
-		if (! is_callable([$this, $method])) abort(404);
+		if (! is_callable([$this, $method])) {
+			abort(404);
+		}
 		
 		// if user has no access abort 'no access'
-		if (! $this->access()) abort(401);
+		if (! $this->access()) {
+			abort(401);
+		}
 		
 		$args = $this->decodeArgs($args);
 		

src/System/Modules/Concerns/Notifies.php

Indentation +15 added lines, -15 removed lines

@@ -4,24 +4,24 @@
 
 trait Notifies
 {
-    public function notify($options)
-    {
-        $options = array_merge(['duration'=> 1500], is_array($options)? $options: ['message' => $options]);
+	public function notify($options)
+	{
+		$options = array_merge(['duration'=> 1500], is_array($options)? $options: ['message' => $options]);
 
-        return new \atk4\ui\JsToast($options);
-    }
+		return new \atk4\ui\JsToast($options);
+	}
     
-    public function notifySuccess($options)
-    {
-        $options = array_merge(['class' => 'success'], is_array($options)? $options: ['message' => $options]);
+	public function notifySuccess($options)
+	{
+		$options = array_merge(['class' => 'success'], is_array($options)? $options: ['message' => $options]);
         
-        return $this->notify($options);
-    }
+		return $this->notify($options);
+	}
     
-    public function notifyError($options)
-    {
-        $options = array_merge(['class' => 'error'], is_array($options)? $options: ['message' => $options]);
+	public function notifyError($options)
+	{
+		$options = array_merge(['class' => 'error'], is_array($options)? $options: ['message' => $options]);
         
-        return $this->notify($options);
-    }
+		return $this->notify($options);
+	}
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -6,21 +6,21 @@
 {
     public function notify($options)
     {
-        $options = array_merge(['duration'=> 1500], is_array($options)? $options: ['message' => $options]);
+        $options = array_merge(['duration'=> 1500], is_array($options) ? $options : ['message' => $options]);
 
         return new \atk4\ui\JsToast($options);
     }
     
     public function notifySuccess($options)
     {
-        $options = array_merge(['class' => 'success'], is_array($options)? $options: ['message' => $options]);
+        $options = array_merge(['class' => 'success'], is_array($options) ? $options : ['message' => $options]);
         
         return $this->notify($options);
     }
     
     public function notifyError($options)
     {
-        $options = array_merge(['class' => 'error'], is_array($options)? $options: ['message' => $options]);
+        $options = array_merge(['class' => 'error'], is_array($options) ? $options : ['message' => $options]);
         
         return $this->notify($options);
     }

src/System/Modules/PackageManifest.php

Indentation +162 added lines, -162 removed lines

@@ -7,168 +7,168 @@
 
 class PackageManifest
 {
-    /**
-     * The filesystem instance.
-     *
-     * @var \Illuminate\Filesystem\Filesystem
-     */
-    public $files;
-
-    /**
-     * The base path.
-     *
-     * @var string
-     */
-    public $basePath;
-
-    /**
-     * The vendor path.
-     *
-     * @var string
-     */
-    public $vendorPath;
-
-    /**
-     * The manifest path.
-     *
-     * @var string|null
-     */
-    public $manifestPath;
-
-    /**
-     * The loaded manifest array.
-     *
-     * @var array
-     */
-    public $manifest;
-
-    /**
-     * Create a new package manifest instance.
-     *
-     * @param  \Illuminate\Filesystem\Filesystem  $files
-     * @param  string  $basePath
-     * @param  string  $manifestPath
-     * @return void
-     */
-    public function __construct(Filesystem $files, $basePath, $manifestPath)
-    {
-        $this->files = $files;
-        $this->basePath = $basePath;
-        $this->manifestPath = $manifestPath;
-        $this->vendorPath = $basePath.'/vendor';
-    }
-
-    /**
-     * Get all of the integrator class names for all packages.
-     *
-     * @return array
-     */
-    public function joints()
-    {
-        return collect($this->getManifest())->flatMap(function ($configuration) {
-            return (array) ($configuration['joints'] ?? []);
-        })->filter()->all();
-    }
+	/**
+	 * The filesystem instance.
+	 *
+	 * @var \Illuminate\Filesystem\Filesystem
+	 */
+	public $files;
+
+	/**
+	 * The base path.
+	 *
+	 * @var string
+	 */
+	public $basePath;
+
+	/**
+	 * The vendor path.
+	 *
+	 * @var string
+	 */
+	public $vendorPath;
+
+	/**
+	 * The manifest path.
+	 *
+	 * @var string|null
+	 */
+	public $manifestPath;
+
+	/**
+	 * The loaded manifest array.
+	 *
+	 * @var array
+	 */
+	public $manifest;
+
+	/**
+	 * Create a new package manifest instance.
+	 *
+	 * @param  \Illuminate\Filesystem\Filesystem  $files
+	 * @param  string  $basePath
+	 * @param  string  $manifestPath
+	 * @return void
+	 */
+	public function __construct(Filesystem $files, $basePath, $manifestPath)
+	{
+		$this->files = $files;
+		$this->basePath = $basePath;
+		$this->manifestPath = $manifestPath;
+		$this->vendorPath = $basePath.'/vendor';
+	}
+
+	/**
+	 * Get all of the integrator class names for all packages.
+	 *
+	 * @return array
+	 */
+	public function joints()
+	{
+		return collect($this->getManifest())->flatMap(function ($configuration) {
+			return (array) ($configuration['joints'] ?? []);
+		})->filter()->all();
+	}
     
-    /**
-     * Get all of the module declared for all packages.
-     *
-     * @return array
-     */
-    public function modules()
-    {
-    	return collect($this->getManifest())->flatMap(function ($configuration, $package) {
-    		return array_map(function($moduleRelativePath) use ($package) {
-    			return str_ireplace('/', DIRECTORY_SEPARATOR, implode('/', [$this->vendorPath, $package, $moduleRelativePath]));
-    		}, (array) ($configuration['modules'] ?? []));
-    	})->filter()->all();
-    }
-
-    /**
-     * Get the current package manifest.
-     *
-     * @return array
-     */
-    protected function getManifest()
-    {
-        if (isset($this->manifest)) {
-            return $this->manifest;
-        }
-
-        if (! file_exists($this->manifestPath)) {
-            $this->build();
-        }
+	/**
+	 * Get all of the module declared for all packages.
+	 *
+	 * @return array
+	 */
+	public function modules()
+	{
+		return collect($this->getManifest())->flatMap(function ($configuration, $package) {
+			return array_map(function($moduleRelativePath) use ($package) {
+				return str_ireplace('/', DIRECTORY_SEPARATOR, implode('/', [$this->vendorPath, $package, $moduleRelativePath]));
+			}, (array) ($configuration['modules'] ?? []));
+		})->filter()->all();
+	}
+
+	/**
+	 * Get the current package manifest.
+	 *
+	 * @return array
+	 */
+	protected function getManifest()
+	{
+		if (isset($this->manifest)) {
+			return $this->manifest;
+		}
+
+		if (! file_exists($this->manifestPath)) {
+			$this->build();
+		}
         
-        return $this->manifest = file_exists($this->manifestPath) ?
-            $this->files->getRequire($this->manifestPath) : [];
-    }
-
-    /**
-     * Build the manifest and write it to disk.
-     *
-     * @return void
-     */
-    public function build()
-    {
-        $packages = [];
-
-        if ($this->files->exists($path = $this->vendorPath.'/composer/installed.json')) {
-            $packages = json_decode($this->files->get($path), true);
-        }
-
-        $ignoreAll = in_array('*', $ignore = $this->packagesToIgnore());
-
-        $this->write(collect($packages['packages'])->mapWithKeys(function ($package) {
-            return [$this->format($package['name']) => $package['extra']['epesi'] ?? []];
-        })->each(function ($configuration) use (&$ignore) {
-            $ignore = array_merge($ignore, $configuration['dont-discover'] ?? []);
-        })->reject(function ($configuration, $package) use ($ignore, $ignoreAll) {
-            return $ignoreAll || in_array($package, $ignore);
-        })->filter()->all());
-    }
-
-    /**
-     * Format the given package name.
-     *
-     * @param  string  $package
-     * @return string
-     */
-    protected function format($package)
-    {
-        return str_replace($this->vendorPath.'/', '', $package);
-    }
-
-    /**
-     * Get all of the package names that should be ignored.
-     *
-     * @return array
-     */
-    protected function packagesToIgnore()
-    {
-        if (! file_exists($this->basePath.'/composer.json')) {
-            return [];
-        }
-
-        return json_decode(file_get_contents(
-            $this->basePath.'/composer.json'
-        ), true)['extra']['epesi']['dont-discover'] ?? [];
-    }
-
-    /**
-     * Write the given manifest array to disk.
-     *
-     * @param  array  $manifest
-     * @return void
-     * @throws \Exception
-     */
-    protected function write(array $manifest)
-    {
-        if (! is_writable(dirname($this->manifestPath))) {
-            throw new Exception('The '.dirname($this->manifestPath).' directory must be present and writable.');
-        }
-
-        $this->files->put(
-            $this->manifestPath, '<?php return '.var_export($manifest, true).';'
-        );
-    }
+		return $this->manifest = file_exists($this->manifestPath) ?
+			$this->files->getRequire($this->manifestPath) : [];
+	}
+
+	/**
+	 * Build the manifest and write it to disk.
+	 *
+	 * @return void
+	 */
+	public function build()
+	{
+		$packages = [];
+
+		if ($this->files->exists($path = $this->vendorPath.'/composer/installed.json')) {
+			$packages = json_decode($this->files->get($path), true);
+		}
+
+		$ignoreAll = in_array('*', $ignore = $this->packagesToIgnore());
+
+		$this->write(collect($packages['packages'])->mapWithKeys(function ($package) {
+			return [$this->format($package['name']) => $package['extra']['epesi'] ?? []];
+		})->each(function ($configuration) use (&$ignore) {
+			$ignore = array_merge($ignore, $configuration['dont-discover'] ?? []);
+		})->reject(function ($configuration, $package) use ($ignore, $ignoreAll) {
+			return $ignoreAll || in_array($package, $ignore);
+		})->filter()->all());
+	}
+
+	/**
+	 * Format the given package name.
+	 *
+	 * @param  string  $package
+	 * @return string
+	 */
+	protected function format($package)
+	{
+		return str_replace($this->vendorPath.'/', '', $package);
+	}
+
+	/**
+	 * Get all of the package names that should be ignored.
+	 *
+	 * @return array
+	 */
+	protected function packagesToIgnore()
+	{
+		if (! file_exists($this->basePath.'/composer.json')) {
+			return [];
+		}
+
+		return json_decode(file_get_contents(
+			$this->basePath.'/composer.json'
+		), true)['extra']['epesi']['dont-discover'] ?? [];
+	}
+
+	/**
+	 * Write the given manifest array to disk.
+	 *
+	 * @param  array  $manifest
+	 * @return void
+	 * @throws \Exception
+	 */
+	protected function write(array $manifest)
+	{
+		if (! is_writable(dirname($this->manifestPath))) {
+			throw new Exception('The '.dirname($this->manifestPath).' directory must be present and writable.');
+		}
+
+		$this->files->put(
+			$this->manifestPath, '<?php return '.var_export($manifest, true).';'
+		);
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -55,7 +55,7 @@ 
         $this->files = $files;
         $this->basePath = $basePath;
         $this->manifestPath = $manifestPath;
-        $this->vendorPath = $basePath.'/vendor';
+        $this->vendorPath = $basePath . '/vendor';
     }
 
     /**
@@ -65,7 +65,7 @@ 
      */
     public function joints()
     {
-        return collect($this->getManifest())->flatMap(function ($configuration) {
+        return collect($this->getManifest())->flatMap(function($configuration) {
             return (array) ($configuration['joints'] ?? []);
         })->filter()->all();
     }
@@ -77,7 +77,7 @@ 
      */
     public function modules()
     {
-    	return collect($this->getManifest())->flatMap(function ($configuration, $package) {
+    	return collect($this->getManifest())->flatMap(function($configuration, $package) {
     		return array_map(function($moduleRelativePath) use ($package) {
     			return str_ireplace('/', DIRECTORY_SEPARATOR, implode('/', [$this->vendorPath, $package, $moduleRelativePath]));
     		}, (array) ($configuration['modules'] ?? []));
@@ -95,7 +95,7 @@ 
             return $this->manifest;
         }
 
-        if (! file_exists($this->manifestPath)) {
+        if (!file_exists($this->manifestPath)) {
             $this->build();
         }
         
@@ -112,17 +112,17 @@ 
     {
         $packages = [];
 
-        if ($this->files->exists($path = $this->vendorPath.'/composer/installed.json')) {
+        if ($this->files->exists($path = $this->vendorPath . '/composer/installed.json')) {
             $packages = json_decode($this->files->get($path), true);
         }
 
         $ignoreAll = in_array('*', $ignore = $this->packagesToIgnore());
 
-        $this->write(collect($packages['packages'])->mapWithKeys(function ($package) {
+        $this->write(collect($packages['packages'])->mapWithKeys(function($package) {
             return [$this->format($package['name']) => $package['extra']['epesi'] ?? []];
-        })->each(function ($configuration) use (&$ignore) {
+        })->each(function($configuration) use (&$ignore) {
             $ignore = array_merge($ignore, $configuration['dont-discover'] ?? []);
-        })->reject(function ($configuration, $package) use ($ignore, $ignoreAll) {
+        })->reject(function($configuration, $package) use ($ignore, $ignoreAll) {
             return $ignoreAll || in_array($package, $ignore);
         })->filter()->all());
     }
@@ -135,7 +135,7 @@ 
      */
     protected function format($package)
     {
-        return str_replace($this->vendorPath.'/', '', $package);
+        return str_replace($this->vendorPath . '/', '', $package);
     }
 
     /**
@@ -145,12 +145,12 @@ 
      */
     protected function packagesToIgnore()
     {
-        if (! file_exists($this->basePath.'/composer.json')) {
+        if (!file_exists($this->basePath . '/composer.json')) {
             return [];
         }
 
         return json_decode(file_get_contents(
-            $this->basePath.'/composer.json'
+            $this->basePath . '/composer.json'
         ), true)['extra']['epesi']['dont-discover'] ?? [];
     }
 
@@ -163,12 +163,12 @@ 
      */
     protected function write(array $manifest)
     {
-        if (! is_writable(dirname($this->manifestPath))) {
-            throw new Exception('The '.dirname($this->manifestPath).' directory must be present and writable.');
+        if (!is_writable(dirname($this->manifestPath))) {
+            throw new Exception('The ' . dirname($this->manifestPath) . ' directory must be present and writable.');
         }
 
         $this->files->put(
-            $this->manifestPath, '<?php return '.var_export($manifest, true).';'
+            $this->manifestPath, '<?php return ' . var_export($manifest, true) . ';'
         );
     }
 }

src/System/User/Access/AccessSettings.php

Spacing +4 added lines, -4 removed lines

@@ -37,7 +37,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;
@@ -101,19 +101,19 @@ 
 	
 	protected function columns()
 	{
-		return $this->columns = $this->columns?: Columns::addTo($this);
+		return $this->columns = $this->columns ?: Columns::addTo($this);
 	}
 	
 	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 \atk4\ui\JsReload($columns, [$columns->name => $permissionExpression?: '']);
+		return $this->reload = $this->reload ?: new \atk4\ui\JsReload($columns, [$columns->name => $permissionExpression ?: '']);
 	}
 	
 	protected function getModel($array)

src/System/SystemInstallWizard.php

Spacing +5 added lines, -5 removed lines

@@ -80,7 +80,7 @@ 
 		
 		$form->addControl('language', [\atk4\ui\Form\Control\Dropdown::class, 'values' => $values, 'caption' => __('Select Language'), 'iconLeft' => 'globe'], ['required'=>true])->set($wizard->recall('language', 'en'));
 		
-		$form->onSubmit(function ($form) use ($wizard) {
+		$form->onSubmit(function($form) use ($wizard) {
 			$wizard->memorize('language', $form->model->get('language'));
 			
 			App::setLocale($form->model->get('language'));
@@ -112,7 +112,7 @@ 
 		$form->addControl('support', [\atk4\ui\Form\Control\Checkbox::class, 'caption' => __('I will not remove "Support -> About" credit page from the application menu.')], ['required'=>true]);
 		$form->addControl('store', [\atk4\ui\Form\Control\Checkbox::class, 'caption' => __('I will not remove or rename ":epesi Store" links from the application.', ['epesi' => config('epesi.ui.title')])], ['required'=>true]);
 		
-		$form->onSubmit(function ($form) use ($wizard) {
+		$form->onSubmit(function($form) use ($wizard) {
 			return $wizard->jsNext();
 		});
 			
@@ -140,12 +140,12 @@ 
 		$form->addControl('create', [\atk4\ui\Form\Control\Checkbox::class, 'caption' => __('Create New Database')])->on('change', new \atk4\ui\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);
@@ -193,7 +193,7 @@ 
 		
 		$form->model->setMulti($wizard->recall('user', []));
 		
-		$form->validate(function ($form) use ($wizard) {
+		$form->validate(function($form) use ($wizard) {
 			$wizard->memorize('user', $form->model->get());
 			
 			return $wizard->jsNext();

Braces +3 added lines, -1 removed lines

@@ -140,7 +140,9 @@
 		$form->addControl('create', [\atk4\ui\Form\Control\Checkbox::class, 'caption' => __('Create New Database')])->on('change', new \atk4\ui\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);
 		}