Skip to content

Revert "[Testing] Use fresh single-file source locator under PHPUnit" (#8464) #8465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomasVotruba merged 1 commit into from
Sep 5, 2026
+2 −9
Merged

Revert "[Testing] Use fresh single-file source locator under PHPUnit" (#8464) #8465

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions ...solver/Reflection/BetterReflection/SourceLocatorProvider/DynamicSourceLocatorProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use PHPStan\BetterReflection\SourceLocator\Type\AggregateSourceLocator;
use PHPStan\BetterReflection\SourceLocator\Type\SourceLocator;
use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedDirectorySourceLocatorFactory;
use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedSingleFileSourceLocatorFactory;
use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedSingleFileSourceLocatorRepository;
use Rector\Contract\DependencyInjection\ResettableInterface;
use Rector\Testing\PHPUnit\StaticPHPUnitEnvironment;
Expand All @@ -31,8 +30,7 @@ final class DynamicSourceLocatorProvider implements ResettableInterface

public function __construct(
private readonly OptimizedDirectorySourceLocatorFactory $optimizedDirectorySourceLocatorFactory,
private readonly OptimizedSingleFileSourceLocatorRepository $optimizedSingleFileSourceLocatorRepository,
private readonly OptimizedSingleFileSourceLocatorFactory $optimizedSingleFileSourceLocatorFactory
private readonly OptimizedSingleFileSourceLocatorRepository $optimizedSingleFileSourceLocatorRepository
) {
}

Expand Down Expand Up @@ -69,12 +67,7 @@ public function provide(): SourceLocator
$sourceLocators = [];

foreach ($this->filePaths as $file) {
// under PHPUnit each fixture is a throwaway temp file that is deleted after the test;
// the shared repository caches locators by path forever, so a stale locator for a since-deleted
// file can leak into a later test. build a fresh locator per run there, keep caching in production
$sourceLocators[] = $isPHPUnitRun
? $this->optimizedSingleFileSourceLocatorFactory->create($file)
: $this->optimizedSingleFileSourceLocatorRepository->getOrCreate($file);
$sourceLocators[] = $this->optimizedSingleFileSourceLocatorRepository->getOrCreate($file);
}

foreach ($this->directories as $directory) {
Expand Down
Loading