diff --git a/src/Handlers/SuppressHandler.php b/src/Handlers/SuppressHandler.php
index d87b1bfb..d475ed1d 100644
--- a/src/Handlers/SuppressHandler.php
+++ b/src/Handlers/SuppressHandler.php
@@ -92,7 +92,10 @@ public static function afterClassLikeVisit(AfterClassLikeVisitEvent $event): voi
foreach (self::BY_CLASS_METHOD as $issue => $method_by_class) {
foreach ($method_by_class[$class->name] ?? [] as $method_name) {
/** @psalm-suppress RedundantFunctionCall */
- self::suppress($issue, $class->methods[strtolower($method_name)] ?? null);
+ $method_storage = $class->methods[strtolower($method_name)] ?? null;
+ if ($method_storage instanceof MethodStorage) {
+ self::suppress($issue, $method_storage);
+ }
}
}
@@ -114,7 +117,10 @@ public static function afterClassLikeVisit(AfterClassLikeVisitEvent $event): voi
}
foreach ($method_names as $method_name) {
- self::suppress($issue, $class->methods[strtolower($method_name)] ?? null);
+ $method_storage = $class->methods[strtolower($method_name)] ?? null;
+ if ($method_storage instanceof MethodStorage) {
+ self::suppress($issue, $method_storage);
+ }
}
}
}
@@ -134,7 +140,10 @@ public static function afterClassLikeVisit(AfterClassLikeVisitEvent $event): voi
}
foreach ($property_names as $property_name) {
- self::suppress($issue, $class->properties[$property_name] ?? null);
+ $property_storage = $class->properties[$property_name] ?? null;
+ if ($property_storage instanceof PropertyStorage) {
+ self::suppress($issue, $property_storage);
+ }
}
}
}
@@ -148,12 +157,9 @@ public static function afterClassLikeVisit(AfterClassLikeVisitEvent $event): voi
}
}
- /**
- * @param ClassLikeStorage|PropertyStorage|MethodStorage|null $storage
- */
- private static function suppress(string $issue, $storage): void
+ private static function suppress(string $issue, ClassLikeStorage|PropertyStorage|MethodStorage $storage): void
{
- if ($storage && !in_array($issue, $storage->suppressed_issues, true)) {
+ if (!in_array($issue, $storage->suppressed_issues, true)) {
$storage->suppressed_issues[] = $issue;
}
}
diff --git a/tests/Application/laravel-test-baseline.xml b/tests/Application/laravel-test-baseline.xml
index 24a684d8..3c8634e8 100644
--- a/tests/Application/laravel-test-baseline.xml
+++ b/tests/Application/laravel-test-baseline.xml
@@ -23,13 +23,6 @@