x-systems / epesi-core

src/System/SystemCore.php

Indentation +3 added lines, -3 removed lines

@@ -24,11 +24,11 @@
 	
 	public function migrate()
 	{
-	    Models\Module::migrate();
+		Models\Module::migrate();
 	    
-	    Models\Variable::migrate();
+		Models\Variable::migrate();
 	    
-	    return parent::migrate();
+		return parent::migrate();
 	}
 	
 }

src/System/Models/Module.php

Indentation +11 added lines, -11 removed lines

@@ -7,18 +7,18 @@
 
 class Module extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
-    public $table = 'modules';
+	public $table = 'modules';
     
-    function init() {
-        parent::init();
+	function init() {
+		parent::init();
         
-        $this->addFields([
-                'class',
-                'alias',
-                'priority' => ['default' => 0],
-                'state' => ['default' => 1]
-        ]);
-    }
+		$this->addFields([
+				'class',
+				'alias',
+				'priority' => ['default' => 0],
+				'state' => ['default' => 1]
+		]);
+	}
 }

src/System/Models/Variable.php

Braces +7 added lines, -4 removed lines

@@ -20,7 +20,9 @@ 
 	public $strict_types = false;
 	
 	private static function cache() {
-		if(isset(self::$variables)) return;
+		if(isset(self::$variables)) {
+			return;
+		}
 		
 		self::$variables = self::pluck('value', 'name');
 	}
@@ -45,7 +47,9 @@ 
 	public static function recall($name, $default = null) {
 		self::cache();
 		
-		if (! self::$variables->has($name)) return $default;
+		if (! self::$variables->has($name)) {
+			return $default;
+		}
 		
 		return self::$variables->get($name, $default)?? $default;
 	}
@@ -65,8 +69,7 @@ 
 		
 		if ($variable->loaded()) {
 		    $variable->save(compact('value'));
-		}
-		else {
+		} else {
 		    $variable->insert(compact('name', 'value'));
 		}
 	}

Indentation +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 
 class Variable extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
 	/**
 	 * @var Collection
@@ -26,12 +26,12 @@ 
 	}
 	
 	public function init() {
-	    parent::init();
+		parent::init();
 	    
-	    $this->addFields([
-	            'name',
-	            'value' => ['type' => 'text', 'serialize' => 'base64']
-	    ]);
+		$this->addFields([
+				'name',
+				'value' => ['type' => 'text', 'serialize' => 'base64']
+		]);
 	}
 	
 	public static function recall($name, $default = null) {
@@ -56,10 +56,10 @@ 
 		$variable = self::create()->addCondition('name', $name)->tryLoadAny();
 
 		if ($variable->loaded()) {
-		    $variable->save(compact('value'));
+			$variable->save(compact('value'));
 		}
 		else {
-		    $variable->insert(compact('name', 'value'));
+			$variable->insert(compact('name', 'value'));
 		}
 	}
 	

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
 	public $strict_types = false;
 	
 	private static function cache() {
-		if(isset(self::$variables)) return;
+		if (isset(self::$variables)) return;
 		
 		self::$variables = self::pluck('value', 'name');
 	}
@@ -37,7 +37,7 @@ 
 	public static function recall($name, $default = null) {
 		self::cache();
 		
-		if (! self::$variables->has($name)) return $default;
+		if (!self::$variables->has($name)) return $default;
 		
 		return self::$variables->get($name, $default)?? $default;
 	}
@@ -63,10 +63,10 @@ 
 		}
 	}
 	
-	public static function forget($name, $throwError=true) {
+	public static function forget($name, $throwError = true) {
 		self::cache();
 		
-		if (! self::$variables->has($name) && $throwError) {
+		if (!self::$variables->has($name) && $throwError) {
 			throw new \Exception('No such variable in database: ' . $name);
 		}
 		

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

Spacing +3 added lines, -3 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;
 	}
 	
 	/**
@@ -65,7 +65,7 @@ 
 	{
 		$names = array_slice(explode('\\', static::class), -2, -1);
 		
-		return $names? reset($names): '';
+		return $names ? reset($names) : '';
 	}
 	
 	/**

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;
 	}

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()