From 0a1bbaee3e4429b2e1b15788cb3ae00fa1642345 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Wed, 18 Nov 2026 20:09:47 +0100 Subject: [PATCH 1/3] fix: support rector 2.8 Rector 2.8.2 removed its own `PhpDocNodeTraverser` in favour of the phpdoc-parser `NodeTraverser` and deprecated `PhpVersionFeature`. Assisted-by: ClaudeCode:claude-opus-5-5 --- src/Rector/AnnotationToAttributeRector.php | 18 +++++++++--------- src/Rector/ReplaceInjectedMethodCallRector.php | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Rector/AnnotationToAttributeRector.php b/src/Rector/AnnotationToAttributeRector.php index 8a869c3..f9445c1 100644 --- a/src/Rector/AnnotationToAttributeRector.php +++ b/src/Rector/AnnotationToAttributeRector.php @@ -11,6 +11,7 @@ use Override; use PHPStan\PhpDocParser\Ast\Node as DocNode; +use PHPStan\PhpDocParser\Ast\NodeTraverser; use PHPStan\PhpDocParser\Ast\PhpDoc\GenericTagValueNode; use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode; use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTextNode; @@ -42,9 +43,9 @@ use Rector\Php80\ValueObject\AttributeValueAndDocComment; use Rector\Php80\ValueObject\DoctrineTagAndAnnotationToAttribute; use Rector\PhpAttribute\NodeFactory\PhpAttributeGroupFactory; -use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser; +use Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\CallablePhpDocNodeVisitor; use Rector\Rector\AbstractRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -166,12 +167,12 @@ public function configure(array $configuration): void } /** - * @return PhpVersionFeature::ATTRIBUTES + * @return PhpVersion::PHP_80 */ #[Override] public function provideMinPhpVersion(): int { - return PhpVersionFeature::ATTRIBUTES; + return PhpVersion::PHP_80; } /** @@ -180,10 +181,7 @@ public function provideMinPhpVersion(): int private function processGenericTags(PhpDocInfo $phpDocInfo): array { $attributeGroups = []; - $phpDocNodeTraverser = new PhpDocNodeTraverser(); - $phpDocNodeTraverser->traverseWithCallable( - $phpDocInfo->getPhpDocNode(), - '', + $phpDocNodeVisitor = new CallablePhpDocNodeVisitor( function (DocNode $docNode) use (&$attributeGroups) { if (!$docNode instanceof PhpDocTagNode) { return null; @@ -225,12 +223,14 @@ function (DocNode $docNode) use (&$attributeGroups) { return new PhpDocTextNode($attributeValueAndDocComment->docComment); } - return PhpDocNodeTraverser::NODE_REMOVE; + return NodeTraverser::REMOVE_NODE; } return null; }, ); + $phpDocNodeTraverser = new NodeTraverser([$phpDocNodeVisitor]); + $phpDocNodeTraverser->traverse([$phpDocInfo->getPhpDocNode()]); return $attributeGroups; } diff --git a/src/Rector/ReplaceInjectedMethodCallRector.php b/src/Rector/ReplaceInjectedMethodCallRector.php index 314207c..a57decb 100644 --- a/src/Rector/ReplaceInjectedMethodCallRector.php +++ b/src/Rector/ReplaceInjectedMethodCallRector.php @@ -31,7 +31,7 @@ use Rector\Exception\Configuration\InvalidConfigurationException; use Rector\Rector\AbstractRector; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -199,12 +199,12 @@ public function configure(array $configuration): void } /** - * @return PhpVersionFeature::PROPERTY_PROMOTION + * @return PhpVersion::PHP_80 */ #[Override] public function provideMinPhpVersion(): int { - return PhpVersionFeature::PROPERTY_PROMOTION; + return PhpVersion::PHP_80; } /** From eee8b69048484050497564249adeccfcc4eb8cfb Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Wed, 18 Nov 2026 20:09:47 +0100 Subject: [PATCH 2/3] fix: replace no longer working RenameStaticMethodRector Rector 2.8 turned `RenameStaticMethodRector` into a no-op, so the `OC_Helper` to `OCP\Util` migration needs its own rule. Assisted-by: ClaudeCode:claude-opus-5-5 --- .../nextcloud-25-deprecations.php | 11 +--- src/Rector/OcHelperToOcpUtilRector.php | 66 +++++++++++++++++++ .../Fixture/test_fixture.php.inc | 33 ++++++++++ .../OcHelperToOcpUtilRectorTest.php | 28 ++++++++ .../OcHelperToOcpUtilRector/config/config.php | 11 ++++ 5 files changed, 140 insertions(+), 9 deletions(-) create mode 100644 src/Rector/OcHelperToOcpUtilRector.php create mode 100644 tests/Rector/OcHelperToOcpUtilRector/Fixture/test_fixture.php.inc create mode 100644 tests/Rector/OcHelperToOcpUtilRector/OcHelperToOcpUtilRectorTest.php create mode 100644 tests/Rector/OcHelperToOcpUtilRector/config/config.php diff --git a/config/nextcloud-25/nextcloud-25-deprecations.php b/config/nextcloud-25/nextcloud-25-deprecations.php index 8bdfed7..3630233 100644 --- a/config/nextcloud-25/nextcloud-25-deprecations.php +++ b/config/nextcloud-25/nextcloud-25-deprecations.php @@ -3,6 +3,7 @@ declare(strict_types=1); use Nextcloud\Rector\Rector\LegacyGetterToOcpServerGetRector; +use Nextcloud\Rector\Rector\OcHelperToOcpUtilRector; use Nextcloud\Rector\Rector\OcServerToOcpServerRector; use Nextcloud\Rector\Rector\OcpUtilAddScriptRector; use Nextcloud\Rector\ValueObject\LegacyGetterToOcpServerGet; @@ -10,24 +11,16 @@ use Rector\CodingStyle\Rector\FuncCall\StrictInArrayRector; use Rector\Config\RectorConfig; use Rector\Renaming\Rector\Name\RenameClassRector; -use Rector\Renaming\Rector\StaticCall\RenameStaticMethodRector; -use Rector\Renaming\ValueObject\RenameStaticMethod; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rules([ + OcHelperToOcpUtilRector::class, OcServerToOcpServerRector::class, OcpUtilAddScriptRector::class, StrictInArrayRector::class, UseIdenticalOverEqualWithSameTypeRector::class, ]); - $rectorConfig->ruleWithConfiguration(RenameStaticMethodRector::class, [ - // Deprecated since 4.0.0 - new RenameStaticMethod('OC_Helper', 'computerFileSize', 'OCP\Util', 'computerFileSize'), - // Deprecated since 4.0.0 - new RenameStaticMethod('OC_Helper', 'humanFileSize', 'OCP\Util', 'humanFileSize'), - ]); - $rectorConfig->ruleWithConfiguration( LegacyGetterToOcpServerGetRector::class, [ diff --git a/src/Rector/OcHelperToOcpUtilRector.php b/src/Rector/OcHelperToOcpUtilRector.php new file mode 100644 index 0000000..b91710c --- /dev/null +++ b/src/Rector/OcHelperToOcpUtilRector.php @@ -0,0 +1,66 @@ +> + */ + #[Override] + public function getNodeTypes(): array + { + return [StaticCall::class]; + } + + #[Override] + public function refactor(Node $node): ?Node + { + if (!($node instanceof StaticCall)) { + return null; + } + if (!$this->isName($node->class, 'OC_Helper')) { + return null; + } + if (!$this->isNames($node->name, self::METHODS)) { + return null; + } + + $node->class = new FullyQualified('OCP\Util'); + + return $node; + } + + public function getRuleDefinition(): RuleDefinition + { + return new RuleDefinition( + 'Change static calls of OC_Helper::computerFileSize and OC_Helper::humanFileSize to OCP\Util.', + [ + new CodeSample( + '\OC_Helper::humanFileSize(1223);', + '\OCP\Util::humanFileSize(1223);', + ), + ], + ); + } +} diff --git a/tests/Rector/OcHelperToOcpUtilRector/Fixture/test_fixture.php.inc b/tests/Rector/OcHelperToOcpUtilRector/Fixture/test_fixture.php.inc new file mode 100644 index 0000000..7bc172a --- /dev/null +++ b/tests/Rector/OcHelperToOcpUtilRector/Fixture/test_fixture.php.inc @@ -0,0 +1,33 @@ + +----- + diff --git a/tests/Rector/OcHelperToOcpUtilRector/OcHelperToOcpUtilRectorTest.php b/tests/Rector/OcHelperToOcpUtilRector/OcHelperToOcpUtilRectorTest.php new file mode 100644 index 0000000..f228d11 --- /dev/null +++ b/tests/Rector/OcHelperToOcpUtilRector/OcHelperToOcpUtilRectorTest.php @@ -0,0 +1,28 @@ +doTestFile($filePath); + } + + public static function provideData(): Iterator + { + return self::yieldFilesFromDirectory(__DIR__ . '/Fixture'); + } + + public function provideConfigFilePath(): string + { + return __DIR__ . '/config/config.php'; + } +} diff --git a/tests/Rector/OcHelperToOcpUtilRector/config/config.php b/tests/Rector/OcHelperToOcpUtilRector/config/config.php new file mode 100644 index 0000000..afed9f7 --- /dev/null +++ b/tests/Rector/OcHelperToOcpUtilRector/config/config.php @@ -0,0 +1,11 @@ +withRules([ + OcHelperToOcpUtilRector::class, + ]); From b73b747ab7977eda9c0e48eeb577bd21be999cde Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Wed, 18 Nov 2026 20:09:47 +0100 Subject: [PATCH 3/3] fix!: remove NextcloudNamespaceSkipVoter Rector 2.8 removed `ClassNameImportSkipVoterInterface` without a replacement, so name imports can no longer be limited to Nextcloud namespaces. Assisted-by: ClaudeCode:claude-opus-5-5 --- .../NextcloudNamespaceSkipVoter.php | 69 ------------------- .../Fixture/test_fixture.php.inc | 46 ------------- .../NextcloudClassNameImportTest.php | 45 ------------ tests/ClassNameImport/config/config.php | 13 ---- 4 files changed, 173 deletions(-) delete mode 100644 src/ClassNameImport/NextcloudNamespaceSkipVoter.php delete mode 100644 tests/ClassNameImport/Fixture/test_fixture.php.inc delete mode 100644 tests/ClassNameImport/NextcloudClassNameImportTest.php delete mode 100644 tests/ClassNameImport/config/config.php diff --git a/src/ClassNameImport/NextcloudNamespaceSkipVoter.php b/src/ClassNameImport/NextcloudNamespaceSkipVoter.php deleted file mode 100644 index aeaa565..0000000 --- a/src/ClassNameImport/NextcloudNamespaceSkipVoter.php +++ /dev/null @@ -1,69 +0,0 @@ -withImportNames(importShortClasses:false); - * $config->registerService(NextcloudNamespaceSkipVoter::class); - */ -final class NextcloudNamespaceSkipVoter implements ClassNameImportSkipVoterInterface -{ - /** - * @var list - */ - protected array $namespacePrefixes = [ - 'OC', - 'OCA', - 'OCP', - ]; - /** - * @var list - */ - protected array $skippedClassNames = [ - 'Backend', - 'Connection', - 'Exception', - 'IManager', - 'IProvider', - 'Manager', - 'Plugin', - 'Provider', - ]; - - #[Override] - public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedObjectType, Node $node): bool - { - if (in_array($fullyQualifiedObjectType->getShortName(), $this->skippedClassNames)) { - // Skip common class names to avoid confusion - return true; - } - foreach ($this->namespacePrefixes as $prefix) { - if (str_starts_with($fullyQualifiedObjectType->getClassName(), $prefix . '\\')) { - // Import Nextcloud namespaces - return false; - } - } - - // Skip everything else - return true; - } -} diff --git a/tests/ClassNameImport/Fixture/test_fixture.php.inc b/tests/ClassNameImport/Fixture/test_fixture.php.inc deleted file mode 100644 index 6376707..0000000 --- a/tests/ClassNameImport/Fixture/test_fixture.php.inc +++ /dev/null @@ -1,46 +0,0 @@ -get(\OCP\IRequest::class); - $request2 = \OCP\Server::get(\OCP\IRequest::class); - $class = new \OCA\My\CustomClass(); - $otherNamespace = new \Rector\Config\RectorConfig(); - $manager = \OCP\Server::get(\OCP\Share\IManager); - $manager = \OCP\Server::get(TwoFactorAuth\IProvider); - throw new \Exception('Class from root namespace'); - } -} - -?> ------ -get(IRequest::class); - $request2 = Server::get(IRequest::class); - $class = new CustomClass(); - $otherNamespace = new \Rector\Config\RectorConfig(); - $manager = Server::get(\OCP\Share\IManager); - $manager = Server::get(TwoFactorAuth\IProvider); - throw new \Exception('Class from root namespace'); - } -} - -?> diff --git a/tests/ClassNameImport/NextcloudClassNameImportTest.php b/tests/ClassNameImport/NextcloudClassNameImportTest.php deleted file mode 100644 index 6f5f3da..0000000 --- a/tests/ClassNameImport/NextcloudClassNameImportTest.php +++ /dev/null @@ -1,45 +0,0 @@ -doTestFile($filePath); - } - - public static function provideData(): Iterator - { - return self::yieldFilesFromDirectory(__DIR__ . '/Fixture'); - } - - public function provideConfigFilePath(): string - { - return __DIR__ . '/config/config.php'; - } -} diff --git a/tests/ClassNameImport/config/config.php b/tests/ClassNameImport/config/config.php deleted file mode 100644 index ef88230..0000000 --- a/tests/ClassNameImport/config/config.php +++ /dev/null @@ -1,13 +0,0 @@ -withImportNames(importShortClasses:false); - -$config->registerService(NextcloudNamespaceSkipVoter::class); - -return $config;