Utilize phpVersion.min+max in VersionCompareFunctionDynamicReturnTypeExtension

Author: staabm

.github/workflows/e2e-tests.yml

@@ -296,6 +296,10 @@ jobs:
           - script: |
               cd e2e/bug-11819
               ../../bin/phpstan
+          - script: |
+              cd e2e/composer-and-phpstan-version-config
+              composer install --ignore-platform-reqs
+              ../../bin/phpstan analyze test.php --level=0
           - script: |
               cd e2e/composer-max-version
               composer install

conf/config.neon

@@ -1683,6 +1683,8 @@ services:
 
 	-
 		class: PHPStan\Type\Php\VersionCompareFunctionDynamicReturnTypeExtension
+		arguments:
+			configPhpVersion: %phpVersion%
 		tags:
 			- phpstan.broker.dynamicFunctionReturnTypeExtension
 

e2e/composer-and-phpstan-version-config/.gitignore

@@ -0,0 +1,2 @@
+/vendor/
+composer.lock

e2e/composer-and-phpstan-version-config/composer.json

@@ -0,0 +1,5 @@
+{
+	"require": {
+		"php": "^7.0"
+	}
+}

e2e/composer-and-phpstan-version-config/phpstan.neon

@@ -0,0 +1,4 @@
+parameters:
+	phpVersion:
+		min: 80103
+		max: 80304

e2e/composer-and-phpstan-version-config/test.php

@@ -0,0 +1,11 @@
+<?php
+
+// constraint from composer.json is overruled by phpstan.neon config
+\PHPStan\Testing\assertType('int<80103, 80304>', PHP_VERSION_ID);
+\PHPStan\Testing\assertType('8', PHP_MAJOR_VERSION);
+\PHPStan\Testing\assertType('int<1, 3>', PHP_MINOR_VERSION);
+\PHPStan\Testing\assertType('int<0, max>', PHP_RELEASE_VERSION);
+
+\PHPStan\Testing\assertType('1', version_compare(PHP_VERSION, '7.0.0'));
+\PHPStan\Testing\assertType('false', version_compare(PHP_VERSION, '7.0.0', '<'));
+\PHPStan\Testing\assertType('true', version_compare(PHP_VERSION, '7.0.0', '>'));

src/Type/Php/VersionCompareFunctionDynamicReturnTypeExtension.php

@@ -6,6 +6,7 @@
 use PhpParser\Node\Expr\FuncCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Php\ComposerPhpVersionFactory;
+use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantBooleanType;
@@ -16,12 +17,19 @@
 use PHPStan\Type\TypeCombinator;
 use function array_filter;
 use function count;
+use function is_array;
 use function version_compare;
 
 final class VersionCompareFunctionDynamicReturnTypeExtension implements DynamicFunctionReturnTypeExtension
 {
 
-	public function __construct(private ComposerPhpVersionFactory $composerPhpVersionFactory)
+	/**
+	 * @param int|array{min: int, max: int}|null $configPhpVersion
+	 */
+	public function __construct(
+		private int|array|null $configPhpVersion,
+		private ComposerPhpVersionFactory $composerPhpVersionFactory,
+	)
 	{
 	}
 
@@ -93,13 +101,21 @@ private function getVersionStrings(Expr $expr, Scope $scope): array
 		if (
 			$expr instanceof Expr\ConstFetch
 			&& $expr->name->toString() === 'PHP_VERSION'
-			&& $this->composerPhpVersionFactory->getMinVersion() !== null
-			&& $this->composerPhpVersionFactory->getMaxVersion() !== null
 		) {
-			return [
-				new ConstantStringType($this->composerPhpVersionFactory->getMinVersion()->getVersionString()),
-				new ConstantStringType($this->composerPhpVersionFactory->getMaxVersion()->getVersionString()),
-			];
+			if (is_array($this->configPhpVersion)) {
+				$minVersion = new PhpVersion($this->configPhpVersion['min']);
+				$maxVersion = new PhpVersion($this->configPhpVersion['max']);
+			} else {
+				$minVersion = $this->composerPhpVersionFactory->getMinVersion();
+				$maxVersion = $this->composerPhpVersionFactory->getMaxVersion();
+			}
+
+			if ($minVersion !== null && $maxVersion !== null) {
+				return [
+					new ConstantStringType($minVersion->getVersionString()),
+					new ConstantStringType($maxVersion->getVersionString()),
+				];
+			}
 		}
 
 		return $scope->getType($expr)->getConstantStrings();