Narrow PHP_VERSION_ID on version_compare()

.github/workflows/e2e-tests.yml

@@ -2042,6 +2042,10 @@ jobs:
               cd e2e/composer-version-config
               composer install
               ../../bin/phpstan analyze test.php --level=0
+          - script: |
+              cd e2e/version-compare-phpversionid
+              composer install
+              ../../bin/phpstan analyze narrow-phpversionid-on-version-compare.php --level=0
           - script: |
               cd e2e/bug13425
               timeout 15 ../bashunit assert exit_code "1" "../../bin/phpstan analyze src/ plugins/"

e2e/version-compare-phpversionid/.gitignore

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

e2e/version-compare-phpversionid/composer.json

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

e2e/version-compare-phpversionid/narrow-phpversionid-on-version-compare-global-scope.php

@@ -0,0 +1,21 @@
+<?php
+
+// intentional without namespace
+
+use function PHPStan\Testing\assertType;
+
+function narrowPhpVersionIdViaVersionComapre(): void {
+	if (PHP_VERSION_ID < 80000) {
+		return;
+	}
+	$x = PHP_VERSION_ID;
+	assertType('int<80000, max>', $x);
+
+	if (
+		version_compare( PHP_VERSION, '8.4', '<' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80000, 80399>', $x);
+	}
+}
+

e2e/version-compare-phpversionid/narrow-phpversionid-on-version-compare.php

@@ -0,0 +1,182 @@
+<?php
+
+namespace Bug162;
+
+use function PHPStan\Testing\assertType;
+use const PHP_VERSION;
+use const PHP_VERSION_ID;
+
+function lower(): void
+{
+	// add a upper bound, so we don't need to adjust
+	// the test when PHPStan adds support for PHP8.6+
+	if (PHP_VERSION_ID > 80599) {
+		return;
+	}
+
+	// lower limit inferred from composer.json
+	$x = PHP_VERSION_ID;
+	assertType('int<80000, 80599>', $x);
+
+	if (
+		version_compare( PHP_VERSION, '8.4', '<' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80000, 80399>', $x);
+	}
+
+	if (
+		version_compare( PHP_VERSION, '8.4', 'lt' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80000, 80399>', $x);
+	}
+
+	if (
+		version_compare( PHP_VERSION, '8.4', '<=' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80000, 80400>', $x);
+	}
+
+	if (
+		version_compare( PHP_VERSION, '8.4', 'le' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80000, 80400>', $x);
+	}
+}
+
+function greater(): void
+{
+	// add a upper bound, so we don't need to adjust
+	// the test when PHPStan adds support for PHP8.6+
+	if (PHP_VERSION_ID > 80599) {
+		return;
+	}
+
+	if (
+		version_compare( PHP_VERSION, '8.4', '>' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80401, 80599>', $x);
+	}
+
+	if (
+		version_compare( PHP_VERSION, '8.4', 'gt' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80401, 80599>', $x);
+	}
+
+	if (
+		version_compare( PHP_VERSION, '8.4', '>=' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80400, 80599>', $x);
+	}
+	if (
+		version_compare( PHP_VERSION, '8.4', 'ge' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80400, 80599>', $x);
+	}
+}
+
+function equal(): void
+{
+	if (
+		version_compare( PHP_VERSION, '8.4', '=' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('80400', $x);
+	}
+
+	if (
+		version_compare( PHP_VERSION, '8.4', '==' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('80400', $x);
+	}
+
+	if (
+		version_compare( PHP_VERSION, '8.4', 'eq' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('80400', $x);
+	}
+}
+
+
+function not(): void
+{
+	// add a upper bound, so we don't need to adjust
+	// the test when PHPStan adds support for PHP8.6+
+	if (PHP_VERSION_ID > 80599) {
+		return;
+	}
+
+	if (
+		version_compare( PHP_VERSION, '8.4', '!=' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80000, 80399>|int<80401, 80599>', $x);
+	}
+
+	if (
+		version_compare( PHP_VERSION, '8.4', '<>' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80000, 80399>|int<80401, 80599>', $x);
+	}
+
+	if (
+		version_compare( PHP_VERSION, '8.4', 'ne' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80000, 80399>|int<80401, 80599>', $x);
+	}
+}
+
+function inverseOperandLower(): void
+{
+	// add a upper bound, so we don't need to adjust
+	// the test when PHPStan adds support for PHP8.6+
+	if (PHP_VERSION_ID > 80599) {
+		return;
+	}
+
+	if (
+		version_compare( '8.3.12', PHP_VERSION, '<' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80313, 80599>', $x);
+	}
+
+	if (
+		version_compare( '8.3.12', PHP_VERSION, '>=' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80000, 80312>', $x);
+	}
+
+	if (
+		version_compare( '8.3.12', PHP_VERSION, '>' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80000, 80311>', $x);
+	}
+}
+
+function narrow(): void {
+	if (PHP_VERSION_ID < 80000) {
+		return;
+	}
+
+	if (
+		version_compare( PHP_VERSION, '8.4', '<' )
+	) {
+		$x = PHP_VERSION_ID;
+		assertType('int<80000, 80399>', $x);
+	}
+}

src/Php/SimplePhpVersionParser.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Php;
+
+use Nette\Utils\Strings;
+use function sprintf;
+
+final class SimplePhpVersionParser
+{
+
+	public static function parseVersion(string $version): ?PhpVersion
+	{
+		$matches = Strings::match($version, '#^(\d+)\.(\d+)(?:\.(\d+))?#');
+		if ($matches === null) {
+			return null;
+		}
+
+		$major = (int) $matches[1];
+		$minor = (int) $matches[2];
+		$patch = (int) ($matches[3] ?? 0);
+		$versionId = (int) sprintf('%d%02d%02d', $major, $minor, $patch);
+
+		return new PhpVersion($versionId);
+	}
+
+}