Utilize composer min-php version to narrow PHP_VERSION_ID #3584
Conversation
|
PHPStan 2.x seems the perfect point in time to re-vive this PR, as it found some dead tests in phpstan-extension repos :) (because of the raised min-php version) |
| try { | ||
| $composerJsonContents = FileReader::read($composerJsonPath); | ||
| $composer = Json::decode($composerJsonContents, Json::FORCE_ARRAY); | ||
| $requiredVersion = $composer['require']['php'] ?? null; |
There was a problem hiding this comment.
php-64bit should be supported as well - the minimal version should be used of these two if both are present
|
This pull request has been marked as ready for review. |
conf/bleedingEdge.neon
Outdated
| @@ -3,3 +3,5 @@ parameters: | |||
| bleedingEdge: true | |||
| skipCheckGenericClasses!: [] | |||
| stricterFunctionMap: true | |||
| narrowPhpVersionFromComposerJson: true | |||
There was a problem hiding this comment.
You have based this PR on 2.0.x. You shouldn't be adding a new flag to bleedingEdge.
There was a problem hiding this comment.
my thinking was, that this feature was never part of any stable 1.x release and therefore could need some time to stabilize within bleeding edge.
dropped the toggle now
| @@ -0,0 +1,6 @@ | |||
| <?php | |||
|
|
|||
| \PHPStan\Testing\assertType('int<80100, max>', PHP_VERSION_ID); | |||
There was a problem hiding this comment.
This could be until 80499 which is the max version allowed in the config. It'd help us prevent more typos and be consistent.
| @@ -0,0 +1,6 @@ | |||
| <?php | |||
|
|
|||
| \PHPStan\Testing\assertType('int<80100, 90000>', PHP_VERSION_ID); | |||
| @@ -41,11 +41,26 @@ public function getVersionId(): int | |||
| return $this->versionId; | |||
| } | |||
|
|
|||
| public function getMajor(): int | |||
There was a problem hiding this comment.
should say "getMajorVersionId"
|
|
||
| public function getMinor(): int | ||
| { | ||
| return (int) floor(($this->versionId % 10000) / 100); |
|
|
||
| public function getPatch(): int | ||
| { | ||
| return (int) floor($this->versionId % 100); |
| return; | ||
| } | ||
|
|
||
| $this->maxVersion = $this->buildVersion($constraint->getUpperBound()->getVersion()); |
There was a problem hiding this comment.
Don't do this work in the construtor, but lazily in the getters. (Of course it should still be cached in the properties.)
idea is to catch errors like Roave/BetterReflection#1406 (comment) in which bogus conditions like
if (PHP_VERSION_ID >= 80100) {}have been used in tests.it's a bug in the linked case, because the project itself only supports
"php": "~8.2.0 || ~8.3.2",.Since CI only is running against in composer.json declared supported versions this error was not spotted before.
rebased version of #2968 for 2.x