x-systems / epesi-core

src/System/Modules/ModuleCore.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
 	 * Label of the module
 	 */
 	public static function label() {
-		return static::$label?: ucwords(str_ireplace('.', ' ', static::alias()));
+		return static::$label ?: ucwords(str_ireplace('.', ' ', static::alias()));
 	}
 	
 	/**
@@ -76,11 +76,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()

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/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)->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, $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)->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());
     }
@@ -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/Modules/ModuleJoint.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 			 */
 			$joint = new $class();
 
-			if (! $joint->access()) continue;
+			if (!$joint->access()) continue;
 			
 			$ret->add($joint);
 		}

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
 			 */
 			$joint = new $class();
 
-			if (! $joint->access()) continue;
+			if (! $joint->access()) {
+				continue;
+			}
 			
 			$ret->add($joint);
 		}

src/System/Modules/Concerns/HasModule.php

Braces +3 added lines, -1 removed lines

@@ -16,7 +16,9 @@
 	{
 		$class = self::namespace() . '\\' . ($alias? Str::studly($alias): (static::name() . 'View'));
 		
-		if ($alias) return $class;
+		if ($alias) {
+			return $class;
+		}
 		
 		return static::$view?: $class;
 	}

Spacing +4 added lines, -4 removed lines

@@ -14,11 +14,11 @@ 
 	 */
 	final public static function view($alias = null)
 	{
-		$class = self::namespace() . '\\' . ($alias? Str::studly($alias): (static::name() . 'View'));
+		$class = self::namespace() . '\\' . ($alias ? Str::studly($alias) : (static::name() . 'View'));
 		
 		if ($alias) return $class;
 		
-		return static::$view?: $class;
+		return static::$view ?: $class;
 	}
 	
 	/**
@@ -32,7 +32,7 @@ 
 			throw new \Exception('Undefined alias in module core class ' . static::class);
 		}
 		
-		return static::$alias?? static::module()::alias();
+		return static::$alias ?? static::module()::alias();
 	}
 	
 	/**
@@ -65,7 +65,7 @@ 
 	{
 		$names = array_slice(explode('\\', static::class), -2, -1);
 		
-		return $names? reset($names): '';
+		return $names ? reset($names) : '';
 	}
 	
 	/**

src/System/Modules/Concerns/HasLaunchButton.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	{
 		$link = $this->link();
 		
-		$link = is_array($link)? ModuleView::moduleLink(...$link): $link;
+		$link = is_array($link) ? ModuleView::moduleLink(...$link) : $link;
 		
 		return (new LaunchButton([
 				'label' => $this->label(),

src/System/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/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/Concerns/HasMigrations.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,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, '--force' => true]);
 		}
 		
@@ -31,7 +31,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]);
 		}
 		

src/System/Modules/Concerns/HasLinks.php

Indentation +2 added lines, -2 removed lines

@@ -48,8 +48,8 @@
 		$alias = class_exists($module)? $module::alias(): $module;
 		
 		if (is_array($method) && !$args) {
-		    $args = $method;
-		    $method = 'body';
+			$args = $method;
+			$method = 'body';
 		}
 		
 		return url(implode('/', ['view', $alias, $method, self::encodeArgs($args)]));

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,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;
 		
 		$viewAlias = null;
 		if ($viewClass !== $defaultView) {
@@ -45,7 +45,7 @@ 
 	 */
 	final public static function moduleLink($module, $method = 'body', $args = [])
 	{
-		$alias = class_exists($module)? $module::alias(): $module;
+		$alias = class_exists($module) ? $module::alias() : $module;
 		
 		if (is_array($method) && !$args) {
 		    $args = $method;
@@ -64,7 +64,7 @@ 
 	 * @throws \Illuminate\Http\Exceptions\HttpResponseException
 	 */
 	final public static function decodeArgs($hash) {
-		if (! $hash) return [];
+		if (!$hash) return [];
 		
 		$args = session($hash);
 
@@ -82,7 +82,7 @@ 
 	final public static function encodeArgs($args) {
 		$args = (array) $args;
 		
-		if (! $args) return;
+		if (!$args) return;
 		
 		$hash = md5(serialize($args));
 		

Braces +9 added lines, -3 removed lines

@@ -64,11 +64,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 (array) $args;
 	}
@@ -82,7 +86,9 @@ 
 	final public static function encodeArgs($args) {
 		$args = (array) $args;
 		
-		if (! $args) return;
+		if (! $args) {
+			return;
+		}
 		
 		$hash = md5(serialize($args));