Skip to content

Commit ba375ba

Browse files
ondrejmirtesondrejmirtes
committed
Merge remote-tracking branch 'origin/1.12.x' into 2.1.x
2 parents 13231d2 + 74b909a commit ba375ba

27 files changed

+317
-12
lines changed

‎.github/workflows/e2e-tests.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,21 @@ jobs:
160160
echo "$OUTPUT"
161161
../bashunit -a contains 'Result cache not used because the metadata do not match: projectConfig, scannedFiles' "$OUTPUT"
162162
../bashunit -a contains 'Instantiated class ResultCacheE2EGenerated\Foo not found.' "$OUTPUT"
163+
- script: |
164+
cd e2e/editor-mode
165+
OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan analyse -vv --error-format raw")
166+
echo "$OUTPUT"
167+
../bashunit -a contains 'Bar.php:10:Parameter #1 $s of method EditorModeE2E\Bar::requireString() expects string, int given. [identifier=argument.type]' "$OUTPUT"
168+
../bashunit -a contains 'Foo.php:10:Method EditorModeE2E\Foo::doFoo() should return int but returns string. [identifier=return.type]' "$OUTPUT"
169+
../bashunit -a contains 'Result cache is saved.' "$OUTPUT"
170+
171+
OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan analyse -vv --error-format raw --tmp-file differentFoo.php --instead-of src/Foo.php")
172+
echo "$OUTPUT"
173+
../bashunit -a contains 'differentFoo.php:10:Method EditorModeE2E\Foo::doFoo() should return float but returns string. [identifier=return.type]' "$OUTPUT"
174+
../bashunit -a not_contains 'Foo.php:10:Method EditorModeE2E\Foo::doFoo() should return int but returns string. [identifier=return.type]' "$OUTPUT"
175+
../bashunit -a contains 'Bar.php:10:Parameter #1 $s of method EditorModeE2E\Bar::requireString() expects string, float given. [identifier=argument.type]' "$OUTPUT"
176+
../bashunit -a contains 'Result cache restored. 2 files will be reanalysed.' "$OUTPUT"
177+
../bashunit -a contains 'Result cache was not saved because of --tmp-file and --instead-of CLI options passed (editor mode).' "$OUTPUT"
163178
- script: |
164179
cd e2e/trait-caching
165180
../../bin/phpstan analyze --no-progress --level 8 --error-format raw data/

‎conf/config.neon‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,8 @@ services:
611611
usedLevel: %usedLevel%
612612
generateBaselineFile: %generateBaselineFile%
613613
cliAutoloadFile: %cliAutoloadFile%
614+
singleReflectionFile: %singleReflectionFile%
615+
singleReflectionInsteadOfFile: %singleReflectionInsteadOfFile%
614616

615617
-
616618
class: PHPStan\DependencyInjection\Reflection\ClassReflectionExtensionRegistryProvider
@@ -2167,6 +2169,7 @@ services:
21672169
composerAutoloaderProjectPaths: %composerAutoloaderProjectPaths%
21682170
analysedPathsFromConfig: %analysedPathsFromConfig%
21692171
playgroundMode: %sourceLocatorPlaygroundMode%
2172+
singleReflectionFile: %singleReflectionFile%
21702173

21712174
-
21722175
implement: PHPStan\Reflection\BetterReflection\BetterReflectionProviderFactory
@@ -2217,6 +2220,7 @@ services:
22172220
currentPhpVersionRichParser: @currentPhpVersionRichParser
22182221
currentPhpVersionSimpleParser: @currentPhpVersionSimpleParser
22192222
php8Parser: @php8Parser
2223+
singleReflectionFile: %singleReflectionFile%
22202224
autowired: false
22212225

22222226
freshStubParser:

‎conf/parametersSchema.neon‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,7 @@ parametersSchema:
193193
analysedPathsFromConfig: listOf(string())
194194
usedLevel: string()
195195
cliAutoloadFile: schema(string(), nullable())
196+
197+
# internal - editor mode
198+
singleReflectionFile: schema(string(), nullable())
199+
singleReflectionInsteadOfFile: schema(string(), nullable())

‎e2e/editor-mode/differentFoo.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
namespace EditorModeE2E;
4+
5+
class Foo
6+
{
7+
8+
public function doFoo(): float
9+
{
10+
return 'foo';
11+
}
12+
13+
}

‎e2e/editor-mode/phpstan.neon‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
parameters:
2+
paths:
3+
- src
4+
level: 8

‎e2e/editor-mode/src/Bar.php‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
namespace EditorModeE2E;
4+
5+
class Bar
6+
{
7+
8+
public function doFoo(Foo $foo): void
9+
{
10+
$this->requireString($foo->doFoo());
11+
}
12+
13+
public function requireString(string $s): void
14+
{
15+
16+
}
17+
18+
}

‎e2e/editor-mode/src/Foo.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
namespace EditorModeE2E;
4+
5+
class Foo
6+
{
7+
8+
public function doFoo(): int
9+
{
10+
return 'foo';
11+
}
12+
13+
}

‎src/Analyser/ResultCache/ResultCacheManager.php‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ final class ResultCacheManager
7171
* @param string[] $scanFiles
7272
* @param string[] $scanDirectories
7373
* @param list<string|non-empty-list<string>> $parametersNotInvalidatingCache
74+
* @param array<string, string> $fileReplacements
7475
*/
7576
public function __construct(
7677
private Container $container,
@@ -88,6 +89,7 @@ public function __construct(
8889
private array $bootstrapFiles,
8990
private array $scanFiles,
9091
private array $scanDirectories,
92+
private array $fileReplacements,
9193
private bool $checkDependenciesOfProjectExtensionFiles,
9294
private array $parametersNotInvalidatingCache,
9395
private int $skipResultCacheIfOlderThanDays,
@@ -376,6 +378,9 @@ private function getMetaKeyDifferences(array $cachedMeta, array $currentMeta): a
376378
*/
377379
private function exportedNodesChanged(string $analysedFile, array $cachedFileExportedNodes): ?bool
378380
{
381+
if (array_key_exists($analysedFile, $this->fileReplacements)) {
382+
$analysedFile = $this->fileReplacements[$analysedFile];
383+
}
379384
$fileExportedNodes = $this->exportedNodeFetcher->fetchNodes($analysedFile);
380385

381386
$cachedSymbols = [];
@@ -447,6 +452,13 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache
447452
return false;
448453
}
449454

455+
if (count($this->fileReplacements) > 0) {
456+
if ($output->isVeryVerbose()) {
457+
$output->writeLineFormatted('Result cache was not saved because of --tmp-file and --instead-of CLI options passed (editor mode).');
458+
}
459+
return false;
460+
}
461+
450462
foreach ($errorsByFile as $errors) {
451463
foreach ($errors as $error) {
452464
if (!$error->hasNonIgnorableException()) {
@@ -558,6 +570,10 @@ private function mergeErrors(ResultCache $resultCache, array $freshErrorsByFile)
558570
{
559571
$errorsByFile = $resultCache->getErrors();
560572
foreach ($resultCache->getFilesToAnalyse() as $file) {
573+
if (array_key_exists($file, $this->fileReplacements)) {
574+
unset($errorsByFile[$file]);
575+
$file = $this->fileReplacements[$file];
576+
}
561577
if (!array_key_exists($file, $freshErrorsByFile)) {
562578
unset($errorsByFile[$file]);
563579
continue;
@@ -576,6 +592,10 @@ private function mergeLocallyIgnoredErrors(ResultCache $resultCache, array $fres
576592
{
577593
$errorsByFile = $resultCache->getLocallyIgnoredErrors();
578594
foreach ($resultCache->getFilesToAnalyse() as $file) {
595+
if (array_key_exists($file, $this->fileReplacements)) {
596+
unset($errorsByFile[$file]);
597+
$file = $this->fileReplacements[$file];
598+
}
579599
if (!array_key_exists($file, $freshLocallyIgnoredErrorsByFile)) {
580600
unset($errorsByFile[$file]);
581601
continue;
@@ -594,6 +614,10 @@ private function mergeCollectedData(ResultCache $resultCache, array $freshCollec
594614
{
595615
$collectedDataByFile = $resultCache->getCollectedData();
596616
foreach ($resultCache->getFilesToAnalyse() as $file) {
617+
if (array_key_exists($file, $this->fileReplacements)) {
618+
unset($collectedDataByFile[$file]);
619+
$file = $this->fileReplacements[$file];
620+
}
597621
if (!array_key_exists($file, $freshCollectedDataByFile)) {
598622
unset($collectedDataByFile[$file]);
599623
continue;
@@ -634,6 +658,10 @@ private function mergeDependencies(ResultCache $resultCache, ?array $freshDepend
634658

635659
$newDependencies = $cachedDependencies;
636660
foreach ($resultCache->getFilesToAnalyse() as $file) {
661+
if (array_key_exists($file, $this->fileReplacements)) {
662+
unset($newDependencies[$file]);
663+
$file = $this->fileReplacements[$file];
664+
}
637665
if (!array_key_exists($file, $freshDependencies)) {
638666
unset($newDependencies[$file]);
639667
continue;
@@ -653,6 +681,10 @@ private function mergeExportedNodes(ResultCache $resultCache, array $freshExport
653681
{
654682
$newExportedNodes = $resultCache->getExportedNodes();
655683
foreach ($resultCache->getFilesToAnalyse() as $file) {
684+
if (array_key_exists($file, $this->fileReplacements)) {
685+
unset($newExportedNodes[$file]);
686+
$file = $this->fileReplacements[$file];
687+
}
656688
if (!array_key_exists($file, $freshExportedNodes)) {
657689
unset($newExportedNodes[$file]);
658690
continue;
@@ -672,6 +704,10 @@ private function mergeLinesToIgnore(ResultCache $resultCache, array $freshLinesT
672704
{
673705
$newLinesToIgnore = $resultCache->getLinesToIgnore();
674706
foreach ($resultCache->getFilesToAnalyse() as $file) {
707+
if (array_key_exists($file, $this->fileReplacements)) {
708+
unset($newLinesToIgnore[$file]);
709+
$file = $this->fileReplacements[$file];
710+
}
675711
if (!array_key_exists($file, $freshLinesToIgnore)) {
676712
unset($newLinesToIgnore[$file]);
677713
continue;
@@ -691,6 +727,10 @@ private function mergeUnmatchedLineIgnores(ResultCache $resultCache, array $fres
691727
{
692728
$newUnmatchedLineIgnores = $resultCache->getUnmatchedLineIgnores();
693729
foreach ($resultCache->getFilesToAnalyse() as $file) {
730+
if (array_key_exists($file, $this->fileReplacements)) {
731+
unset($newUnmatchedLineIgnores[$file]);
732+
$file = $this->fileReplacements[$file];
733+
}
694734
if (!array_key_exists($file, $freshUnmatchedLineIgnores)) {
695735
unset($newUnmatchedLineIgnores[$file]);
696736
continue;
@@ -927,6 +967,9 @@ private function getMeta(array $allAnalysedFiles, ?array $projectConfigArray): a
927967

928968
private function getFileHash(string $path): string
929969
{
970+
if (array_key_exists($path, $this->fileReplacements)) {
971+
$path = $this->fileReplacements[$path];
972+
}
930973
if (array_key_exists($path, $this->fileHashes)) {
931974
return $this->fileHashes[$path];
932975
}

‎src/Analyser/ResultCache/ResultCacheManagerFactory.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
interface ResultCacheManagerFactory
66
{
77

8-
public function create(): ResultCacheManager;
8+
/**
9+
* @param array<string, string> $fileReplacements
10+
*/
11+
public function create(array $fileReplacements): ResultCacheManager;
912

1013
}

‎src/Command/AnalyseApplication.php‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,17 @@ public function analyse(
5050
bool $debug,
5151
?string $projectConfigFile,
5252
?array $projectConfigArray,
53+
?string $tmpFile,
54+
?string $insteadOfFile,
5355
InputInterface $input,
5456
): AnalysisResult
5557
{
5658
$isResultCacheUsed = false;
57-
$resultCacheManager = $this->resultCacheManagerFactory->create();
59+
$fileReplacements = [];
60+
if ($tmpFile !== null && $insteadOfFile !== null) {
61+
$fileReplacements = [$insteadOfFile => $tmpFile];
62+
}
63+
$resultCacheManager = $this->resultCacheManagerFactory->create($fileReplacements);
5864

5965
$ignoredErrorHelperResult = $this->ignoredErrorHelper->initialize();
6066
$fileSpecificErrors = [];
@@ -75,6 +81,8 @@ public function analyse(
7581
$files,
7682
$debug,
7783
$projectConfigFile,
84+
$tmpFile,
85+
$insteadOfFile,
7886
$stdOutput,
7987
$errorOutput,
8088
$input,
@@ -189,6 +197,8 @@ private function runAnalyser(
189197
array $allAnalysedFiles,
190198
bool $debug,
191199
?string $projectConfigFile,
200+
?string $tmpFile,
201+
?string $insteadOfFile,
192202
Output $stdOutput,
193203
Output $errorOutput,
194204
InputInterface $input,
@@ -232,7 +242,7 @@ private function runAnalyser(
232242
}
233243
}
234244

235-
$analyserResult = $this->analyserRunner->runAnalyser($files, $allAnalysedFiles, $preFileCallback, $postFileCallback, $debug, true, $projectConfigFile, $input);
245+
$analyserResult = $this->analyserRunner->runAnalyser($files, $allAnalysedFiles, $preFileCallback, $postFileCallback, $debug, true, $projectConfigFile, $tmpFile, $insteadOfFile, $input);
236246

237247
if (!$debug) {
238248
$errorOutput->getStyle()->progressFinish();

0 commit comments

Comments
 (0)