added tests

staabm · staabm · commit 034a4d64c6d2 · 2024-11-06T15:18:19.000+01:00
diff --git a/e2e/composer-min-version-v5/.gitignore b/e2e/composer-min-version-v5/.gitignore
@@ -0,0 +1,2 @@
+/vendor/
+composer.lock
diff --git a/e2e/composer-min-version-v5/composer.json b/e2e/composer-min-version-v5/composer.json
@@ -0,0 +1,5 @@
+{
+	"require": {
+		"php": "^5.6"
+	}
+}
diff --git a/e2e/composer-min-version-v5/phpstan.neon b/e2e/composer-min-version-v5/phpstan.neon
@@ -0,0 +1,2 @@
+includes:
+	- ../../conf/bleedingEdge.neon
diff --git a/e2e/composer-min-version-v5/test.php b/e2e/composer-min-version-v5/test.php
@@ -0,0 +1,6 @@
+<?php
+
+\PHPStan\Testing\assertType('int<50600, 50699>', PHP_VERSION_ID);
+\PHPStan\Testing\assertType('5', PHP_MAJOR_VERSION);
+\PHPStan\Testing\assertType('6', PHP_MINOR_VERSION);
+\PHPStan\Testing\assertType('int<0, max>', PHP_RELEASE_VERSION);
diff --git a/e2e/composer-min-version-v7/.gitignore b/e2e/composer-min-version-v7/.gitignore
@@ -0,0 +1,2 @@
+/vendor/
+composer.lock
diff --git a/e2e/composer-min-version-v7/composer.json b/e2e/composer-min-version-v7/composer.json
@@ -0,0 +1,5 @@
+{
+	"require": {
+		"php": "^7"
+	}
+}
diff --git a/e2e/composer-min-version-v7/phpstan.neon b/e2e/composer-min-version-v7/phpstan.neon
@@ -0,0 +1,2 @@
+includes:
+	- ../../conf/bleedingEdge.neon
diff --git a/e2e/composer-min-version-v7/test.php b/e2e/composer-min-version-v7/test.php
@@ -0,0 +1,6 @@
+<?php
+
+\PHPStan\Testing\assertType('int<70000, 70499>', PHP_VERSION_ID);
+\PHPStan\Testing\assertType('7', PHP_MAJOR_VERSION);
+\PHPStan\Testing\assertType('int<0, 4>', PHP_MINOR_VERSION);
+\PHPStan\Testing\assertType('int<0, max>', PHP_RELEASE_VERSION);
diff --git a/e2e/composer-no-versions/.gitignore b/e2e/composer-no-versions/.gitignore
@@ -0,0 +1,2 @@
+/vendor/
+composer.lock
diff --git a/e2e/composer-no-versions/composer.json b/e2e/composer-no-versions/composer.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/e2e/composer-no-versions/phpstan.neon b/e2e/composer-no-versions/phpstan.neon
@@ -0,0 +1,2 @@
+includes:
+	- ../../conf/bleedingEdge.neon
diff --git a/e2e/composer-no-versions/test.php b/e2e/composer-no-versions/test.php
@@ -0,0 +1,6 @@
+<?php
+
+\PHPStan\Testing\assertType('int<50207, 80499>', PHP_VERSION_ID);
+\PHPStan\Testing\assertType('int<5, 8>', PHP_MAJOR_VERSION);
+\PHPStan\Testing\assertType('int<0, max>', PHP_MINOR_VERSION);
+\PHPStan\Testing\assertType('int<0, max>', PHP_RELEASE_VERSION);
diff --git a/src/Php/ComposerPhpVersionFactory.php b/src/Php/ComposerPhpVersionFactory.php
@@ -60,7 +60,7 @@ private function initializeVersions(): void
 			return;
 		}
 
-		$this->minVersion = new PhpVersion(PhpVersionFactory::MIN_PHP_VERSION);
+		// don't limit minVersion... PHPStan can analyze even PHP5
 		$this->maxVersion = new PhpVersion(PhpVersionFactory::MAX_PHP_VERSION);
 
 		// fallback to composer.json based php-version constraint
@@ -145,7 +145,6 @@ private function buildVersion(string $minVersion): ?PhpVersion
 		$patch = $matches[3] ?? 0;
 		$versionId = (int) sprintf('%d%02d%02d', $major, $minor, $patch);
 
-		$versionId = max($versionId, PhpVersionFactory::MIN_PHP_VERSION);
 		$versionId = min($versionId, PhpVersionFactory::MAX_PHP_VERSION);
 
 		return new PhpVersion($versionId);

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +	"require": {
 +		"php": "^5.6"
 +	}
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+includes:`
	`2`	`+ - ../../conf/bleedingEdge.neon`