Extract ComposerIntrospector to deduplicate vendor dir and composer.json handling#399
Merged
Conversation
…on handling Three copies of the "single registered vendor dir" autodetection (TestsUsageExcluder, SymfonyUsageProvider, ComposerUsageProvider) and two copies of the composer.json read+decode block are replaced by a single ComposerRootLocator service. Co-Authored-By: Claude Code
Co-Authored-By: Claude Code
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.
Follow-up to #397, which added a third identical copy of the "single registered vendor dir" autodetection snippet and a second copy of the composer.json read + decode block.
Changes
ShipMonk\PHPStan\DeadCode\Composer\ComposerIntrospectorservice (registered inrules.neon) with:autodetectVendorDir()— the sharedClassLoader::getRegisteredLoaders()/ phar-filter / single-loader logicautodetectComposerJsonPath()—vendorDir/../composer.json+is_filecheckparseComposerJson()— read +json_decode+ error handlingTestsUsageExcluder,ComposerUsageProviderandSymfonyUsageProvidernow inject it instead of carrying private copies (Symfony only needsautodetectVendorDir()for its../configderivation).TestsUsageExcluder::extractAutoloadPaths()now takesmixedand validates the structure itself, since the sharedparseComposerJson()no longer pretends to know theautoload-devshape via a PhpDoc array shape.No behavior change for any composer.json that composer itself accepts; the only difference is that a few degenerate inputs (scalar top-level JSON, malformed
autoload-devshapes) which previously crashedTestsUsageExcluderwith aTypeErrornow degrade to "no dev paths detected".VendorUsageProvideris intentionally untouched as it needs all vendor dirs including the phar one.Co-Authored-By: Claude Code