x-systems / epesi-core

src/System/Integration/Modules/ModuleManager.php

Spacing +11 added lines, -11 removed lines

@@ -18,7 +18,7 @@ 
 
 	public static function isInstalled($classOrAlias)
 	{
-		return self::getClass($classOrAlias)? 1: 0;
+		return self::getClass($classOrAlias) ? 1 : 0;
 	}
 	
 	public static function isAvalable($classOrAlias)
@@ -33,7 +33,7 @@ 
 	 * @return string;
 	 */
 	public static function getClass($classOrAlias, $installed = false) {
-		$allModules = $installed? self::getInstalled(): self::getAll();
+		$allModules = $installed ? self::getInstalled() : self::getAll();
 		
 		if (collect($allModules)->contains($classOrAlias)) return $classOrAlias;
 		
@@ -48,7 +48,7 @@ 
 	public static function getInstalled()
 	{
 		return self::$installed = self::$installed?? self::getCached('epesi-modules-installed', function() {
-			$installedModules = Schema::hasTable('modules')? Module::pluck('class', 'alias'): collect();
+			$installedModules = Schema::hasTable('modules') ? Module::pluck('class', 'alias') : collect();
 			
 			// if epesi is not installed fake having the system module to enable its functionality
 			if ($installedModules->isEmpty()) {
@@ -66,7 +66,7 @@ 
 	 */
 	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 $moduleClass) {
 				$modules->add(['alias' => $moduleClass::alias(), 'class' => $moduleClass]);
@@ -85,7 +85,7 @@ 
 	 */
 	protected static function getCached($key, \Closure $default)
 	{
-		if (! Cache::has($key)) {
+		if (!Cache::has($key)) {
 			Cache::forever($key, $default());
 		}
 
@@ -109,13 +109,13 @@ 
 	 */
 	public static function collect($method, $args = [])
 	{
-		$args = is_array($args)? $args: [$args];
+		$args = is_array($args) ? $args : [$args];
 		
 		$ret = [];
 		foreach (self::getInstalled() 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;
@@ -134,7 +134,7 @@ 
 			return true;
 		}
 		
-		if (! $moduleClass = self::getClass($classOrAlias)) {			
+		if (!$moduleClass = self::getClass($classOrAlias)) {			
 			throw new \Exception('Module "' . $classOrAlias . '" could not be identified');
 		}
 		
@@ -186,10 +186,10 @@ 
 				$parentModule = $unsatisfiedDependencies[0];
 				
 				if (self::$processing[$moduleClass]?? false) {
-					throw new \Exception('Cross dependency: '. $moduleClass);
+					throw new \Exception('Cross dependency: ' . $moduleClass);
 				}
 				
-				if (! self::isAvalable($parentModule)) {
+				if (!self::isAvalable($parentModule)) {
 					throw new \Exception('Module not found: "' . $parentModule . '"');
 				}
 	

Braces +6 added lines, -2 removed lines

@@ -35,7 +35,9 @@ 
 	public static function getClass($classOrAlias, $installed = false) {
 		$allModules = $installed? self::getInstalled(): self::getAll();
 		
-		if (collect($allModules)->contains($classOrAlias)) return $classOrAlias;
+		if (collect($allModules)->contains($classOrAlias)) {
+			return $classOrAlias;
+		}
 		
 		return $allModules[$classOrAlias]?? null;
 	}
@@ -113,7 +115,9 @@ 
 		
 		$ret = [];
 		foreach (self::getInstalled() as $module) {
-			if (! $list = $module::$method(...$args)) continue;
+			if (! $list = $module::$method(...$args)) {
+				continue;
+			}
 			
 			$ret = array_merge($ret, is_array($list)? $list: [$list]);
 		}

src/System/Integration/Modules/PackageManifest.php

Indentation +160 added lines, -160 removed lines

@@ -7,166 +7,166 @@
 
 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) {
-    		return (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) {
+			return (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)->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)->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) {
+    	return collect($this->getManifest())->flatMap(function($configuration) {
     		return (array) ($configuration['modules'] ?? []);
     	})->filter()->all();
     }
@@ -93,7 +93,7 @@ 
             return $this->manifest;
         }
 
-        if (! file_exists($this->manifestPath)) {
+        if (!file_exists($this->manifestPath)) {
             $this->build();
         }
         
@@ -110,17 +110,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)->mapWithKeys(function ($package) {
+        $this->write(collect($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());
     }
@@ -133,7 +133,7 @@ 
      */
     protected function format($package)
     {
-        return str_replace($this->vendorPath.'/', '', $package);
+        return str_replace($this->vendorPath . '/', '', $package);
     }
 
     /**
@@ -143,12 +143,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'] ?? [];
     }
 
@@ -161,12 +161,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/Integration/Modules/ModuleView.php

Spacing +2 added lines, -2 removed lines

@@ -34,10 +34,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

@@ -34,10 +34,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/Integration/Modules/ModuleCore.php

Spacing +4 added lines, -4 removed lines

@@ -46,11 +46,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()
@@ -88,7 +88,7 @@ 
 	{
 		$paths = $this->migrations();
 		
-		foreach (is_array($paths)? $paths: [$paths] as $path) {
+		foreach (is_array($paths) ? $paths : [$paths] as $path) {
 			\Illuminate\Support\Facades\Artisan::call('migrate', ['--path' => $path]);
 		}
 	}
@@ -97,7 +97,7 @@ 
 	{
 		$paths = $this->migrations();
 		
-		foreach (is_array($paths)? $paths: [$paths] as $path) {
+		foreach (is_array($paths) ? $paths : [$paths] as $path) {
 			\Illuminate\Support\Facades\Artisan::call('migrate:rollback', ['--path' => $path]);
 		}
 	}

Braces +3 added lines, -1 removed lines

@@ -46,7 +46,9 @@
 	{
 		$templatesDir = static::path() . DIRECTORY_SEPARATOR . 'Templates';
 		
-		if (! is_dir($templatesDir)) return;
+		if (! is_dir($templatesDir)) {
+			return;
+		}
 		
 		$skinDir = $templatesDir . DIRECTORY_SEPARATOR . $skin;
 		

src/System/Integration/Modules/Concerns/HasLocation.php

Spacing +3 added lines, -3 removed lines

@@ -36,13 +36,13 @@
 			return $this;
 		}
 		
-		$this->label = is_array($this->label)? $this->label: [$this->label];
+		$this->label = is_array($this->label) ? $this->label : [$this->label];
 
 		$this->label = array_map('trans', $this->label);
 		
-		$this->location = is_array($this->location)? $this->location: [$this->location];
+		$this->location = is_array($this->location) ? $this->location : [$this->location];
 
-		return array_merge($this->label, $this->location?: []);
+		return array_merge($this->label, $this->location ?: []);
 	}
 	
 	public function label($label)

src/System/Integration/Modules/Concerns/HasLinks.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
 	{
 		$defaultView = self::module()::view();
 		
-		$viewClass = is_a(static::class, ModuleView::class, true)? static::class: $defaultView;
+		$viewClass = is_a(static::class, ModuleView::class, true) ? static::class : $defaultView;
 		
 		if ($viewClass == $defaultView) $viewClass = null;
 		
@@ -38,7 +38,7 @@ 
 	 */
 	final public static function moduleLink($module, $method = 'body', $args = [])
 	{
-		$alias = class_exists($module)? $module::alias(): $module;
+		$alias = class_exists($module) ? $module::alias() : $module;
 		
 		return url(implode('/', ['view', $alias, $method, self::encodeArgs($args)]));
 	}
@@ -52,13 +52,13 @@ 
 	 * @throws \Illuminate\Http\Exceptions\HttpResponseException
 	 */
 	final public static function decodeArgs($hash) {
-		if (! $hash) return [];
+		if (!$hash) return [];
 		
 		$args = session($hash);
 
 		if (is_null($args)) abort(419);
 		
-		return is_array($args)? $args: [$args];
+		return is_array($args) ? $args : [$args];
 	}
 	
 	/**
@@ -68,9 +68,9 @@ 
 	 * @return string
 	 */
 	final public static function encodeArgs($args) {
-		$args = is_array($args)? $args: [$args];
+		$args = is_array($args) ? $args : [$args];
 		
-		if (! $args) return;
+		if (!$args) return;
 		
 		$hash = md5(serialize($args));
 		

Braces +12 added lines, -4 removed lines

@@ -21,7 +21,9 @@ 
 		
 		$viewClass = is_a(static::class, ModuleView::class, true)? static::class: $defaultView;
 		
-		if ($viewClass == $defaultView) $viewClass = null;
+		if ($viewClass == $defaultView) {
+			$viewClass = null;
+		}
 		
 		return url(implode('/', ['view', implode('_', array_filter([self::alias(), $viewClass])), $method, self::encodeArgs($args)]));
 	}
@@ -52,11 +54,15 @@ 
 	 * @throws \Illuminate\Http\Exceptions\HttpResponseException
 	 */
 	final public static function decodeArgs($hash) {
-		if (! $hash) return [];
+		if (! $hash) {
+			return [];
+		}
 		
 		$args = session($hash);
 
-		if (is_null($args)) abort(419);
+		if (is_null($args)) {
+			abort(419);
+		}
 		
 		return is_array($args)? $args: [$args];
 	}
@@ -70,7 +76,9 @@ 
 	final public static function encodeArgs($args) {
 		$args = is_array($args)? $args: [$args];
 		
-		if (! $args) return;
+		if (! $args) {
+			return;
+		}
 		
 		$hash = md5(serialize($args));
 		

src/System/Integration/Modules/Concerns/Notifies.php

Spacing +3 added lines, -3 removed lines

@@ -6,16 +6,16 @@
 {
 	public function notify($options, $attachTo = null)
 	{
-		$options = array_merge(['duration'=> 1500], is_array($options)? $options: ['content' => $options]);
+		$options = array_merge(['duration'=> 1500], is_array($options) ? $options : ['content' => $options]);
 		
-		$attachTo = $attachTo?: $this;
+		$attachTo = $attachTo ?: $this;
 		
 		return (new \atk4\ui\jsNotify($options, $attachTo));
 	}
 	
 	public function notifyError($options, $attachTo = null)
 	{
-		$options = array_merge(['color' => 'red'], is_array($options)? $options: ['content' => $options]);
+		$options = array_merge(['color' => 'red'], is_array($options) ? $options : ['content' => $options]);
 		
 		return $this->notify($options, $attachTo);
 	}

src/System/Integration/Modules/Concerns/HasPackageManifest.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 	
 	final public static function packageManifest()
 	{
-		return self::$packageManifest = self::$packageManifest?: new PackageManifest(new Filesystem(), app()->basePath(), self::getCachedManifestPath());
+		return self::$packageManifest = self::$packageManifest ?: new PackageManifest(new Filesystem(), app()->basePath(), self::getCachedManifestPath());
 	}
 	
 	final public static function getCachedManifestPath()

src/System/Integration/Modules/Concerns/HasAssetsAccess.php

Spacing +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 	}
 	
 	final public static function requireJS($file = 'default.js', $isAsync = false, $isDefer = false) {
-		return epesi()->requireJS(self::assetUrl('js/'. $file), $isAsync, $isDefer);
+		return epesi()->requireJS(self::assetUrl('js/' . $file), $isAsync, $isDefer);
 	}
 	
 	final public static function requireCSS($file = 'default.css') {
-		return epesi()->requireCSS(self::assetUrl('css/'. $file));
+		return epesi()->requireCSS(self::assetUrl('css/' . $file));
 	}
 	
 	/**