Merge pull request #191 from jeremykenedy/analysis-KoB45Q

jeremykenedy · web-flow · commit 7b141753bb21 · 2023-02-04T08:36:21.000-08:00
Apply fixes from StyleCI
diff --git a/src/Database/Seeders/DefaultConnectRelationshipsSeeder.php b/src/Database/Seeders/DefaultConnectRelationshipsSeeder.php
@@ -24,12 +24,12 @@ public function run()
         $roleAdmin = config('roles.models.role')::where('slug', '=', 'admin')->first()
             ?? config('roles.models.role')::where('name', '=', 'Admin')->first();
 
-        $this->command->getOutput()->writeln("<info>Seeding:</info> DefaultConnectRelationshipsSeeder");
+        $this->command->getOutput()->writeln('<info>Seeding:</info> DefaultConnectRelationshipsSeeder');
         foreach ($permissions as $permission) {
             $roleAdmin->attachPermission($permission);
             $this->command->getOutput()->writeln(
-                "<info>Seeding:</info> DefaultConnectRelationshipsSeeder - Role:Admin attached to Permission:"
-                . $permission->slug
+                '<info>Seeding:</info> DefaultConnectRelationshipsSeeder - Role:Admin attached to Permission:'
+                .$permission->slug
             );
         }
     }
diff --git a/src/Database/Seeders/DefaultPermissionsTableSeeder.php b/src/Database/Seeders/DefaultPermissionsTableSeeder.php
@@ -48,7 +48,7 @@ public function run()
          * Add Permission Items
          *
          */
-        $this->command->getOutput()->writeln("<info>Seeding:</info> DefaultPermissionitemsTableSeeder");
+        $this->command->getOutput()->writeln('<info>Seeding:</info> DefaultPermissionitemsTableSeeder');
         foreach ($Permissionitems as $Permissionitem) {
             $newPermissionitem = config('roles.models.permission')::where('slug', '=', $Permissionitem['slug'])
                 ->first();
@@ -60,8 +60,8 @@ public function run()
                     'model'         => $Permissionitem['model'],
                 ]);
                 $this->command->getOutput()->writeln(
-                    "<info>Seeding:</info> DefaultPermissionitemsTableSeeder - Permission:"
-                    . $Permissionitem['slug']
+                    '<info>Seeding:</info> DefaultPermissionitemsTableSeeder - Permission:'
+                    .$Permissionitem['slug']
                 );
             }
         }
diff --git a/src/Database/Seeders/DefaultRolesTableSeeder.php b/src/Database/Seeders/DefaultRolesTableSeeder.php
@@ -42,7 +42,7 @@ public function run()
          * Add Role Items
          *
          */
-        $this->command->getOutput()->writeln("<info>Seeding:</info> DefaultRoleItemsTableSeeder");
+        $this->command->getOutput()->writeln('<info>Seeding:</info> DefaultRoleItemsTableSeeder');
         foreach ($RoleItems as $RoleItem) {
             $newRoleItem = config('roles.models.role')::where('slug', '=', $RoleItem['slug'])->first();
             if ($newRoleItem === null) {
@@ -53,7 +53,7 @@ public function run()
                     'level'         => $RoleItem['level'],
                 ]);
                 $this->command->getOutput()->writeln(
-                    "<info>Seeding:</info> DefaultRoleItemsTableSeeder - Role:" . $RoleItem['slug']
+                    '<info>Seeding:</info> DefaultRoleItemsTableSeeder - Role:'.$RoleItem['slug']
                 );
             }
         }
diff --git a/src/Database/Seeders/DefaultUsersTableSeeder.php b/src/Database/Seeders/DefaultUsersTableSeeder.php
@@ -21,7 +21,7 @@ public function run()
          * Add Users
          *
          */
-        $this->command->getOutput()->writeln("<info>Seeding:</info> DefaultUsersTableSeeder");
+        $this->command->getOutput()->writeln('<info>Seeding:</info> DefaultUsersTableSeeder');
 
         if (config('roles.models.defaultUser')::where('email', '=', 'admin@admin.com')->first() === null) {
             $newUser = config('roles.models.defaultUser')::create([
@@ -35,7 +35,7 @@ public function run()
                 $newUser->attachPermission($permission);
             }
             $this->command->getOutput()->writeln(
-                "<info>Seeding:</info> DefaultUsersTableSeeder - User:admin@admin.com"
+                '<info>Seeding:</info> DefaultUsersTableSeeder - User:admin@admin.com'
             );
         }
 
@@ -47,7 +47,7 @@ public function run()
             ]);
 
             $newUser->attachRole($userRole);
-            $this->command->getOutput()->writeln("<info>Seeding:</info> DefaultUsersTableSeeder - User:user@user.com");
+            $this->command->getOutput()->writeln('<info>Seeding:</info> DefaultUsersTableSeeder - User:user@user.com');
         }
     }
 }
diff --git a/src/RolesServiceProvider.php b/src/RolesServiceProvider.php
@@ -102,7 +102,6 @@ private function loadSeedsFrom()
                 );
             }
         });
-
     }
 
     /**
diff --git a/tests/RefreshDatabase.php b/tests/RefreshDatabase.php
@@ -54,14 +54,14 @@ protected function migrateUsing()
     {
         return [
             /**
-             * Non standard path
+             * Non standard path.
              *
              * $this->laravel->databasePath().DIRECTORY_SEPARATOR.'migrations'
              * with `vendor/orchestra/testbench-core/laravel` as basePath
              *
              * @see \Illuminate\Database\Console\Migrations\BaseCommand
              */
-            '--path' => realpath(__DIR__ . '/../src/Database/Migrations'),
+            '--path'     => realpath(__DIR__.'/../src/Database/Migrations'),
             '--realpath' => true,
         ];
     }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -12,7 +12,7 @@ class TestCase extends OrchestraTestCase
     /**
      * Get package providers.
      *
-     * @param  \Illuminate\Foundation\Application  $app
+     * @param \Illuminate\Foundation\Application $app
      *
      * @return array<int, class-string>
      */
@@ -24,7 +24,7 @@ protected function getPackageProviders($app)
     /**
      * Get package aliases.
      *
-     * @param  \Illuminate\Foundation\Application  $app
+     * @param \Illuminate\Foundation\Application $app
      *
      * @return array<string, class-string>
      */
@@ -38,7 +38,7 @@ protected function getPackageAliases($app)
     /**
      * Define environment setup.
      *
-     * @param  \Illuminate\Foundation\Application  $app
+     * @param \Illuminate\Foundation\Application $app
      *
      * @return void
      */
@@ -48,7 +48,7 @@ public function getEnvironmentSetUp($app)
             return new SeedHandler($app, collect());
         });
 
-        include_once __DIR__ . '/../src/Database/TestMigrations/create_users_table.php';
+        include_once __DIR__.'/../src/Database/TestMigrations/create_users_table.php';
 
         (new \jeremykenedy\LaravelRoles\Database\TestMigrations\CreateUsersTable())->up();
     }
diff --git a/tests/User.php b/tests/User.php
@@ -3,11 +3,11 @@
 namespace jeremykenedy\LaravelRoles\Test;
 
 use Illuminate\Auth\Authenticatable;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Foundation\Auth\Access\Authorizable;
-use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
+use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Foundation\Auth\Access\Authorizable;
 use jeremykenedy\LaravelRoles\Traits\HasRoleAndPermission;
 
 class User extends Model implements AuthorizableContract, AuthenticatableContract

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function run()`
`48`	`48`	`* Add Permission Items`
`49`	`49`	`*`
`50`	`50`	`*/`
`51`		`- $this->command->getOutput()->writeln("<info>Seeding:</info> DefaultPermissionitemsTableSeeder");`
	`51`	`+ $this->command->getOutput()->writeln('<info>Seeding:</info> DefaultPermissionitemsTableSeeder');`
`52`	`52`	`foreach ($Permissionitems as $Permissionitem) {`
`53`	`53`	`$newPermissionitem = config('roles.models.permission')::where('slug', '=', $Permissionitem['slug'])`
`54`	`54`	`->first();`
`@@ -60,8 +60,8 @@ public function run()`
`60`	`60`	`'model' => $Permissionitem['model'],`
`61`	`61`	`]);`
`62`	`62`	`$this->command->getOutput()->writeln(`
`63`		`- "<info>Seeding:</info> DefaultPermissionitemsTableSeeder - Permission:"`
`64`		`- . $Permissionitem['slug']`
	`63`	`+ '<info>Seeding:</info> DefaultPermissionitemsTableSeeder - Permission:'`
	`64`	`+ .$Permissionitem['slug']`
`65`	`65`	`);`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function run()`
`42`	`42`	`* Add Role Items`
`43`	`43`	`*`
`44`	`44`	`*/`
`45`		`- $this->command->getOutput()->writeln("<info>Seeding:</info> DefaultRoleItemsTableSeeder");`
	`45`	`+ $this->command->getOutput()->writeln('<info>Seeding:</info> DefaultRoleItemsTableSeeder');`
`46`	`46`	`foreach ($RoleItems as $RoleItem) {`
`47`	`47`	`$newRoleItem = config('roles.models.role')::where('slug', '=', $RoleItem['slug'])->first();`
`48`	`48`	`if ($newRoleItem === null) {`
`@@ -53,7 +53,7 @@ public function run()`
`53`	`53`	`'level' => $RoleItem['level'],`
`54`	`54`	`]);`
`55`	`55`	`$this->command->getOutput()->writeln(`
`56`		`- "<info>Seeding:</info> DefaultRoleItemsTableSeeder - Role:" . $RoleItem['slug']`
	`56`	`+ '<info>Seeding:</info> DefaultRoleItemsTableSeeder - Role:'.$RoleItem['slug']`
`57`	`57`	`);`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public function run()`
`21`	`21`	`* Add Users`
`22`	`22`	`*`
`23`	`23`	`*/`
`24`		`- $this->command->getOutput()->writeln("<info>Seeding:</info> DefaultUsersTableSeeder");`
	`24`	`+ $this->command->getOutput()->writeln('<info>Seeding:</info> DefaultUsersTableSeeder');`
`25`	`25`
`26`	`26`	`if (config('roles.models.defaultUser')::where('email', '=', '[email protected]')->first() === null) {`
`27`	`27`	`$newUser = config('roles.models.defaultUser')::create([`
`@@ -35,7 +35,7 @@ public function run()`
`35`	`35`	`$newUser->attachPermission($permission);`
`36`	`36`	`}`
`37`	`37`	`$this->command->getOutput()->writeln(`
`38`		`- "<info>Seeding:</info> DefaultUsersTableSeeder - User:[email protected]"`
	`38`	`+ '<info>Seeding:</info> DefaultUsersTableSeeder - User:[email protected]'`
`39`	`39`	`);`
`40`	`40`	`}`
`41`	`41`
`@@ -47,7 +47,7 @@ public function run()`
`47`	`47`	`]);`
`48`	`48`
`49`	`49`	`$newUser->attachRole($userRole);`
`50`		`- $this->command->getOutput()->writeln("<info>Seeding:</info> DefaultUsersTableSeeder - User:[email protected]");`
	`50`	`+ $this->command->getOutput()->writeln('<info>Seeding:</info> DefaultUsersTableSeeder - User:[email protected]');`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,6 @@ private function loadSeedsFrom()`
`102`	`102`	`);`
`103`	`103`	`}`
`104`	`104`	`});`
`105`		`-`
`106`	`105`	`}`
`107`	`106`
`108`	`107`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -54,14 +54,14 @@ protected function migrateUsing()`
`54`	`54`	`{`
`55`	`55`	`return [`
`56`	`56`	`/**`
`57`		`- * Non standard path`
	`57`	`+ * Non standard path.`
`58`	`58`	`*`
`59`	`59`	`* $this->laravel->databasePath().DIRECTORY_SEPARATOR.'migrations'`
`60`	`60`	* with `vendor/orchestra/testbench-core/laravel` as basePath
`61`	`61`	`*`
`62`	`62`	`* @see \Illuminate\Database\Console\Migrations\BaseCommand`
`63`	`63`	`*/`
`64`		`- '--path' => realpath(__DIR__ . '/../src/Database/Migrations'),`
	`64`	`+ '--path' => realpath(__DIR__.'/../src/Database/Migrations'),`
`65`	`65`	`'--realpath' => true,`
`66`	`66`	`];`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class TestCase extends OrchestraTestCase`
`12`	`12`	`/**`
`13`	`13`	`* Get package providers.`
`14`	`14`	`*`
`15`		`- * @param \Illuminate\Foundation\Application $app`
	`15`	`+ * @param \Illuminate\Foundation\Application $app`
`16`	`16`	`*`
`17`	`17`	`* @return array<int, class-string>`
`18`	`18`	`*/`
`@@ -24,7 +24,7 @@ protected function getPackageProviders($app)`
`24`	`24`	`/**`
`25`	`25`	`* Get package aliases.`
`26`	`26`	`*`
`27`		`- * @param \Illuminate\Foundation\Application $app`
	`27`	`+ * @param \Illuminate\Foundation\Application $app`
`28`	`28`	`*`
`29`	`29`	`* @return array<string, class-string>`
`30`	`30`	`*/`
`@@ -38,7 +38,7 @@ protected function getPackageAliases($app)`
`38`	`38`	`/**`
`39`	`39`	`* Define environment setup.`
`40`	`40`	`*`
`41`		`- * @param \Illuminate\Foundation\Application $app`
	`41`	`+ * @param \Illuminate\Foundation\Application $app`
`42`	`42`	`*`
`43`	`43`	`* @return void`
`44`	`44`	`*/`
`@@ -48,7 +48,7 @@ public function getEnvironmentSetUp($app)`
`48`	`48`	`return new SeedHandler($app, collect());`
`49`	`49`	`});`
`50`	`50`
`51`		`- include_once __DIR__ . '/../src/Database/TestMigrations/create_users_table.php';`
	`51`	`+ include_once __DIR__.'/../src/Database/TestMigrations/create_users_table.php';`
`52`	`52`
`53`	`53`	`(new \jeremykenedy\LaravelRoles\Database\TestMigrations\CreateUsersTable())->up();`
`54`	`54`	`}`