Improve the CPU core count detection

See theofidry/cpu-core-counter#11 for the motivations. The code should be sensibly the same, the notable differences are: - fixed the deprecated usage of `hw.ncpu` - /proc/cpuinfo is check _last_ - nproc is checked first (before was not checked at all, it's considered to be more accurate and less convoluted than cpuinfo though) - not sure about the `return 2`, but this was not too clear [here](phpstan#514 (review)) neither. I could otherwise change the fallback value to return `1` if `proc_open` doesn't exist and 2 otherwise - add more ways to find the CPU cores count
theofidry · Dec 8, 2022 · 6f0998a · 6f0998a
1 parent 66dc2ad
commit 6f0998a
Show file tree

Hide file tree

Showing 34 changed files with 1,375 additions and 119 deletions.
diff --git a/composer.json b/composer.json
@@ -10,6 +10,7 @@
 		"clue/ndjson-react": "^1.0",
 		"composer/ca-bundle": "^1.2",
 		"composer/xdebug-handler": "^3.0.3",
+		"fidry/cpu-core-counter": "^0.3.0",
 		"hoa/compiler": "3.17.08.08",
 		"hoa/exception": "^1.0",
 		"hoa/regex": "1.17.01.13",
@@ -24,7 +25,7 @@
 		"ondram/ci-detector": "^3.4.0",
 		"ondrejmirtes/better-reflection": "6.4.0",
 		"phpstan/php-8-stubs": "0.3.52",
-		"phpstan/phpdoc-parser": "1.14.0",
+		"phpstan/phpdoc-parser": "1.15.0",
 		"react/async": "^3",
 		"react/child-process": "^0.6.4",
 		"react/event-loop": "^1.2",

diff --git a/composer.lock b/composer.lock
diff --git a/conf/bleedingEdge.neon b/conf/bleedingEdge.neon
@@ -24,3 +24,4 @@ parameters:
 		nullContextForVoidReturningFunctions: true
 		unescapeStrings: true
 		duplicateStubs: true
+		invarianceComposition: true
diff --git a/conf/config.neon b/conf/config.neon
@@ -54,6 +54,7 @@ parameters:
 		nullContextForVoidReturningFunctions: false
 		unescapeStrings: false
 		duplicateStubs: false
+		invarianceComposition: false
 	fileExtensions:
 		- php
 	checkAdvancedIsset: false
@@ -86,6 +87,7 @@ parameters:
 	checkTooWideReturnTypesInProtectedAndPublicMethods: false
 	checkUninitializedProperties: false
 	checkDynamicProperties: false
+	deprecationRulesInstalled: false
 	inferPrivatePropertyTypeFromConstructor: false
 	reportMaybes: false
 	reportMaybesInMethodSignatures: false
@@ -271,6 +273,7 @@ parametersSchema:
 		nullContextForVoidReturningFunctions: bool()
 		unescapeStrings: bool()
 		duplicateStubs: bool()
+		invarianceComposition: bool()
 	])
 	fileExtensions: listOf(string())
 	checkAdvancedIsset: bool()
@@ -303,6 +306,7 @@ parametersSchema:
 	checkTooWideReturnTypesInProtectedAndPublicMethods: bool()
 	checkUninitializedProperties: bool()
 	checkDynamicProperties: bool()
+	deprecationRulesInstalled: bool()
 	inferPrivatePropertyTypeFromConstructor: bool()
 
 	tipsOfTheDay: bool()

diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -119,7 +119,6 @@
 use function array_map;
 use function array_merge;
 use function array_pop;
-use function array_reverse;
 use function array_slice;
 use function count;
 use function explode;
@@ -3731,24 +3730,29 @@ public function filterBySpecifiedTypes(SpecifiedTypes $specifiedTypes): self
 			} else {
 				$scope = $scope->removeTypeFromExpression($expr, $type);
 			}
-			$specifiedExpressions[$this->getNodeKey($expr)] = $scope->getType($expr);
+			$specifiedExpressions[$this->getNodeKey($expr)] = ExpressionTypeHolder::createYes($expr, $scope->getType($expr));
 		}
 
 		foreach ($scope->conditionalExpressions as $conditionalExprString => $conditionalExpressions) {
-			foreach (array_reverse($conditionalExpressions) as $conditionalExpression) {
+			foreach ($conditionalExpressions as $conditionalExpression) {
 				foreach ($conditionalExpression->getConditionExpressionTypeHolders() as $holderExprString => $conditionalTypeHolder) {
-					if (!array_key_exists($holderExprString, $specifiedExpressions) || !$specifiedExpressions[$holderExprString]->equals($conditionalTypeHolder->getType())) {
+					if (!array_key_exists($holderExprString, $specifiedExpressions) || !$specifiedExpressions[$holderExprString]->equals($conditionalTypeHolder)) {
 						continue 2;
 					}
 				}
 
 				if ($conditionalExpression->getTypeHolder()->getCertainty()->no()) {
 					unset($scope->expressionTypes[$conditionalExprString]);
 				} else {
-					$scope->expressionTypes[$conditionalExprString] = $conditionalExpression->getTypeHolder();
-					$specifiedExpressions[$conditionalExprString] = $conditionalExpression->getTypeHolder()->getType();
+					$scope->expressionTypes[$conditionalExprString] = array_key_exists($conditionalExprString, $scope->expressionTypes)
+						? new ExpressionTypeHolder(
+							$scope->expressionTypes[$conditionalExprString]->getExpr(),
+							TypeCombinator::intersect($scope->expressionTypes[$conditionalExprString]->getType(), $conditionalExpression->getTypeHolder()->getType()),
+							TrinaryLogic::maxMin($scope->expressionTypes[$conditionalExprString]->getCertainty(), $conditionalExpression->getTypeHolder()->getCertainty()),
+						)
+						: $conditionalExpression->getTypeHolder();
+					$specifiedExpressions[$conditionalExprString] = $conditionalExpression->getTypeHolder();
 				}
-				continue 2;
 			}
 		}
 

diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -818,11 +818,11 @@ private function processStmtNode(
 				$inForeachScope = $this->processVarAnnotation($scope, [$stmt->expr->name], $stmt);
 			}
 			$nodeCallback(new InForeachNode($stmt), $inForeachScope);
-			$bodyScope = $this->enterForeach($scope->filterByTruthyValue($arrayComparisonExpr), $stmt);
+			$bodyScope = $this->polluteScopeWithAlwaysIterableForeach ? $this->enterForeach($scope->filterByTruthyValue($arrayComparisonExpr), $stmt) : $this->enterForeach($scope, $stmt);
 			$count = 0;
 			do {
 				$prevScope = $bodyScope;
-				$bodyScope = $bodyScope->mergeWith($scope->filterByTruthyValue($arrayComparisonExpr));
+				$bodyScope = $bodyScope->mergeWith($this->polluteScopeWithAlwaysIterableForeach ? $scope->filterByTruthyValue($arrayComparisonExpr) : $scope);
 				$bodyScope = $this->enterForeach($bodyScope, $stmt);
 				$bodyScopeResult = $this->processStmtNodes($stmt, $stmt->stmts, $bodyScope, static function (): void {
 				})->filterOutLoopExitPoints();
@@ -841,7 +841,7 @@ private function processStmtNode(
 				$count++;
 			} while (!$alwaysTerminating && $count < self::LOOP_SCOPE_ITERATIONS);
 
-			$bodyScope = $bodyScope->mergeWith($scope->filterByTruthyValue($arrayComparisonExpr));
+			$bodyScope = $bodyScope->mergeWith($this->polluteScopeWithAlwaysIterableForeach ? $scope->filterByTruthyValue($arrayComparisonExpr) : $scope);
 			$bodyScope = $this->enterForeach($bodyScope, $stmt);
 			$finalScopeResult = $this->processStmtNodes($stmt, $stmt->stmts, $bodyScope, $nodeCallback)->filterOutLoopExitPoints();
 			$finalScope = $finalScopeResult->getScope();
@@ -3992,16 +3992,18 @@ static function (): void {
 			}
 		}
 
+		$constantArrays = $iterateeType->getConstantArrays();
 		if (
 			$stmt->getDocComment() === null
-			&& $iterateeType instanceof ConstantArrayType
+			&& $iterateeType->isConstantArray()->yes()
+			&& count($constantArrays) === 1
 			&& $stmt->valueVar instanceof Variable && is_string($stmt->valueVar->name)
 			&& $stmt->keyVar instanceof Variable && is_string($stmt->keyVar->name)
 		) {
 			$valueConditionalHolders = [];
 			$arrayDimFetchConditionalHolders = [];
-			foreach ($iterateeType->getKeyTypes() as $i => $keyType) {
-				$valueType = $iterateeType->getValueTypes()[$i];
+			foreach ($constantArrays[0]->getKeyTypes() as $i => $keyType) {
+				$valueType = $constantArrays[0]->getValueTypes()[$i];
 				$holder = new ConditionalExpressionHolder([
 					'$' . $stmt->keyVar->name => ExpressionTypeHolder::createYes(new Variable($stmt->keyVar->name), $keyType),
 				], new ExpressionTypeHolder($stmt->valueVar, $valueType, TrinaryLogic::createYes()));

diff --git a/src/DependencyInjection/ContainerFactory.php b/src/DependencyInjection/ContainerFactory.php
@@ -21,6 +21,7 @@
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Reflection\ReflectionProviderStaticAccessor;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
+use PHPStan\Type\Generic\TemplateTypeVariance;
 use Symfony\Component\Finder\Finder;
 use function array_diff_key;
 use function array_map;
@@ -174,6 +175,7 @@ public static function postInitializeContainer(Container $container): void
 
 		BleedingEdgeToggle::setBleedingEdge($container->getParameter('featureToggles')['bleedingEdge']);
 		AccessoryArrayListType::setListTypeEnabled($container->getParameter('featureToggles')['listType']);
+		TemplateTypeVariance::setInvarianceCompositionEnabled($container->getParameter('featureToggles')['invarianceComposition']);
 	}
 
 	public function clearOldContainers(string $tempDirectory): void

diff --git a/src/File/FuzzyRelativePathHelper.php b/src/File/FuzzyRelativePathHelper.php
@@ -70,8 +70,9 @@ public function __construct(
 			/** @var string[] $pathArray */
 			$pathArray = explode($directorySeparator, $path);
 			$pathTempParts = [];
+			$pathArraySize = count($pathArray);
 			foreach ($pathArray as $i => $pathPart) {
-				if (str_ends_with($pathPart, '.php')) {
+				if ($i === $pathArraySize - 1 && str_ends_with($pathPart, '.php')) {
 					continue;
 				}
 				if (!isset($pathToTrimArray[$i])) {

diff --git a/src/PhpDoc/PhpDocNodeResolver.php b/src/PhpDoc/PhpDocNodeResolver.php
@@ -264,6 +264,8 @@ public function resolveTemplateTags(PhpDocNode $phpDocNode, NameScope $nameScope
 				$variance = TemplateTypeVariance::createInvariant();
 			} elseif (in_array($tagName, ['@template-covariant', '@psalm-template-covariant', '@phpstan-template-covariant'], true)) {
 				$variance = TemplateTypeVariance::createCovariant();
+			} elseif (in_array($tagName, ['@template-contravariant', '@psalm-template-contravariant', '@phpstan-template-contravariant'], true)) {
+				$variance = TemplateTypeVariance::createContravariant();
 			} else {
 				continue;
 			}

diff --git a/src/Process/CpuCoreCounter.php b/src/Process/CpuCoreCounter.php
@@ -2,16 +2,8 @@
 
 namespace PHPStan\Process;
 
-use function count;
-use function fgets;
-use function file_get_contents;
-use function function_exists;
-use function is_file;
-use function is_resource;
-use function pclose;
-use function popen;
-use function preg_match_all;
-use const DIRECTORY_SEPARATOR;
+use Fidry\CpuCoreCounter\CpuCoreCounter as FidryCpuCoreCounter;
+use Fidry\CpuCoreCounter\NumberOfCpuCoreNotFound;
 
 class CpuCoreCounter
 {
@@ -24,42 +16,11 @@ public function getNumberOfCpuCores(): int
 			return $this->count;
 		}
 
-		if (!function_exists('proc_open')) {
-			return $this->count = 1;
+		try {
+			return (new FidryCpuCoreCounter())->getCount();
+		} catch (NumberOfCpuCoreNotFound) {
+			return 1;
 		}
-
-		// from brianium/paratest
-		if (@is_file('/proc/cpuinfo')) {
-			// Linux (and potentially Windows with linux sub systems)
-			$cpuinfo = @file_get_contents('/proc/cpuinfo');
-			if ($cpuinfo !== false) {
-				preg_match_all('/^processor/m', $cpuinfo, $matches);
-				return $this->count = count($matches[0]);
-			}
-		}
-
-		if (DIRECTORY_SEPARATOR === '\\') {
-			// Windows
-			$process = @popen('wmic cpu get NumberOfLogicalProcessors', 'rb');
-			if (is_resource($process)) {
-				fgets($process);
-				$cores = (int) fgets($process);
-				pclose($process);
-
-				return $this->count = $cores;
-			}
-		}
-
-		$process = @popen('sysctl -n hw.ncpu', 'rb');
-		if (is_resource($process)) {
-			// *nix (Linux, BSD and Mac)
-			$cores = (int) fgets($process);
-			pclose($process);
-
-			return $this->count = $cores;
-		}
-
-		return $this->count = 2;
 	}
 
 }
diff --git a/src/Rules/Generics/FunctionSignatureVarianceRule.php b/src/Rules/Generics/FunctionSignatureVarianceRule.php
@@ -40,6 +40,7 @@ public function processNode(Node $node, Scope $scope): array
 			sprintf('in return type of function %s()', $functionName),
 			sprintf('in function %s()', $functionName),
 			false,
+			false,
 		);
 	}
 

diff --git a/src/Rules/Generics/GenericAncestorsCheck.php b/src/Rules/Generics/GenericAncestorsCheck.php
@@ -98,7 +98,7 @@ public function check(
 				$messages[] = RuleErrorBuilder::message(sprintf($invalidTypeMessage, $referencedClass))->build();
 			}
 
-			$variance = TemplateTypeVariance::createInvariant();
+			$variance = TemplateTypeVariance::createStatic();
 			$messageContext = sprintf(
 				$invalidVarianceMessage,
 				$ancestorType->describe(VerbosityLevel::typeOnly()),

diff --git a/src/Rules/Generics/MethodSignatureVarianceRule.php b/src/Rules/Generics/MethodSignatureVarianceRule.php
@@ -39,6 +39,7 @@ public function processNode(Node $node, Scope $scope): array
 			sprintf('in return type of method %s::%s()', $method->getDeclaringClass()->getDisplayName(), $method->getName()),
 			sprintf('in method %s::%s()', $method->getDeclaringClass()->getDisplayName(), $method->getName()),
 			$method->getName() === '__construct' || $method->isStatic(),
+			$method->isPrivate(),
 		);
 	}