x-systems / epesi-core

src/System/User/Access/Database/Migrations/2019_10_24_195050_create_permission_tables.php

Indentation +93 added lines, -93 removed lines

@@ -6,97 +6,97 @@
 
 class CreatePermissionTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        $tableNames = config('permission.table_names');
-        $columnNames = config('permission.column_names');
-
-        Schema::create($tableNames['permissions'], function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('name');
-            $table->string('guard_name');
-            $table->timestamps();
-        });
-
-        Schema::create($tableNames['roles'], function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('name');
-            $table->string('guard_name');
-            $table->timestamps();
-        });
-
-        Schema::create($tableNames['model_has_permissions'], function (Blueprint $table) use ($tableNames, $columnNames) {
-            $table->unsignedBigInteger('permission_id');
-
-            $table->string('model_type');
-            $table->unsignedBigInteger($columnNames['model_morph_key']);
-            $table->index([$columnNames['model_morph_key'], 'model_type', ], 'model_has_permissions_model_id_model_type_index');
-
-            $table->foreign('permission_id')
-                ->references('id')
-                ->on($tableNames['permissions'])
-                ->onDelete('cascade');
-
-            $table->primary(['permission_id', $columnNames['model_morph_key'], 'model_type'],
-                    'model_has_permissions_permission_model_type_primary');
-        });
-
-        Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames) {
-            $table->unsignedBigInteger('role_id');
-
-            $table->string('model_type');
-            $table->unsignedBigInteger($columnNames['model_morph_key']);
-            $table->index([$columnNames['model_morph_key'], 'model_type', ], 'model_has_roles_model_id_model_type_index');
-
-            $table->foreign('role_id')
-                ->references('id')
-                ->on($tableNames['roles'])
-                ->onDelete('cascade');
-
-            $table->primary(['role_id', $columnNames['model_morph_key'], 'model_type'],
-                    'model_has_roles_role_model_type_primary');
-        });
-
-        Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames) {
-            $table->unsignedBigInteger('permission_id');
-            $table->unsignedBigInteger('role_id');
-
-            $table->foreign('permission_id')
-                ->references('id')
-                ->on($tableNames['permissions'])
-                ->onDelete('cascade');
-
-            $table->foreign('role_id')
-                ->references('id')
-                ->on($tableNames['roles'])
-                ->onDelete('cascade');
-
-            $table->primary(['permission_id', 'role_id'], 'role_has_permissions_permission_id_role_id_primary');
-        });
-
-        app('cache')
-            ->store(config('permission.cache.store') != 'default' ? config('permission.cache.store') : null)
-            ->forget(config('permission.cache.key'));
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        $tableNames = config('permission.table_names');
-
-        Schema::drop($tableNames['role_has_permissions']);
-        Schema::drop($tableNames['model_has_roles']);
-        Schema::drop($tableNames['model_has_permissions']);
-        Schema::drop($tableNames['roles']);
-        Schema::drop($tableNames['permissions']);
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		$tableNames = config('permission.table_names');
+		$columnNames = config('permission.column_names');
+
+		Schema::create($tableNames['permissions'], function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->string('name');
+			$table->string('guard_name');
+			$table->timestamps();
+		});
+
+		Schema::create($tableNames['roles'], function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->string('name');
+			$table->string('guard_name');
+			$table->timestamps();
+		});
+
+		Schema::create($tableNames['model_has_permissions'], function (Blueprint $table) use ($tableNames, $columnNames) {
+			$table->unsignedBigInteger('permission_id');
+
+			$table->string('model_type');
+			$table->unsignedBigInteger($columnNames['model_morph_key']);
+			$table->index([$columnNames['model_morph_key'], 'model_type', ], 'model_has_permissions_model_id_model_type_index');
+
+			$table->foreign('permission_id')
+				->references('id')
+				->on($tableNames['permissions'])
+				->onDelete('cascade');
+
+			$table->primary(['permission_id', $columnNames['model_morph_key'], 'model_type'],
+					'model_has_permissions_permission_model_type_primary');
+		});
+
+		Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames) {
+			$table->unsignedBigInteger('role_id');
+
+			$table->string('model_type');
+			$table->unsignedBigInteger($columnNames['model_morph_key']);
+			$table->index([$columnNames['model_morph_key'], 'model_type', ], 'model_has_roles_model_id_model_type_index');
+
+			$table->foreign('role_id')
+				->references('id')
+				->on($tableNames['roles'])
+				->onDelete('cascade');
+
+			$table->primary(['role_id', $columnNames['model_morph_key'], 'model_type'],
+					'model_has_roles_role_model_type_primary');
+		});
+
+		Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames) {
+			$table->unsignedBigInteger('permission_id');
+			$table->unsignedBigInteger('role_id');
+
+			$table->foreign('permission_id')
+				->references('id')
+				->on($tableNames['permissions'])
+				->onDelete('cascade');
+
+			$table->foreign('role_id')
+				->references('id')
+				->on($tableNames['roles'])
+				->onDelete('cascade');
+
+			$table->primary(['permission_id', 'role_id'], 'role_has_permissions_permission_id_role_id_primary');
+		});
+
+		app('cache')
+			->store(config('permission.cache.store') != 'default' ? config('permission.cache.store') : null)
+			->forget(config('permission.cache.key'));
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		$tableNames = config('permission.table_names');
+
+		Schema::drop($tableNames['role_has_permissions']);
+		Schema::drop($tableNames['model_has_roles']);
+		Schema::drop($tableNames['model_has_permissions']);
+		Schema::drop($tableNames['roles']);
+		Schema::drop($tableNames['permissions']);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -16,21 +16,21 @@ 
         $tableNames = config('permission.table_names');
         $columnNames = config('permission.column_names');
 
-        Schema::create($tableNames['permissions'], function (Blueprint $table) {
+        Schema::create($tableNames['permissions'], function(Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('name');
             $table->string('guard_name');
             $table->timestamps();
         });
 
-        Schema::create($tableNames['roles'], function (Blueprint $table) {
+        Schema::create($tableNames['roles'], function(Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('name');
             $table->string('guard_name');
             $table->timestamps();
         });
 
-        Schema::create($tableNames['model_has_permissions'], function (Blueprint $table) use ($tableNames, $columnNames) {
+        Schema::create($tableNames['model_has_permissions'], function(Blueprint $table) use ($tableNames, $columnNames) {
             $table->unsignedBigInteger('permission_id');
 
             $table->string('model_type');
@@ -46,7 +46,7 @@ 
                     'model_has_permissions_permission_model_type_primary');
         });
 
-        Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames) {
+        Schema::create($tableNames['model_has_roles'], function(Blueprint $table) use ($tableNames, $columnNames) {
             $table->unsignedBigInteger('role_id');
 
             $table->string('model_type');
@@ -62,7 +62,7 @@ 
                     'model_has_roles_role_model_type_primary');
         });
 
-        Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames) {
+        Schema::create($tableNames['role_has_permissions'], function(Blueprint $table) use ($tableNames) {
             $table->unsignedBigInteger('permission_id');
             $table->unsignedBigInteger('role_id');
 

src/System/User/Access/AccessCore.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	public static function boot()
 	{
 		// allow Super Admin full access
-		Gate::after(function ($user, $ability) {
+		Gate::after(function($user, $ability) {
 			return $user->hasRole('Super Admin');
 		});
 	}

src/System/User/Settings/Database/Models/UserSetting.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 	}
 	
 	private static function cacheUserVariables() {
-		if(isset(self::$userVariables)) return;
+		if (isset(self::$userVariables)) return;
 
 		$userId = Auth::id();
 		
@@ -33,7 +33,7 @@ 
 	}
 	
 	private static function cacheAdminVariables() {
-		if(isset(self::$adminVariables)) return;
+		if (isset(self::$adminVariables)) return;
 
 		foreach (self::where('user_id', 0) as $row) {
 			self::$adminVariables[$row['group']][$row['name']] = $row['value'];
@@ -41,7 +41,7 @@ 
 	}
 	
 	public static function get($group, $name, $user = null) {
-		$user = $user?: Auth::id();
+		$user = $user ?: Auth::id();
 		
 		if (!$user || !is_numeric($user)) return;
 		
@@ -51,7 +51,7 @@ 
 	}
 	
 	public static function getGroup($group, $user = null) {
-		$user = $user?: Auth::id();
+		$user = $user ?: Auth::id();
 		
 		if (!$user || !is_numeric($user)) return;
 		
@@ -73,7 +73,7 @@ 
 	}
 	
 	public static function put($group, $name, $value, $user = null) {
-		$user_id = $user?: Auth::id();
+		$user_id = $user ?: Auth::id();
 		
 		if (!$user_id || !is_numeric($user_id)) return;
 		
@@ -101,7 +101,7 @@ 
 	}
 	
 	public static function forget($group, $name, $user = null) {
-		$user_id = $user?: Auth::id();
+		$user_id = $user ?: Auth::id();
 		
 		if (!$user_id || !is_numeric($user_id)) return;
 		

Braces +18 added lines, -6 removed lines

@@ -23,7 +23,9 @@ 
 	}
 	
 	private static function cacheUserVariables() {
-		if(isset(self::$userVariables)) return;
+		if(isset(self::$userVariables)) {
+			return;
+		}
 
 		$userId = Auth::id();
 		
@@ -33,7 +35,9 @@ 
 	}
 	
 	private static function cacheAdminVariables() {
-		if(isset(self::$adminVariables)) return;
+		if(isset(self::$adminVariables)) {
+			return;
+		}
 
 		foreach (self::where('user_id', 0) as $row) {
 			self::$adminVariables[$row['group']][$row['name']] = $row['value'];
@@ -43,7 +47,9 @@ 
 	public static function get($group, $name, $user = null) {
 		$user = $user?: Auth::id();
 		
-		if (!$user || !is_numeric($user)) return;
+		if (!$user || !is_numeric($user)) {
+			return;
+		}
 		
 		self::cache();
 		
@@ -53,7 +59,9 @@ 
 	public static function getGroup($group, $user = null) {
 		$user = $user?: Auth::id();
 		
-		if (!$user || !is_numeric($user)) return;
+		if (!$user || !is_numeric($user)) {
+			return;
+		}
 		
 		self::cache();
 
@@ -75,7 +83,9 @@ 
 	public static function put($group, $name, $value, $user = null) {
 		$user_id = $user?: Auth::id();
 		
-		if (!$user_id || !is_numeric($user_id)) return;
+		if (!$user_id || !is_numeric($user_id)) {
+			return;
+		}
 		
 		self::cache();
 
@@ -103,7 +113,9 @@ 
 	public static function forget($group, $name, $user = null) {
 		$user_id = $user?: Auth::id();
 		
-		if (!$user_id || !is_numeric($user_id)) return;
+		if (!$user_id || !is_numeric($user_id)) {
+			return;
+		}
 		
 		self::cache();
 		

src/System/User/Settings/Database/Migrations/2019_09_18_173148_create_user_settings_table.php

Indentation +25 added lines, -25 removed lines

@@ -6,31 +6,31 @@
 
 class CreateUserSettingsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-    	$this->down();
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		$this->down();
     	
-    	Schema::create('user_settings', function (Blueprint $table) {
-    		$table->increments('id');
-    		$table->unsignedInteger('user_id');
-            $table->string('group', 512);
-            $table->string('name', 128);
-            $table->text('value');
-        });
-    }
+		Schema::create('user_settings', function (Blueprint $table) {
+			$table->increments('id');
+			$table->unsignedInteger('user_id');
+			$table->string('group', 512);
+			$table->string('name', 128);
+			$table->text('value');
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    	Schema::dropIfExists('user_settings');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('user_settings');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     {
     	$this->down();
     	
-    	Schema::create('user_settings', function (Blueprint $table) {
+    	Schema::create('user_settings', function(Blueprint $table) {
     		$table->increments('id');
     		$table->unsignedInteger('user_id');
             $table->string('group', 512);

src/System/User/Settings/Integration/Joints/UserSettingsJoint.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	 */
 	public function group()
 	{
-		return $this->group?: static::class;
+		return $this->group ?: static::class;
 	}
 	
 	/**

src/System/Integration/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/SystemInstallWizard.php

Spacing +5 added lines, -5 removed lines

@@ -79,7 +79,7 @@ 
 		
 		$form->addField('language', ['DropDown', '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['language']);
 			
 			App::setLocale($form->model['language']);
@@ -111,7 +111,7 @@ 
 		$form->addField('support', ['CheckBox', 'caption' => __('I will not remove "Support -> About" credit page from the application menu.')], ['required'=>true]);
 		$form->addField('store', ['CheckBox', 'caption' => __('I will not remove or rename ":epesi Store" links from the application.', ['epesi' => config('epesi.app.title')])], ['required'=>true]);
 		
-		$form->onSubmit(function ($form) use ($wizard) {
+		$form->onSubmit(function($form) use ($wizard) {
 			return $wizard->jsNext();
 		});
 			
@@ -139,12 +139,12 @@ 
 		$form->addField('create', ['CheckBox', 'caption' => __('Create New Database')])->on('change', new 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);
@@ -192,7 +192,7 @@ 
 		
 		$form->setValues($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

@@ -139,7 +139,9 @@
 		$form->addField('create', ['CheckBox', 'caption' => __('Create New Database')])->on('change', new 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);
 		}

src/Providers/EpesiServiceProvider.php

Braces +3 added lines, -1 removed lines

@@ -17,7 +17,9 @@
     {
     	$this->ensureHttps();
     	
-    	if (env('APP_DEBUG', false)) ModuleManager::clearCache();
+    	if (env('APP_DEBUG', false)) {
+    		ModuleManager::clearCache();
+    	}
     	
     	Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => 'web'], function() {
     		Route::any('/', 'SystemController@index');

Indentation +54 added lines, -54 removed lines

@@ -12,73 +12,73 @@
 
 class EpesiServiceProvider extends ServiceProvider
 {
-    /**
-     * Booting the package.
-     */
-    public function boot()
-    {
-    	$this->ensureHttps();
+	/**
+	 * Booting the package.
+	 */
+	public function boot()
+	{
+		$this->ensureHttps();
     	
-    	if (env('APP_DEBUG', false)) ModuleManager::clearCache();
+		if (env('APP_DEBUG', false)) ModuleManager::clearCache();
     	
-    	Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => 'web'], function() {
-    		Route::any('/', 'SystemController@index');
-    		Route::get('logo', 'SystemController@logo');
-    		Route::any('install', 'SystemController@install');
+		Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => 'web'], function() {
+			Route::any('/', 'SystemController@index');
+			Route::get('logo', 'SystemController@logo');
+			Route::any('install', 'SystemController@install');
     		
-    		Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() {
-    			Route::any('home', 'SystemController@home')->name('home');
+			Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() {
+				Route::any('home', 'SystemController@home')->name('home');
     			
-    			Route::any('view/{alias}/{method?}/{args?}', 'SystemController@view');
-    		});
-    	});
+				Route::any('view/{alias}/{method?}/{args?}', 'SystemController@view');
+			});
+		});
 
-    	// call boot methods on all modules
-    	ModuleManager::call('boot');
+		// call boot methods on all modules
+		ModuleManager::call('boot');
     		
 		foreach (ModuleManager::collect('translations') as $path) {
 			$this->loadJsonTranslationsFrom($path);
 		}
 		
-    	// Register admin service provider if in admin mode or in console
-    	// TODO: apply access restriction to admin mode
+		// Register admin service provider if in admin mode or in console
+		// TODO: apply access restriction to admin mode
 //     	if ($this->app->runningInConsole() || (request('admin', false) && Auth::user()->can('modify system'))) {
-    	if ($this->app->runningInConsole() || request('admin', false)) {
-    		$this->app->register(AdminServiceProvider::class);
-    	}
-    }
+		if ($this->app->runningInConsole() || request('admin', false)) {
+			$this->app->register(AdminServiceProvider::class);
+		}
+	}
 
-    /**
-     * Register the provider.
-     */
-    public function register()
-    {
-    	$this->app->singleton(App::class);
+	/**
+	 * Register the provider.
+	 */
+	public function register()
+	{
+		$this->app->singleton(App::class);
     	
-    	$this->app->singleton(
-    			SQL::class,
-    			function ($app) {
-    				/**
-    				 * Database Manager
-    				 *
-    				 * @var \Illuminate\Database\DatabaseManager $db
-    				 */
-    				$db = DB::getFacadeRoot();
+		$this->app->singleton(
+				SQL::class,
+				function ($app) {
+					/**
+					 * Database Manager
+					 *
+					 * @var \Illuminate\Database\DatabaseManager $db
+					 */
+					$db = DB::getFacadeRoot();
     				
-    				return new SQL($db);
-    			});
-    }
+					return new SQL($db);
+				});
+	}
     
-    /**
-     * Force to set https scheme if https enabled.
-     *
-     * @return void
-     */
-    protected function ensureHttps()
-    {
-    	if (config('epesi.https') || config('epesi.secure')) {
-    		url()->forceScheme('https');
-    		$this->app['request']->server->set('HTTPS', true);
-    	}
-    }
+	/**
+	 * Force to set https scheme if https enabled.
+	 *
+	 * @return void
+	 */
+	protected function ensureHttps()
+	{
+		if (config('epesi.https') || config('epesi.secure')) {
+			url()->forceScheme('https');
+			$this->app['request']->server->set('HTTPS', true);
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     	
     	$this->app->singleton(
     			SQL::class,
-    			function ($app) {
+    			function($app) {
     				/**
     				 * Database Manager
     				 *

src/System/Logo/LogoSettings.php

Braces +3 added lines, -1 removed lines

@@ -42,7 +42,9 @@
 		});
 
 		$logo->onUpload(function ($files) use ($form, $logo) {
-			if ($files === 'error')	return $form->error('logo', __('Error uploading image'));
+			if ($files === 'error') {
+				return $form->error('logo', __('Error uploading image'));
+			}
 			
 			$tmpPath = self::alias() . '/tmp/' . $files['name'];
 			

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,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'];
@@ -59,7 +59,7 @@ 
 		});
 					
 		$form->onSubmit(function($form) {
-			if ($name = $form->model['custom_logo']? $form->model['logo']: null) {
+			if ($name = $form->model['custom_logo'] ? $form->model['logo'] : null) {
 				$storage = $this->storage();
 				$from = self::alias() . '/tmp/' . $name;
 				$to = self::alias() . '/' . $name;