[TypeDeclaration] Add PrivateMethodReturnTypeFromStrictNewArrayRector, split private methods out#8153
Merged
TomasVotruba merged 2 commits intoJul 8, 2026
Conversation
TomasVotruba
force-pushed
the
split-private-method-return-type-strict-new-array
branch
from
July 7, 2026 17:03
3f6bf59 to
8c7656f
Compare
…, split private methods from ReturnTypeFromStrictNewArrayRector
TomasVotruba
force-pushed
the
split-private-method-return-type-strict-new-array
branch
from
July 7, 2026 17:14
8c7656f to
0e65933
Compare
…eturnNewArrayResolver service
TomasVotruba
deleted the
split-private-method-return-type-strict-new-array
branch
July 8, 2026 10:19
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Splits private-method handling out of
ReturnTypeFromStrictNewArrayRectorinto a dedicated, safer rule.Private methods have no external contract (can't be overridden), so they're the safest case for adding a strict array return type. The new rule runs above the original in the type-declaration level order, and the original now skips private methods.
New rule:
PrivateMethodReturnTypeFromStrictNewArrayRectorHandles private methods only. Drops the
ClassMethodReturnTypeOverrideGuardcheck the original needs, since private methods can't be overridden.final class SomeClass { - private function run() + private function run(): array { $values = []; return $values; } }Changed:
ReturnTypeFromStrictNewArrayRectorNow skips private methods (handled by the new rule above); still covers functions and public/protected methods.
private function shouldSkip(ClassMethod|Function_|Closure $node, Scope $scope): bool { if ($node->returnType instanceof Node) { return true; } + // private methods are handled by PrivateMethodReturnTypeFromStrictNewArrayRector + if ($node instanceof ClassMethod && $node->isPrivate()) { + return true; + } + return $node instanceof ClassMethod && $this->classMethodReturnTypeOverrideGuard->shouldSkipClassMethod(...); }New rule registered directly above the original in
TypeDeclarationLevel.