Repository navigation
Inline class-name import skip voters into ClassNameImportSkipper - #8696
Merged
Merged
Conversation
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
1 participant
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.
What
The name-import skip decision was spread across 7 voter services behind
ClassNameImportSkipVoterInterface, collected into an array and run viaarray_any. After #8687, #8691 and #8695 routed every file-global read throughClassNameImportContext, the voters are thin and share the same two dependencies.This inlines all 7 into
ClassNameImportSkipperas private methods and deletes the indirection.Change
Removed:
*SkipVoterclassesClassNameImportSkipVoterInterfaceLazyContainerFactoryClassNameImportSkippernow injectsClassNameImportContext+NamespaceBeforeClassNameResolverdirectly and ORs the seven conditions, cheap node-local checks first (reserved name, short class, original name) so the file-global lookups are short-circuited when possible. Each voter's condition is preserved verbatim - no behavior change.Net: skipper + context instead of skipper + 7 tagged services (-345/+190 lines).
Tests
211 import tests green (
rules-tests/CodingStyle/ClassNameImport,ImportFullyQualifiedNamesRector,tests/Issues/AutoImport*,NamespacedUseAutoImport, docblock import,RenameClassRector) - container boots and wires correctly. ECS + full PHPStan clean.