fix: Adjust code for Psalm 6 updates

nickvergessen · nickvergessen · commit 6a98e84f9715 · 2026-04-27T16:27:33.000+02:00
Signed-off-by: Joas Schilling &lt;coding@schilljs.com&gt;
diff --git a/src/ClassNameImport/NextcloudNamespaceSkipVoter.php b/src/ClassNameImport/NextcloudNamespaceSkipVoter.php
@@ -9,6 +9,7 @@
 
 namespace Nextcloud\Rector\ClassNameImport;
 
+use Override;
 use PhpParser\Node;
 use Rector\CodingStyle\Contract\ClassNameImport\ClassNameImportSkipVoterInterface;
 use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
@@ -24,7 +25,7 @@
  * $config = RectorConfig::configure()[…]->withImportNames(importShortClasses:false);
  * $config->registerService(NextcloudNamespaceSkipVoter::class, tag:ClassNameImportSkipVoterInterface::class);
  */
-class NextcloudNamespaceSkipVoter implements ClassNameImportSkipVoterInterface
+final class NextcloudNamespaceSkipVoter implements ClassNameImportSkipVoterInterface
 {
     /**
      * @var list<string>
@@ -48,6 +49,7 @@ class NextcloudNamespaceSkipVoter implements ClassNameImportSkipVoterInterface
         'Provider',
     ];
 
+    #[Override]
     public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node): bool
     {
         if (in_array($fullyQualifiedObjectType->getShortName(), $this->skippedClassNames)) {
diff --git a/src/Rector/AnnotationToAttributeRector.php b/src/Rector/AnnotationToAttributeRector.php
@@ -9,6 +9,7 @@
 
 namespace Nextcloud\Rector\Rector;
 
+use Override;
 use PHPStan\PhpDocParser\Ast\Node as DocNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\GenericTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
@@ -111,6 +112,7 @@ public function action()
     /**
      * @return array<class-string<Node>>
      */
+    #[Override]
     public function getNodeTypes(): array
     {
         return [
@@ -124,6 +126,7 @@ public function getNodeTypes(): array
      *
      * @psalm-suppress MoreSpecificImplementedParamType
      */
+    #[Override]
     public function refactor(Node $node): ?Node
     {
         if ($this->annotationsToAttributes === []) {
@@ -155,6 +158,7 @@ public function refactor(Node $node): ?Node
      *
      * @psalm-suppress MoreSpecificImplementedParamType
      */
+    #[Override]
     public function configure(array $configuration): void
     {
         Assert::allIsAOf($configuration, AnnotationToAttribute::class);
@@ -164,6 +168,7 @@ public function configure(array $configuration): void
     /**
      * @return PhpVersionFeature::ATTRIBUTES
      */
+    #[Override]
     public function provideMinPhpVersion(): int
     {
         return PhpVersionFeature::ATTRIBUTES;
diff --git a/src/Rector/LegacyGetterToOcpServerGetRector.php b/src/Rector/LegacyGetterToOcpServerGetRector.php
@@ -11,6 +11,7 @@
 
 use InvalidArgumentException;
 use Nextcloud\Rector\ValueObject\LegacyGetterToOcpServerGet;
+use Override;
 use PHPStan\Type\ObjectType;
 use PhpParser\Node;
 use PhpParser\Node\Expr\MethodCall;
@@ -46,11 +47,13 @@ public function getRuleDefinition(): RuleDefinition
     /**
      * @return array<class-string<Node>>
      */
+    #[Override]
     public function getNodeTypes(): array
     {
         return [MethodCall::class];
     }
 
+    #[Override]
     public function refactor(Node $node): ?Node
     {
         if (!($node instanceof MethodCall)) {
@@ -100,6 +103,7 @@ public function refactor(Node $node): ?Node
     /**
      * @param mixed[] $configuration
      */
+    #[Override]
     public function configure(array $configuration): void
     {
         foreach ($configuration as $config) {
diff --git a/src/Rector/OcServerToOcpServerRector.php b/src/Rector/OcServerToOcpServerRector.php
@@ -9,6 +9,7 @@
 
 namespace Nextcloud\Rector\Rector;
 
+use Override;
 use PHPStan\Type\ObjectType;
 use PhpParser\Node;
 use PhpParser\Node\Expr\MethodCall;
@@ -19,16 +20,18 @@
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
-class OcServerToOcpServerRector extends AbstractRector
+final class OcServerToOcpServerRector extends AbstractRector
 {
     /**
      * @return array<class-string<Node>>
      */
+    #[Override]
     public function getNodeTypes(): array
     {
         return [MethodCall::class];
     }
 
+    #[Override]
     public function refactor(Node $node): ?Node
     {
         if (!($node instanceof MethodCall)) {
diff --git a/src/Rector/OcpUtilAddScriptRector.php b/src/Rector/OcpUtilAddScriptRector.php
@@ -4,6 +4,7 @@
 
 namespace Nextcloud\Rector\Rector;
 
+use Override;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\FuncCall;
@@ -16,16 +17,18 @@
 
 use function count;
 
-class OcpUtilAddScriptRector extends AbstractRector
+final class OcpUtilAddScriptRector extends AbstractRector
 {
     /**
      * @return array<class-string<Node>>
      */
+    #[Override]
     public function getNodeTypes(): array
     {
         return [FuncCall::class];
     }
 
+    #[Override]
     public function refactor(Node $node): ?Node
     {
         if (!($node instanceof FuncCall)) {
diff --git a/src/Rector/RenameParameterRector.php b/src/Rector/RenameParameterRector.php
@@ -11,6 +11,7 @@
 
 use InvalidArgumentException;
 use Nextcloud\Rector\ValueObject\RenameParameter;
+use Override;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Assign;
@@ -31,7 +32,7 @@
 use function is_array;
 
 /** @psalm-suppress PropertyNotSetInConstructor */
-class RenameParameterRector extends AbstractRector implements ConfigurableRectorInterface
+final class RenameParameterRector extends AbstractRector implements ConfigurableRectorInterface
 {
     /** @var RenameParameter[] */
     private array $renameParameters = [];
@@ -57,6 +58,7 @@ public function getRuleDefinition(): RuleDefinition
     /**
      * @param mixed[] $configuration
      */
+    #[Override]
     public function configure(array $configuration): void
     {
         foreach ($configuration as $renameParameter) {
@@ -70,11 +72,13 @@ public function configure(array $configuration): void
     /**
      * @return array<class-string<Node>>
      */
+    #[Override]
     public function getNodeTypes(): array
     {
         return [Class_::class];
     }
 
+    #[Override]
     public function refactor(Node $node): ?Node
     {
         if (!($node instanceof Class_)) {
diff --git a/src/Rector/ReplaceFetchAllMethodCallRector.php b/src/Rector/ReplaceFetchAllMethodCallRector.php
@@ -10,6 +10,7 @@
 
 namespace Nextcloud\Rector\Rector;
 
+use Override;
 use PHPStan\Type\ObjectType;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
@@ -68,11 +69,13 @@ public function run(IConnection $connection)
     /**
      * @return array<class-string<Node>>
      */
+    #[Override]
     public function getNodeTypes(): array
     {
         return [MethodCall::class];
     }
 
+    #[Override]
     public function refactor(Node $node): ?Node
     {
         if (!($node instanceof MethodCall)) {
diff --git a/src/Rector/ReplaceIConfigWithIAppConfigRector.php b/src/Rector/ReplaceIConfigWithIAppConfigRector.php
@@ -9,6 +9,7 @@
 
 namespace Nextcloud\Rector\Rector;
 
+use Override;
 use PHPStan\Type\ObjectType;
 use PhpParser\Modifiers;
 use PhpParser\Node;
@@ -87,11 +88,13 @@ public function run(): string
     /**
      * @return array<class-string<Node>>
      */
+    #[Override]
     public function getNodeTypes(): array
     {
         return [Class_::class];
     }
 
+    #[Override]
     public function refactor(Node $node): ?Node
     {
         if (!($node instanceof Class_)) {

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace Nextcloud\Rector\Rector;`
`11`	`11`
	`12`	`+use Override;`
`12`	`13`	`use PHPStan\PhpDocParser\Ast\Node as DocNode;`
`13`	`14`	`use PHPStan\PhpDocParser\Ast\PhpDoc\GenericTagValueNode;`
`14`	`15`	`use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;`
`@@ -111,6 +112,7 @@ public function action()`
`111`	`112`	`/**`
`112`	`113`	`* @return array<class-string<Node>>`
`113`	`114`	`*/`
	`115`	`+ #[Override]`
`114`	`116`	`public function getNodeTypes(): array`
`115`	`117`	`{`
`116`	`118`	`return [`
`@@ -124,6 +126,7 @@ public function getNodeTypes(): array`
`124`	`126`	`*`
`125`	`127`	`* @psalm-suppress MoreSpecificImplementedParamType`
`126`	`128`	`*/`
	`129`	`+ #[Override]`
`127`	`130`	`public function refactor(Node $node): ?Node`
`128`	`131`	`{`
`129`	`132`	`if ($this->annotationsToAttributes === []) {`
`@@ -155,6 +158,7 @@ public function refactor(Node $node): ?Node`
`155`	`158`	`*`
`156`	`159`	`* @psalm-suppress MoreSpecificImplementedParamType`
`157`	`160`	`*/`
	`161`	`+ #[Override]`
`158`	`162`	`public function configure(array $configuration): void`
`159`	`163`	`{`
`160`	`164`	`Assert::allIsAOf($configuration, AnnotationToAttribute::class);`
`@@ -164,6 +168,7 @@ public function configure(array $configuration): void`
`164`	`168`	`/**`
`165`	`169`	`* @return PhpVersionFeature::ATTRIBUTES`
`166`	`170`	`*/`
	`171`	`+ #[Override]`
`167`	`172`	`public function provideMinPhpVersion(): int`
`168`	`173`	`{`
`169`	`174`	`return PhpVersionFeature::ATTRIBUTES;`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Nextcloud\Rector\Rector;`
`6`	`6`
	`7`	`+use Override;`
`7`	`8`	`use PhpParser\Node;`
`8`	`9`	`use PhpParser\Node\Arg;`
`9`	`10`	`use PhpParser\Node\Expr\FuncCall;`
`@@ -16,16 +17,18 @@`
`16`	`17`
`17`	`18`	`use function count;`
`18`	`19`
`19`		`-class OcpUtilAddScriptRector extends AbstractRector`
	`20`	`+final class OcpUtilAddScriptRector extends AbstractRector`
`20`	`21`	`{`
`21`	`22`	`/**`
`22`	`23`	`* @return array<class-string<Node>>`
`23`	`24`	`*/`
	`25`	`+ #[Override]`
`24`	`26`	`public function getNodeTypes(): array`
`25`	`27`	`{`
`26`	`28`	`return [FuncCall::class];`
`27`	`29`	`}`
`28`	`30`
	`31`	`+ #[Override]`
`29`	`32`	`public function refactor(Node $node): ?Node`
`30`	`33`	`{`
`31`	`34`	`if (!($node instanceof FuncCall)) {`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`
`11`	`11`	`namespace Nextcloud\Rector\Rector;`
`12`	`12`
	`13`	`+use Override;`
`13`	`14`	`use PHPStan\Type\ObjectType;`
`14`	`15`	`use PhpParser\Node;`
`15`	`16`	`use PhpParser\Node\Arg;`
`@@ -68,11 +69,13 @@ public function run(IConnection $connection)`
`68`	`69`	`/**`
`69`	`70`	`* @return array<class-string<Node>>`
`70`	`71`	`*/`
	`72`	`+ #[Override]`
`71`	`73`	`public function getNodeTypes(): array`
`72`	`74`	`{`
`73`	`75`	`return [MethodCall::class];`
`74`	`76`	`}`
`75`	`77`
	`78`	`+ #[Override]`
`76`	`79`	`public function refactor(Node $node): ?Node`
`77`	`80`	`{`
`78`	`81`	`if (!($node instanceof MethodCall)) {`