Fix platform version resolution, use require first (#5555)

* add fix for platofmr version

* fix test

Author: TomasVotruba

rules/Php80/Rector/Class_/AnnotationToAttributeRector.php

@@ -24,6 +24,7 @@
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\Contract\Rector\ConfigurableRectorInterface;
+use Rector\Exception\Configuration\InvalidConfigurationException;
 use Rector\Naming\Naming\UseImportsResolver;
 use Rector\Php80\NodeAnalyzer\PhpAttributeAnalyzer;
 use Rector\Php80\NodeFactory\AttrGroupsFactory;
@@ -33,7 +34,6 @@
 use Rector\PhpAttribute\NodeFactory\PhpAttributeGroupFactory;
 use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
 use Rector\Rector\AbstractRector;
-use Rector\Exception\Configuration\InvalidConfigurationException;
 use Rector\ValueObject\PhpVersionFeature;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;

src/Php/PhpVersionResolver/ProjectComposerJsonPhpVersionResolver.php

@@ -28,21 +28,21 @@ public static function resolve(string $composerJson): ?int
         $composerJsonContents = FileSystem::read($composerJson);
         $projectComposerJson = Json::decode($composerJsonContents, Json::FORCE_ARRAY);
 
+        // give this one a priority, as more generic one
+        $requirePhpVersion = $projectComposerJson['require']['php'] ?? null;
+        if ($requirePhpVersion !== null) {
+            self::$cachedPhpVersions[$composerJson] = self::createIntVersionFromComposerVersion($requirePhpVersion);
+            return self::$cachedPhpVersions[$composerJson];
+        }
+
         // see https://getcomposer.org/doc/06-config.md#platform
         $platformPhp = $projectComposerJson['config']['platform']['php'] ?? null;
         if ($platformPhp !== null) {
             self::$cachedPhpVersions[$composerJson] = PhpVersionFactory::createIntVersion($platformPhp);
             return self::$cachedPhpVersions[$composerJson];
         }
 
-        $requirePhpVersion = $projectComposerJson['require']['php'] ?? null;
-        if ($requirePhpVersion === null) {
-            return self::$cachedPhpVersions[$composerJson] = null;
-        }
-
-        self::$cachedPhpVersions[$composerJson] = self::createIntVersionFromComposerVersion($requirePhpVersion);
-
-        return self::$cachedPhpVersions[$composerJson];
+        return null;
     }
 
     private static function createIntVersionFromComposerVersion(string $projectPhpVersion): int

src/Util/PhpVersionFactory.php

@@ -16,14 +16,10 @@ public static function createIntVersion(string $version): int
         $explodeVersion = explode('.', $version);
         $countExplodedVersion = count($explodeVersion);
 
-        if ($countExplodedVersion === 2) {
+        if ($countExplodedVersion >= 2) {
             return (int) $explodeVersion[0] * 10000 + (int) $explodeVersion[1] * 100;
         }
 
-        if ($countExplodedVersion >= 3) {
-            return (int) $explodeVersion[0] * 10000 + (int) $explodeVersion[1] * 100 + (int) $explodeVersion[2];
-        }
-
         return (int) $version;
     }
 }

tests/Php/PhpVersionResolver/ProjectComposerJsonPhpVersionResolver/Fixture/some_composer_with_platform.json

@@ -1,10 +1,10 @@
 {
     "require": {
-        "php": ">=7.3"
+        "php": ">=7.4"
     },
     "config": {
         "platform": {
-            "php": "7.4"
+            "php": "7.3"
         }
     }
 }