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/Access/AccessView.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
 	
 	protected function showEditPermissions()
 	{
-		$permissionsData = Permission::all(['id', 'name'])->map(function($permission){
+		$permissionsData = Permission::all(['id', 'name'])->map(function($permission) {
 			$permission['name'] = trans(ucwords($permission['name']));
 			
 			return $permission;
@@ -99,19 +99,19 @@ 
 	
 	protected function columns()
 	{
-		return $this->columns = $this->columns?: $this->add('Columns');
+		return $this->columns = $this->columns ?: $this->add('Columns');
 	}
 	
 	protected function permissionId()
 	{
-		return $this->app->stickyGet($this->columns()->name)?: $this->getModuleVariable('permission');
+		return $this->app->stickyGet($this->columns()->name) ?: $this->getModuleVariable('permission');
 	}
 	
 	protected function reload($permissionExpression = null)
 	{
 		$columns = $this->columns();
 		
-		return $this->reload = $this->reload?: new jsReload($columns, [$columns->name => $permissionExpression?: '']);
+		return $this->reload = $this->reload ?: new jsReload($columns, [$columns->name => $permissionExpression ?: '']);
 	}
 	
 	protected function getModel($array)

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/Controllers/SystemController.php

Indentation +26 added lines, -26 removed lines

@@ -12,41 +12,41 @@
 
 class SystemController extends Controller
 {
-    public function index()
-    {
-    	return SystemCore::isInstalled()? redirect('home'): redirect('install');
-    }
+	public function index()
+	{
+		return SystemCore::isInstalled()? redirect('home'): redirect('install');
+	}
     
-    public function install(Epesi $epesi)
-    {
-    	// make sure the installation information is fresh
-    	ModuleManager::clearCache();
+	public function install(Epesi $epesi)
+	{
+		// make sure the installation information is fresh
+		ModuleManager::clearCache();
     	
-    	if (SystemCore::isInstalled()) return redirect('home');
+		if (SystemCore::isInstalled()) return redirect('home');
     	
-    	$epesi->title = config('epesi.app.title') . ' > ' . __('Installation');
+		$epesi->title = config('epesi.app.title') . ' > ' . __('Installation');
     	
-    	$epesi->initLayout('Centered');
+		$epesi->initLayout('Centered');
     	
-    	$epesi->layout->set('logo', url('logo'));
-    	$epesi->layout->template->setHTML('copyright', config('epesi.app.copyright'));
+		$epesi->layout->set('logo', url('logo'));
+		$epesi->layout->template->setHTML('copyright', config('epesi.app.copyright'));
     	
-    	$epesi->add(new SystemInstallWizard());
+		$epesi->add(new SystemInstallWizard());
     	
-    	return $epesi->response();
-    }
+		return $epesi->response();
+	}
     
-    public function home()
-    {
-    	return redirect(SystemCore::isInstalled()? HomePageCommon::getUserHomePagePath(): 'install');
-    }
+	public function home()
+	{
+		return redirect(SystemCore::isInstalled()? HomePageCommon::getUserHomePagePath(): 'install');
+	}
     
-    public function logo()
-    {
-    	$path = storage_path(implode(DIRECTORY_SEPARATOR, ['app', 'public', 'system', 'logo.png']));
+	public function logo()
+	{
+		$path = storage_path(implode(DIRECTORY_SEPARATOR, ['app', 'public', 'system', 'logo.png']));
 
-    	$file = new \Symfony\Component\HttpFoundation\File\File($path);
+		$file = new \Symfony\Component\HttpFoundation\File\File($path);
     	
-    	return response(File::get($path), 200, ['Content-type' => $file->getMimeType()])->setMaxAge(604800)->setPublic();
-    }
+		return response(File::get($path), 200, ['Content-type' => $file->getMimeType()])->setMaxAge(604800)->setPublic();
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 {
     public function index()
     {
-    	return SystemCore::isInstalled()? redirect('home'): redirect('install');
+    	return SystemCore::isInstalled() ? redirect('home') : redirect('install');
     }
     
     public function install(Epesi $epesi)
@@ -38,7 +38,7 @@ 
     
     public function home()
     {
-    	return redirect(SystemCore::isInstalled()? HomePageCommon::getUserHomePagePath(): 'install');
+    	return redirect(SystemCore::isInstalled() ? HomePageCommon::getUserHomePagePath() : 'install');
     }
     
     public function logo()

Braces +3 added lines, -1 removed lines

@@ -22,7 +22,9 @@
     	// make sure the installation information is fresh
     	ModuleManager::clearCache();
     	
-    	if (SystemCore::isInstalled()) return redirect('home');
+    	if (SystemCore::isInstalled()) {
+    		return redirect('home');
+    	}
     	
     	$epesi->title = config('epesi.app.title') . ' > ' . __('Installation');
     	

src/System/Integration/Modules/ModuleManager.php

Spacing +15 added lines, -15 removed lines

@@ -19,7 +19,7 @@ 
 
 	public static function isInstalled($classOrAlias)
 	{
-		return self::getClass($classOrAlias, true)? 1: 0;
+		return self::getClass($classOrAlias, true) ? 1 : 0;
 	}
 	
 	public static function isAvailable($classOrAlias)
@@ -34,7 +34,7 @@ 
 	 * @return string;
 	 */
 	public static function getClass($classOrAlias, $installedOnly = false) {
-		$modules = $installedOnly? self::getInstalled(): self::getAll();
+		$modules = $installedOnly ? self::getInstalled() : self::getAll();
 		
 		if (collect($modules)->contains($classOrAlias)) return $classOrAlias;
 		
@@ -66,9 +66,9 @@ 
 	 */
 	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 $namespace => $path) {
+			foreach (array_merge(config('epesi.modules', []), self::packageManifest()->modules() ?: []) as $namespace => $path) {
 				foreach (self::discoverModuleClasses($namespace, $path) as $moduleClass) {
 					$modules->add(['alias' => $moduleClass::alias(), 'class' => $moduleClass]);
 				}
@@ -81,14 +81,14 @@ 
 	protected static function discoverModuleClasses($namespace, $basePath)
 	{
 		$ret = collect();
-		foreach (glob($basePath . '/*', GLOB_ONLYDIR|GLOB_NOSORT) as $path) {
+		foreach (glob($basePath . '/*', GLOB_ONLYDIR | GLOB_NOSORT) as $path) {
 			$moduleNamespace = trim($namespace, '\\') . '\\' . basename($path);
 			
 			$ret = $ret->merge(self::discoverModuleClasses($moduleNamespace, $path));
 			
 			$moduleClass = $moduleNamespace . '\\' . basename($path) . 'Core';
 			
-			if (! is_a($moduleClass, ModuleCore::class, true)) continue;
+			if (!is_a($moduleClass, ModuleCore::class, true)) continue;
 			
 			$ret->add($moduleClass);
 		}
@@ -105,7 +105,7 @@ 
 	 */
 	protected static function getCached($key, \Closure $default)
 	{
-		if (! Cache::has($key)) {
+		if (!Cache::has($key)) {
 			Cache::forever($key, $default());
 		}
 
@@ -141,7 +141,7 @@ 
 	 */
 	public static function collect($method, $args = [])
 	{
-		$args = is_array($args)? $args: [$args];
+		$args = is_array($args) ? $args : [$args];
 		
 		$installedModules = self::getInstalled();
 		
@@ -154,9 +154,9 @@ 
 		
 		$ret = [];
 		foreach ($installedModules 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;
@@ -175,7 +175,7 @@ 
 			return true;
 		}
 		
-		if (! $moduleClass = self::getClass($classOrAlias)) {			
+		if (!$moduleClass = self::getClass($classOrAlias)) {			
 			throw new \Exception('Module "' . $classOrAlias . '" could not be identified');
 		}
 		
@@ -234,10 +234,10 @@ 
 			$parentModule = array_shift($unsatisfiedDependencies);
 				
 			if (self::$processing[$parentModule]?? false) {
-				throw new Exception('Cross dependency: '. $parentModule);
+				throw new Exception('Cross dependency: ' . $parentModule);
 			}
 				
-			if (! self::isAvailable($parentModule)) {
+			if (!self::isAvailable($parentModule)) {
 				throw new Exception('Module not found: "' . $parentModule . '"');
 			}
 	
@@ -258,13 +258,13 @@ 
 	
 	public static function uninstall($classOrAlias)
 	{
-		if (! self::isInstalled($classOrAlias)) {
+		if (!self::isInstalled($classOrAlias)) {
 			print ('Module "' . $classOrAlias . '" is not installed!');
 			
 			return true;
 		}
 		
-		if (! $moduleClass = self::getClass($classOrAlias)) {
+		if (!$moduleClass = self::getClass($classOrAlias)) {
 			throw new \Exception('Module "' . $classOrAlias . '" could not be identified');
 		}
 		

Braces +9 added lines, -3 removed lines

@@ -36,7 +36,9 @@ 
 	public static function getClass($classOrAlias, $installedOnly = false) {
 		$modules = $installedOnly? self::getInstalled(): self::getAll();
 		
-		if (collect($modules)->contains($classOrAlias)) return $classOrAlias;
+		if (collect($modules)->contains($classOrAlias)) {
+			return $classOrAlias;
+		}
 		
 		return $modules[$classOrAlias]?? null;
 	}
@@ -88,7 +90,9 @@ 
 			
 			$moduleClass = $moduleNamespace . '\\' . basename($path) . 'Core';
 			
-			if (! is_a($moduleClass, ModuleCore::class, true)) continue;
+			if (! is_a($moduleClass, ModuleCore::class, true)) {
+				continue;
+			}
 			
 			$ret->add($moduleClass);
 		}
@@ -154,7 +158,9 @@ 
 		
 		$ret = [];
 		foreach ($installedModules 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 +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) . ';'
         );
     }
 }