Upgrade code to PHPStan 2.x

timeweb · Nov 11, 2024 · 1934f09 · 1934f09
1 parent d08ad92
commit 1934f09
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
     "require": {
         "php": "^7.4|^8.0",
         "myclabs/php-enum": "^1.2",
-        "phpstan/phpstan": "^1.0"
+        "phpstan/phpstan": "^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.0|^9.0"

diff --git a/src/Rule/EnumAlwaysUsedConstantsExtension.php b/src/Rule/EnumAlwaysUsedConstantsExtension.php
@@ -5,12 +5,12 @@
 namespace Timeweb\PHPStan\Rule;
 
 use MyCLabs\Enum\Enum;
-use PHPStan\Reflection\ConstantReflection;
+use PHPStan\Reflection\ClassConstantReflection;
 use PHPStan\Rules\Constants\AlwaysUsedClassConstantsExtension;
 
 class EnumAlwaysUsedConstantsExtension implements AlwaysUsedClassConstantsExtension
 {
-    public function isAlwaysUsed(ConstantReflection $constant): bool
+    public function isAlwaysUsed(ClassConstantReflection $constant): bool
     {
         return $constant->getDeclaringClass()->isSubclassOf(Enum::class);
     }

diff --git a/src/Rule/NoDuplicateEnumValueRule.php b/src/Rule/NoDuplicateEnumValueRule.php
@@ -10,6 +10,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Node\ClassConstantsNode;
 use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\ShouldNotHappenException;
 
 /**
@@ -43,11 +44,15 @@ public function processNode(Node $node, Scope $scope): array
         }
 
         return [
-            sprintf(
-                'Enum %s contains duplicated values for %s properties',
-                $classReflection->getName(),
-                implode(', ', $duplicatedKeysValue)
-            ),
+            RuleErrorBuilder::message(
+                sprintf('Enum %s contains duplicated values for %s properties',
+                    $classReflection->getName(),
+                    implode(', ', $duplicatedKeysValue)
+                )
+            )
+                ->line($node->getLine())
+                ->identifier('timewebEnum.duplicatedValues')
+                ->build(),
         ];
     }
 

diff --git a/tests/Reflection/EnumMethodsClassReflectionExtensionTest.php b/tests/Reflection/EnumMethodsClassReflectionExtensionTest.php
@@ -93,14 +93,12 @@ public function testEnumMethodProperties(string $propertyName): void
     {
         $classReflection = $this->reflectionProvider->getClass(EnumFixture::class);
         $methodReflection = $this->reflectionExtension->getMethod($classReflection, $propertyName);
-        $parametersAcceptor = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());
 
         $this->assertSame($propertyName, $methodReflection->getName());
         $this->assertSame($classReflection, $methodReflection->getDeclaringClass());
         $this->assertTrue($methodReflection->isStatic());
         $this->assertFalse($methodReflection->isPrivate());
         $this->assertTrue($methodReflection->isPublic());
-        $this->assertSame(EnumFixture::class, $parametersAcceptor->getReturnType()->describe(VerbosityLevel::value()));
     }
 
     /**