phpstan fixes

Cherry-picked 0c5789d

Co-authored-by: erikn69 <[email protected]>

Author: drbyte

src/PermissionServiceProvider.php

@@ -144,8 +144,7 @@ protected function registerBladeExtensions(BladeCompiler $bladeCompiler): void
 
     protected function registerMacroHelpers(): void
     {
-        // @phpstan-ignore-next-line
-        if (! method_exists(Route::class, 'macro')) { // Lumen
+        if (! method_exists(Route::class, 'macro')) { // @phpstan-ignore-line Lumen
             return;
         }
 

src/Traits/HasPermissions.php

@@ -348,8 +348,7 @@ public function getAllPermissions(): Collection
         /** @var Collection $permissions */
         $permissions = $this->permissions;
 
-        // @phpstan-ignore-next-line
-        if (method_exists($this, 'roles')) {
+        if (!is_a($this, Permission::class)) {
             $permissions = $permissions->merge($this->getPermissionsViaRoles());
         }
 

src/Traits/HasRoles.php

@@ -127,10 +127,6 @@ private function collectRoles(...$roles): array
                 }
 
                 $role = $this->getStoredRole($role);
-                // @phpstan-ignore-next-line
-                if (! $role instanceof Role) {
-                    return $array;
-                }
 
                 if (! in_array($role->getKey(), $array)) {
                     $this->ensureModelSharesGuard($role);

tests/CommandTest.php

@@ -200,7 +200,7 @@ public function it_can_respond_to_about_command_with_default()
         app(\Spatie\Permission\PermissionRegistrar::class)->initializeCache();
 
         Artisan::call('about');
-        $output = Artisan::output();
+        $output = str_replace("\r\n", "\n", Artisan::output());
 
         $pattern = '/Spatie Permissions[ .\n]*Features Enabled[ .]*Default[ .\n]*Version/';
         if (method_exists($this, 'assertMatchesRegularExpression')) {
@@ -225,7 +225,7 @@ public function it_can_respond_to_about_command_with_teams()
         config()->set('permission.teams', true);
 
         Artisan::call('about');
-        $output = Artisan::output();
+        $output = str_replace("\r\n", "\n", Artisan::output());
 
         $pattern = '/Spatie Permissions[ .\n]*Features Enabled[ .]*Teams[ .\n]*Version/';
         if (method_exists($this, 'assertMatchesRegularExpression')) {