chore: simplify ClassDefinitionFixer
#8868
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
# Conflicts: # dev-tools/phpstan/baseline/_loader.php # dev-tools/phpstan/baseline/booleanNot.exprNotBoolean.php
# Conflicts: # dev-tools/phpstan/baseline/_loader.php # dev-tools/phpstan/baseline/booleanNot.exprNotBoolean.php # dev-tools/phpstan/baseline/offsetAccess.notFound.php # dev-tools/phpstan/baseline/preInc.nonNumeric.php # dev-tools/phpstan/baseline/return.type.php
# Conflicts: # dev-tools/phpstan/baseline/return.type.php
There was a problem hiding this comment.
Pull Request Overview
This PR simplifies the ClassDefinitionFixer by consolidating type definitions and unifying the inheritance tracking approach. The main purpose is to reduce complexity by replacing separate type definitions for extends and implements functionality with a single unified type.
Key changes include:
- Unified type definitions from separate
_ClassExtendsInfoand_ClassImplementsInfoto a single_ClassReferenceInfo - Standardized property names from
numberOfExtends/numberOfImplementstocount - Simplified method signatures by removing redundant label parameters
Reviewed Changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| src/Fixer/ClassNotation/ClassDefinitionFixer.php | Core implementation changes unifying type definitions and simplifying the inheritance tracking logic |
| tests/Fixer/ClassNotation/ClassDefinitionFixerTest.php | Test updates to match the new unified API and property naming |
| dev-tools/phpstan/baseline/return.type.php | Removed PHPStan baseline errors that are now resolved |
| dev-tools/phpstan/baseline/preInc.nonNumeric.php | Removed entire baseline file as errors are resolved |
| dev-tools/phpstan/baseline/offsetAccess.notFound.php | Removed offset access errors that are now resolved |
| dev-tools/phpstan/baseline/booleanNot.exprNotBoolean.php | Removed entire baseline file as errors are resolved |
| dev-tools/phpstan/baseline/_loader.php | Updated loader to exclude resolved baseline files |
kubawerlos
approved these changes
Jul 20, 2025
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.
No description provided.