Skip to content

Commit

Permalink
Force usage of latest patch version to avoid JIT bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@danog
danog committed Feb 7, 2025
1 parent a515bda commit 1ba25ce
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 24 deletions.
39 changes: 20 additions & 19 deletions src/Psalm/Internal/Analyzer/ProjectAnalyzer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
use function number_format;
use function preg_match;
use function rename;
use function sprintf;
use function str_ends_with;
use function str_starts_with;
use function strlen;
Expand All @@ -87,6 +86,7 @@
use function usort;

use const PHP_EOL;
use const PHP_VERSION;
use const PSALM_VERSION;
use const STDERR;

Expand Down Expand Up @@ -280,7 +280,7 @@ private function clearCacheDirectoryIfConfigOrComposerLockfileChanged(): void
clearstatcache(true, $cache_directory);
if (is_dir($cache_directory)) {
$this->progress->debug(
'Composer lockfile change detected, clearing cache directory ' . $cache_directory . "\n",
'Composer lockfile change detected, clearing cache directory ' . $cache_directory . PHP_EOL,
);

Config::removeCacheDirectory($cache_directory);
Expand All @@ -297,7 +297,7 @@ private function clearCacheDirectoryIfConfigOrComposerLockfileChanged(): void
clearstatcache(true, $cache_directory);
if (is_dir($cache_directory)) {
$this->progress->debug(
'Config change detected, clearing cache directory ' . $cache_directory . "\n",
'Config change detected, clearing cache directory ' . $cache_directory . PHP_EOL,
);

Config::removeCacheDirectory($cache_directory);
Expand Down Expand Up @@ -350,7 +350,7 @@ private function visitAutoloadFiles(): void
$now_time = microtime(true);

$this->progress->debug(
'Visiting autoload files took ' . number_format($now_time - $start_time, 3) . 's' . "\n",
'Visiting autoload files took ' . number_format($now_time - $start_time, 3) . 's' . PHP_EOL,
);
}

Expand Down Expand Up @@ -411,12 +411,11 @@ private function generatePHPVersionMessage(): string
$codebase->config->php_extensions_supported_by_psalm_callmaps,
);

$message = sprintf(
"Target PHP version: %d.%d %s",
$codebase->getMajorAnalysisPhpVersion(),
$codebase->getMinorAnalysisPhpVersion(),
$source,
);
$message = "Target PHP version: "
.$codebase->getMajorAnalysisPhpVersion()."."
.$codebase->getMinorAnalysisPhpVersion()." "
.$source
;

$enabled_extensions_names = array_keys(array_filter($codebase->config->php_extensions));
if (count($enabled_extensions_names) > 0) {
Expand All @@ -427,7 +426,9 @@ private function generatePHPVersionMessage(): string
$message .= ' (unsupported extensions: ' . implode(', ', $unsupported_php_extensions) . ')';
}

return "$message.\n";
$message .= '.'.PHP_EOL.PHP_EOL."Running on PHP ".PHP_VERSION.'.'.PHP_EOL.PHP_EOL;

return $message;
}

public function check(string $base_dir, bool $is_diff = false): void
Expand Down Expand Up @@ -479,8 +480,8 @@ public function check(string $base_dir, bool $is_diff = false): void
$this->codebase->infer_types_from_usage = true;
} else {
$this->codebase->diff_run = true;
$this->progress->debug(count($diff_files) . ' changed files: ' . "\n");
$this->progress->debug(' ' . implode("\n ", $diff_files) . "\n");
$this->progress->debug(count($diff_files) . ' changed files: ' . PHP_EOL);
$this->progress->debug(' ' . implode(PHP_EOL." ", $diff_files) . PHP_EOL);

$this->codebase->analyzer->addFilesToShowResults($this->project_files);

Expand Down Expand Up @@ -528,7 +529,7 @@ public function check(string $base_dir, bool $is_diff = false): void
$removed_parser_files = $this->parser_cache_provider->deleteOldParserCaches($start_checks);

if ($removed_parser_files) {
$this->progress->debug('Removed ' . $removed_parser_files . ' old parser caches' . "\n");
$this->progress->debug('Removed ' . $removed_parser_files . ' old parser caches' . PHP_EOL);
}
}
}
Expand Down Expand Up @@ -851,14 +852,14 @@ public function findReferencesTo(string $symbol): void
$selection_start = $selection_bounds[0] - $snippet_bounds[0];
$selection_length = $selection_bounds[1] - $selection_bounds[0];

echo $location->file_name . ':' . $location->getLineNumber() . "\n" .
echo $location->file_name . ':' . $location->getLineNumber() . PHP_EOL .
(
$this->stdout_report_options->use_color
? substr($snippet, 0, $selection_start) .
"\e[97;42m" . substr($snippet, $selection_start, $selection_length) .
"\e[0m" . substr($snippet, $selection_length + $selection_start)
: $snippet
) . "\n" . "\n";
) . PHP_EOL . PHP_EOL;
}
}

Expand Down Expand Up @@ -947,7 +948,7 @@ private function checkDiffFilesWithConfig(Config $config, array $file_list = [])
}

if (!$config->isInProjectDirs($file_path)) {
$this->progress->debug('skipping ' . $file_path . "\n");
$this->progress->debug('skipping ' . $file_path . PHP_EOL);

continue;
}
Expand All @@ -960,7 +961,7 @@ private function checkDiffFilesWithConfig(Config $config, array $file_list = [])

public function checkFile(string $file_path): void
{
$this->progress->debug('Checking ' . $file_path . "\n");
$this->progress->debug('Checking ' . $file_path . PHP_EOL);

$this->config->visitPreloadedStubFiles($this->codebase, $this->progress);

Expand Down Expand Up @@ -1003,7 +1004,7 @@ public function checkPaths(array $paths_to_check): void
$this->codebase->scanner->addFilesToShallowScan($this->extra_files);

foreach ($paths_to_check as $path) {
$this->progress->debug('Checking ' . $path . "\n");
$this->progress->debug('Checking ' . $path . PHP_EOL);

if (is_dir($path)) {
$this->checkDirWithConfig($path, $this->config, true);
Expand Down
14 changes: 9 additions & 5 deletions src/Psalm/Internal/CliUtils.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,9 +524,6 @@ public static function runningInCI(): bool

public static function checkRuntimeRequirements(): void
{
$required_php_version = 8_01_17;
$required_php_version_text = '8.1.17';

// the following list was taken from vendor/composer/platform_check.php
// It includes both Psalm's requirements (from composer.json) and the
// requirements of our dependencies `netresearch/jsonmapper` and
Expand All @@ -545,9 +542,16 @@ public static function checkRuntimeRequirements(): void
];
$issues = [];

if (PHP_VERSION_ID < $required_php_version) {
$issues[] = 'Psalm requires a PHP version ">= ' . $required_php_version_text . '".'
$major_minor = PHP_VERSION_ID - (PHP_VERSION_ID % 100);
foreach ([8_01_31 => '8.1.31', 8_02_27 => '8.2.27', 8_03_16 => '8.3.16', 8_04_03 => '8.4.3'] as $version => $txt) {
$version_m = $version - ($version % 100);
if ($version_m === $major_minor) {
if (PHP_VERSION_ID < $version) {
$issues[] = 'Psalm requires a PHP version ">= ' . $txt . '".'
. ' You are running ' . PHP_VERSION . '.';
}
break;
}
}

$missing_extensions = array_filter(
Expand Down

0 comments on commit 1ba25ce

Please sign in to comment.