From a5744d03cff30b525d44beb1a791744d4559f27d Mon Sep 17 00:00:00 2001 From: Jan Nedbal Date: Fri, 23 Aug 2024 13:55:09 +0200 Subject: [PATCH 1/5] Move result cache info from debug to verbose mode --- src/Analyser/ResultCache/ResultCacheManager.php | 12 ++++++------ src/Command/AnalyseApplication.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Analyser/ResultCache/ResultCacheManager.php b/src/Analyser/ResultCache/ResultCacheManager.php index d8cfceb646..4b30786e9b 100644 --- a/src/Analyser/ResultCache/ResultCacheManager.php +++ b/src/Analyser/ResultCache/ResultCacheManager.php @@ -412,20 +412,20 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache } $doSave = function (array $errorsByFile, $locallyIgnoredErrorsByFile, $linesToIgnore, $unmatchedLineIgnores, $collectedDataByFile, ?array $dependencies, array $exportedNodes, array $projectExtensionFiles) use ($internalErrors, $resultCache, $output, $onlyFiles, $meta): bool { if ($onlyFiles) { - if ($output->isDebug()) { + if ($output->isVerbose()) { $output->writeLineFormatted('Result cache was not saved because only files were passed as analysed paths.'); } return false; } if ($dependencies === null) { - if ($output->isDebug()) { + if ($output->isVerbose()) { $output->writeLineFormatted('Result cache was not saved because of error in dependencies.'); } return false; } if (count($internalErrors) > 0) { - if ($output->isDebug()) { + if ($output->isVerbose()) { $output->writeLineFormatted('Result cache was not saved because of internal errors.'); } return false; @@ -437,7 +437,7 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache continue; } - if ($output->isDebug()) { + if ($output->isVerbose()) { $output->writeLineFormatted(sprintf('Result cache was not saved because of non-ignorable exception: %s', $error->getMessage())); } @@ -447,7 +447,7 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache $this->save($resultCache->getLastFullAnalysisTime(), $errorsByFile, $locallyIgnoredErrorsByFile, $linesToIgnore, $unmatchedLineIgnores, $collectedDataByFile, $dependencies, $exportedNodes, $projectExtensionFiles, $meta); - if ($output->isDebug()) { + if ($output->isVerbose()) { $output->writeLineFormatted('Result cache is saved.'); } @@ -463,7 +463,7 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache } $saved = $doSave($freshErrorsByFile, $freshLocallyIgnoredErrorsByFile, $analyserResult->getLinesToIgnore(), $analyserResult->getUnmatchedLineIgnores(), $freshCollectedDataByFile, $analyserResult->getDependencies(), $analyserResult->getExportedNodes(), $projectExtensionFiles); } else { - if ($output->isDebug()) { + if ($output->isVerbose()) { $output->writeLineFormatted('Result cache was not saved because it was not requested.'); } } diff --git a/src/Command/AnalyseApplication.php b/src/Command/AnalyseApplication.php index af739bc02c..add6e11e4b 100644 --- a/src/Command/AnalyseApplication.php +++ b/src/Command/AnalyseApplication.php @@ -60,7 +60,7 @@ public function analyse( $collectedData = []; $savedResultCache = false; $memoryUsageBytes = memory_get_peak_usage(true); - if ($errorOutput->isDebug()) { + if ($errorOutput->isVerbose()) { $errorOutput->writeLineFormatted('Result cache was not saved because of ignoredErrorHelperResult errors.'); } $changedProjectExtensionFilesOutsideOfAnalysedPaths = []; From 5f79dce515283da28a9e424d71a1811789036e8a Mon Sep 17 00:00:00 2001 From: Jan Nedbal Date: Fri, 23 Aug 2024 13:58:05 +0200 Subject: [PATCH 2/5] Few more cases --- .../ResultCache/ResultCacheManager.php | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Analyser/ResultCache/ResultCacheManager.php b/src/Analyser/ResultCache/ResultCacheManager.php index 4b30786e9b..2aecae331b 100644 --- a/src/Analyser/ResultCache/ResultCacheManager.php +++ b/src/Analyser/ResultCache/ResultCacheManager.php @@ -92,13 +92,13 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? { $startTime = microtime(true); if ($debug) { - if ($output->isDebug()) { + if ($output->isVerbose()) { $output->writeLineFormatted('Result cache not used because of debug mode.'); } return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []); } if ($onlyFiles) { - if ($output->isDebug()) { + if ($output->isVerbose()) { $output->writeLineFormatted('Result cache not used because only files were passed as analysed paths.'); } return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []); @@ -106,7 +106,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? $cacheFilePath = $this->cacheFilePath; if (!is_file($cacheFilePath)) { - if ($output->isDebug()) { + if ($output->isVerbose()) { $output->writeLineFormatted('Result cache not used because the cache file does not exist.'); } return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []); @@ -115,7 +115,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? try { $data = require $cacheFilePath; } catch (Throwable $e) { - if ($output->isDebug()) { + if ($output->isVerbose()) { $output->writeLineFormatted(sprintf('Result cache not used because an error occurred while loading the cache file: %s', $e->getMessage())); } @@ -126,7 +126,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? if (!is_array($data)) { @unlink($cacheFilePath); - if ($output->isDebug()) { + if ($output->isVerbose()) { $output->writeLineFormatted('Result cache not used because the cache file is corrupted.'); } @@ -135,7 +135,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? $meta = $this->getMeta($allAnalysedFiles, $projectConfigArray); if ($this->isMetaDifferent($data['meta'], $meta)) { - if ($output->isDebug()) { + if ($output->isVerbose()) { $diffs = $this->getMetaKeyDifferences($data['meta'], $meta); $output->writeLineFormatted('Result cache not used because the metadata do not match: ' . implode(', ', $diffs)); } @@ -143,7 +143,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? } if (time() - $data['lastFullAnalysisTime'] >= 60 * 60 * 24 * 7) { - if ($output->isDebug()) { + if ($output->isVerbose()) { $output->writeLineFormatted('Result cache not used because it\'s more than 7 days since last full analysis.'); } // run full analysis if the result cache is older than 7 days @@ -159,7 +159,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? continue; } if (!is_file($extensionFile)) { - if ($output->isDebug()) { + if ($output->isVerbose()) { $output->writeLineFormatted(sprintf('Result cache not used because extension file %s was not found.', $extensionFile)); } return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], []); @@ -169,7 +169,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? continue; } - if ($output->isDebug()) { + if ($output->isVerbose()) { $output->writeLineFormatted(sprintf('Result cache not used because extension file %s hash does not match.', $extensionFile)); } @@ -287,7 +287,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? $filesToAnalyse = array_unique($filesToAnalyse); $filesToAnalyseCount = count($filesToAnalyse); - if ($output->isDebug()) { + if ($output->isVerbose()) { $elapsed = microtime(true) - $startTime; $elapsedString = $elapsed > 5 ? sprintf(' in %f seconds', round($elapsed, 1)) From 82f88447c6521bb693c3b39034b3969bf84f094b Mon Sep 17 00:00:00 2001 From: Jan Nedbal Date: Wed, 2 Oct 2024 12:12:59 +0200 Subject: [PATCH 3/5] Use isVeryVerbose --- .../ResultCache/ResultCacheManager.php | 24 +++++++++---------- src/Command/AnalyseApplication.php | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Analyser/ResultCache/ResultCacheManager.php b/src/Analyser/ResultCache/ResultCacheManager.php index 2aecae331b..51f428545f 100644 --- a/src/Analyser/ResultCache/ResultCacheManager.php +++ b/src/Analyser/ResultCache/ResultCacheManager.php @@ -92,13 +92,13 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? { $startTime = microtime(true); if ($debug) { - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $output->writeLineFormatted('Result cache not used because of debug mode.'); } return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []); } if ($onlyFiles) { - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $output->writeLineFormatted('Result cache not used because only files were passed as analysed paths.'); } return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []); @@ -106,7 +106,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? $cacheFilePath = $this->cacheFilePath; if (!is_file($cacheFilePath)) { - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $output->writeLineFormatted('Result cache not used because the cache file does not exist.'); } return new ResultCache($allAnalysedFiles, true, time(), $this->getMeta($allAnalysedFiles, $projectConfigArray), [], [], [], [], [], [], [], []); @@ -115,7 +115,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? try { $data = require $cacheFilePath; } catch (Throwable $e) { - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $output->writeLineFormatted(sprintf('Result cache not used because an error occurred while loading the cache file: %s', $e->getMessage())); } @@ -126,7 +126,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? if (!is_array($data)) { @unlink($cacheFilePath); - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $output->writeLineFormatted('Result cache not used because the cache file is corrupted.'); } @@ -135,7 +135,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? $meta = $this->getMeta($allAnalysedFiles, $projectConfigArray); if ($this->isMetaDifferent($data['meta'], $meta)) { - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $diffs = $this->getMetaKeyDifferences($data['meta'], $meta); $output->writeLineFormatted('Result cache not used because the metadata do not match: ' . implode(', ', $diffs)); } @@ -143,7 +143,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? } if (time() - $data['lastFullAnalysisTime'] >= 60 * 60 * 24 * 7) { - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $output->writeLineFormatted('Result cache not used because it\'s more than 7 days since last full analysis.'); } // run full analysis if the result cache is older than 7 days @@ -412,20 +412,20 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache } $doSave = function (array $errorsByFile, $locallyIgnoredErrorsByFile, $linesToIgnore, $unmatchedLineIgnores, $collectedDataByFile, ?array $dependencies, array $exportedNodes, array $projectExtensionFiles) use ($internalErrors, $resultCache, $output, $onlyFiles, $meta): bool { if ($onlyFiles) { - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $output->writeLineFormatted('Result cache was not saved because only files were passed as analysed paths.'); } return false; } if ($dependencies === null) { - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $output->writeLineFormatted('Result cache was not saved because of error in dependencies.'); } return false; } if (count($internalErrors) > 0) { - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $output->writeLineFormatted('Result cache was not saved because of internal errors.'); } return false; @@ -447,7 +447,7 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache $this->save($resultCache->getLastFullAnalysisTime(), $errorsByFile, $locallyIgnoredErrorsByFile, $linesToIgnore, $unmatchedLineIgnores, $collectedDataByFile, $dependencies, $exportedNodes, $projectExtensionFiles, $meta); - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $output->writeLineFormatted('Result cache is saved.'); } @@ -463,7 +463,7 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache } $saved = $doSave($freshErrorsByFile, $freshLocallyIgnoredErrorsByFile, $analyserResult->getLinesToIgnore(), $analyserResult->getUnmatchedLineIgnores(), $freshCollectedDataByFile, $analyserResult->getDependencies(), $analyserResult->getExportedNodes(), $projectExtensionFiles); } else { - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $output->writeLineFormatted('Result cache was not saved because it was not requested.'); } } diff --git a/src/Command/AnalyseApplication.php b/src/Command/AnalyseApplication.php index add6e11e4b..88589db6cc 100644 --- a/src/Command/AnalyseApplication.php +++ b/src/Command/AnalyseApplication.php @@ -60,7 +60,7 @@ public function analyse( $collectedData = []; $savedResultCache = false; $memoryUsageBytes = memory_get_peak_usage(true); - if ($errorOutput->isVerbose()) { + if ($errorOutput->isVeryVerbose()) { $errorOutput->writeLineFormatted('Result cache was not saved because of ignoredErrorHelperResult errors.'); } $changedProjectExtensionFilesOutsideOfAnalysedPaths = []; From f1b6dbe1611b0fbbcc3793483f79dc59dad70c64 Mon Sep 17 00:00:00 2001 From: Jan Nedbal Date: Tue, 8 Oct 2024 21:32:52 +0200 Subject: [PATCH 4/5] Fix few missed --- src/Analyser/ResultCache/ResultCacheManager.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Analyser/ResultCache/ResultCacheManager.php b/src/Analyser/ResultCache/ResultCacheManager.php index 51f428545f..74835d19e7 100644 --- a/src/Analyser/ResultCache/ResultCacheManager.php +++ b/src/Analyser/ResultCache/ResultCacheManager.php @@ -159,7 +159,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? continue; } if (!is_file($extensionFile)) { - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $output->writeLineFormatted(sprintf('Result cache not used because extension file %s was not found.', $extensionFile)); } return new ResultCache($allAnalysedFiles, true, time(), $meta, [], [], [], [], [], [], [], []); @@ -169,7 +169,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? continue; } - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $output->writeLineFormatted(sprintf('Result cache not used because extension file %s hash does not match.', $extensionFile)); } @@ -437,7 +437,7 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache continue; } - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $output->writeLineFormatted(sprintf('Result cache was not saved because of non-ignorable exception: %s', $error->getMessage())); } From 80ffc5862d8cc3a18b8334cc056eb7cd68a6c6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Mirtes?= Date: Wed, 9 Oct 2024 09:31:06 +0200 Subject: [PATCH 5/5] Update src/Analyser/ResultCache/ResultCacheManager.php --- src/Analyser/ResultCache/ResultCacheManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Analyser/ResultCache/ResultCacheManager.php b/src/Analyser/ResultCache/ResultCacheManager.php index 74835d19e7..567b61f798 100644 --- a/src/Analyser/ResultCache/ResultCacheManager.php +++ b/src/Analyser/ResultCache/ResultCacheManager.php @@ -287,7 +287,7 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ? $filesToAnalyse = array_unique($filesToAnalyse); $filesToAnalyseCount = count($filesToAnalyse); - if ($output->isVerbose()) { + if ($output->isVeryVerbose()) { $elapsed = microtime(true) - $startTime; $elapsedString = $elapsed > 5 ? sprintf(' in %f seconds', round($elapsed, 1))