use new linter rules

Author: Philipp Kübler

phpcs.xml

@@ -9,6 +9,7 @@
     <file>src</file>
     <file>tests</file>
 
+    <exclude-pattern>*/tests/resources/*.blade.php</exclude-pattern>
 
     <!-- Generic -->
     <rule ref="Generic.Files.LineLength">

src/Middlewares/RoleMiddleware.php

@@ -7,7 +7,6 @@
 
 class RoleMiddleware
 {
-
     /**
      * Handle an incoming request.
      *
@@ -31,5 +30,4 @@ public function handle(Request $request, Closure $next, string $roles)
 
         return $next($request);
     }
-
 }

src/PermissionServiceProvider.php

@@ -7,7 +7,6 @@
 
 class PermissionServiceProvider extends ServiceProvider
 {
-
     /**
      * Bootstrap the application services.
      */
@@ -84,5 +83,4 @@ protected function registerBladeExtensions(): void
             });
         });
     }
-
 }

src/Traits/HasPermissions.php

@@ -6,11 +6,10 @@
 
 trait HasPermissions
 {
-
     /**
      * Check if model has all permissions
      *
-     * @param array|string ...$permissions
+     * @param string[]|string ...$permissions
      * @return bool
      */
     public function hasPermissionTo(...$permissions): bool
@@ -35,7 +34,7 @@ public function hasPermissionTo(...$permissions): bool
     /**
      * Check if model has all permissions
      *
-     * @param array|string ...$permissions
+     * @param string[]|string ...$permissions
      * @return bool
      */
     public function hasPermission(...$permissions): bool
@@ -46,7 +45,7 @@ public function hasPermission(...$permissions): bool
     /**
      * Check if model has any permissions
      *
-     * @param array|string ...$permissions
+     * @param string[]|string ...$permissions
      * @return bool
      */
     public function hasAnyPermission(...$permissions): bool
@@ -87,7 +86,7 @@ public function getAllPermissions(): Collection
      * Match ruleset to permission
      *
      * @param \Illuminate\Support\Collection $rules Ruleset
-     * @param array $permission
+     * @param string[] $permission
      * @return bool
      */
     public function matchPermission(Collection $rules, array $permission): bool
@@ -111,8 +110,8 @@ public function matchPermission(Collection $rules, array $permission): bool
     /**
      * Match one rule to permission
      *
-     * @param array $rule
-     * @param array $permission
+     * @param string[] $rule
+     * @param string[] $permission
      * @return bool
      */
     public function matchRuleToPermission(array $rule, array $permission): bool
@@ -146,5 +145,4 @@ public function matchRuleToPermission(array $rule, array $permission): bool
 
         return $countPermissionParts === $countRuleParts;
     }
-
 }

src/Traits/HasRoles.php

@@ -4,7 +4,6 @@
 
 trait HasRoles
 {
-
     use HasPermissions;
 
     /**
@@ -48,5 +47,4 @@ public function getRoleName(): ?string
     {
         return $this->{config('permission.column_name')};
     }
-
 }

tests/BladeTest.php

@@ -6,7 +6,6 @@
 
 class BladeTest extends TestCase
 {
-
     public function testPermission(): void
     {
         $this->user->assignRole('admin');
@@ -71,7 +70,7 @@ protected function setUp(): void
      * return compiled blade views
      *
      * @param string $view view name
-     * @param array $parameters vars can used in the view
+     * @param string[] $parameters vars can used in the view
      */
     protected function renderView(string $view, array $parameters): string
     {
@@ -83,5 +82,4 @@ protected function renderView(string $view, array $parameters): string
 
         return trim((string) $view);
     }
-
 }

tests/MatchPermissionTest.php

@@ -4,7 +4,6 @@
 
 class MatchPermissionTest extends TestCase
 {
-
     public function testNoRules(): void
     {
         $rules = collect([]);
@@ -61,5 +60,4 @@ protected function setUp(): void
         ];
         $this->user = User::create(['email' => '[email protected]']);
     }
-
 }

tests/MatchRuleToPermissionTest.php

@@ -4,7 +4,6 @@
 
 class MatchRuleToPermissionTest extends TestCase
 {
-
     public function testDirectRule(): void
     {
         $rule = [
@@ -96,5 +95,4 @@ protected function setUp(): void
         ];
         $this->user = User::create(['email' => '[email protected]']);
     }
-
 }

tests/MiddlewareTest.php

@@ -10,7 +10,6 @@
 
 class MiddlewareTest extends TestCase
 {
-
     public function testGustCannotAccessProtectedRoute(): void
     {
         $this->assertEquals($this->runMiddleware($this->roleMiddleware, 'admin'), 403);
@@ -53,12 +52,11 @@ protected function setUp(): void
     protected function runMiddleware(RoleMiddleware $middleware, string $parameter): int
     {
         try {
-            return $middleware->handle(new Request, static function () {
-                return (new Response)->SetContent('<html></html>');
+            return $middleware->handle(new Request(), static function () {
+                return (new Response())->SetContent('<html></html>');
             }, $parameter)->status();
         } catch (HttpException $e) {
             return $e->getStatusCode();
         }
     }
-
 }

tests/PermissionTest.php

@@ -5,7 +5,6 @@
 /** @SuppressWarnings(PHPMD.TooManyPublicMethods) */
 class PermissionTest extends TestCase
 {
-
     public function testGetPermissions(): void
     {
         $this->user->assignRole('user');
@@ -130,5 +129,4 @@ protected function setUp(): void
 
         $this->user = User::create(['email' => '[email protected]']);
     }
-    
 }

tests/RoleTest.php

@@ -4,7 +4,6 @@
 
 class RoleTest extends TestCase
 {
-
     public function testAssignExistentRole(): void
     {
         $this->user->assignRole('admin');
@@ -60,5 +59,4 @@ protected function setUp(): void
 
         $this->user = User::create(['email' => '[email protected]']);
     }
-
 }

tests/TestCase.php

@@ -9,7 +9,6 @@
 
 class TestCase extends OrchestraTestCase
 {
-
     /**
      * Setup the test environment.
      *
@@ -29,6 +28,7 @@ protected function setUp(): void
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
      */
     protected function getPackageProviders($app): array
     {
@@ -40,6 +40,7 @@ protected function getPackageProviders($app): array
      *
      * @param \Illuminate\Foundation\Application $app
      * @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
      */
     protected function getEnvironmentSetUp($app): void
     {
@@ -71,5 +72,4 @@ protected function setUpDatabase(Application $app): void
             $table->string('role')->nullable();
         });
     }
-
 }

tests/User.php

@@ -11,20 +11,27 @@
 
 class User extends Model implements AuthorizableContract, AuthenticatableContract
 {
-
     use HasRoles;
     use Authorizable;
     use Authenticatable;
 
+    /**
+     * @var bool
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint
+     */
     public $timestamps = false;
 
     /**
      * The attributes that are mass assignable.
      *
-     * @var array
+     * @var string[]
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint
      */
     protected $fillable = ['email'];
 
+    /**
+     * @var string
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint
+     */
     protected $table = 'users';
-
 }