mirror of
https://github.com/danog/psalm.git
synced 2025-01-22 05:41:20 +01:00
Fix cherry pick issues
This commit is contained in:
parent
fc694d7a98
commit
92aedd6f7f
@ -246,7 +246,7 @@ final class Psalm
|
||||
$options['long-progress'] = true;
|
||||
}
|
||||
|
||||
$threads = self::useThreads($options, $config, $in_ci, $config);
|
||||
$threads = self::detectThreads($options, $config, $in_ci);
|
||||
|
||||
self::emitMacPcreWarning($options, $threads);
|
||||
|
||||
@ -1172,25 +1172,4 @@ final class Psalm
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private static function useThreads(array $options, bool $in_ci, Config $config): int
|
||||
{
|
||||
$threads = self::detectThreads($options, $in_ci);
|
||||
|
||||
if ($config->threads && $config->threads<$threads) {
|
||||
$threads = $config->threads;
|
||||
}
|
||||
|
||||
return $threads;
|
||||
}
|
||||
|
||||
private static function useThreads(array $options, bool $in_ci, Config $config): int{
|
||||
$threads = self::detectThreads($options, $in_ci);
|
||||
|
||||
if ($config->threads && $config->threads<$threads) {
|
||||
$threads = $config->threads;
|
||||
}
|
||||
|
||||
return $threads;
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user