Fix identifier; fix tests for old PHP

Author: janedbal

src/Error/BlackMember.php

@@ -6,7 +6,9 @@
 use ShipMonk\PHPStan\DeadCode\Graph\ClassConstantRef;
 use ShipMonk\PHPStan\DeadCode\Graph\ClassMemberRef;
 use ShipMonk\PHPStan\DeadCode\Graph\ClassMemberUsage;
+use ShipMonk\PHPStan\DeadCode\Graph\ClassMethodRef;
 use ShipMonk\PHPStan\DeadCode\Graph\CollectedUsage;
+use ShipMonk\PHPStan\DeadCode\Graph\EnumCaseRef;
 use ShipMonk\PHPStan\DeadCode\Rule\DeadCodeRule;
 use function array_keys;
 use function count;
@@ -77,9 +79,15 @@ public function addExcludedUsage(CollectedUsage $excludedUsage): void
 
     public function getErrorIdentifier(): string
     {
-        return $this->member instanceof ClassConstantRef
-            ? DeadCodeRule::IDENTIFIER_CONSTANT
-            : DeadCodeRule::IDENTIFIER_METHOD;
+        if ($this->member instanceof ClassConstantRef) {
+            return DeadCodeRule::IDENTIFIER_CONSTANT;
+        } elseif ($this->member instanceof ClassMethodRef) {
+            return DeadCodeRule::IDENTIFIER_METHOD;
+        } elseif ($this->member instanceof EnumCaseRef) {
+            return DeadCodeRule::IDENTIFIER_ENUM_CASE;
+        } else {
+            throw new LogicException('Unknown member type');
+        }
     }
 
     public function getExclusionMessage(): string

tests/Rule/DeadCodeRuleTest.php

@@ -503,6 +503,10 @@ static function (string $message) use (&$actualOutput): void {
      */
     public function testAutoRemove(string $file): void
     {
+        if (PHP_VERSION_ID < 8_01_00) {
+            self::markTestSkipped('Requires PHP 8.1 to test enum case removal');
+        }
+
         $writtenOutput = '';
 
         $output = $this->createOutput();
@@ -792,11 +796,11 @@ public static function provideFiles(): Traversable
         yield 'const-traits-23' => [__DIR__ . '/data/constants/traits-23.php'];
 
         // enums
-        yield 'enum-basic' => [__DIR__ . '/data/enums/basic.php'];
-        yield 'enum-mixed' => [__DIR__ . '/data/enums/mixed.php'];
+        yield 'enum-basic' => [__DIR__ . '/data/enums/basic.php', self::requiresPhp(8_01_00)];
+        yield 'enum-mixed' => [__DIR__ . '/data/enums/mixed.php', self::requiresPhp(8_01_00)];
 
         // mixed member
-        yield 'mixed-member-enum' => [__DIR__ . '/data/mixed-member/enum.php'];
+        yield 'mixed-member-enum' => [__DIR__ . '/data/mixed-member/enum.php', self::requiresPhp(8_01_00)];
         yield 'mixed-member-full-method' => [__DIR__ . '/data/mixed-member/full-mixed-method.php'];
         yield 'mixed-member-full-const' => [__DIR__ . '/data/mixed-member/full-mixed-const.php'];
         yield 'mixed-member-indirect-2' => [__DIR__ . '/data/mixed-member/indirect-interface-2.php'];
@@ -845,7 +849,8 @@ public static function provideFiles(): Traversable
         yield 'mixed-member-const-traits-21' => [__DIR__ . '/data/mixed-member/traits-const-21.php'];
 
         // other
-        yield 'report-lines' => [__DIR__ . '/data/other/report-lines.php'];
+        yield 'report-lines' => [__DIR__ . '/data/other/report-lines.php', self::requiresPhp(8_01_00)];
+        yield 'identifiers' => [__DIR__ . '/data/other/error-identifiers.php', self::requiresPhp(8_01_00)];
     }
 
     /**

tests/Rule/data/other/error-identifiers.php

@@ -0,0 +1,17 @@
+<?php declare(strict_types = 1);
+
+namespace ErrorIdentifiers;
+
+class Foo
+{
+
+    public const BAR = 1; // @phpstan-ignore shipmonk.deadConstant
+
+    public function method(): void {} // @phpstan-ignore shipmonk.deadMethod
+
+}
+
+enum MyEnum: string
+{
+    case MyCase = 'A'; // @phpstan-ignore shipmonk.deadEnumCase
+}