Skip to content

Commit

Permalink
Updated Rector to commit bee3e20bc5db33f5668f620679074217b392e81b
Browse files Browse the repository at this point in the history
rectorphp/rector-src@bee3e20 Support php-64bit as required in composer.json (#6432)
  • Loading branch information
TomasVotruba committed Nov 15, 2024
1 parent c4fafc5 commit 555ce93
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/Application/VersionResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'fb18cc7970063c5a08351767e3af3a7461e34b5b';
public const PACKAGE_VERSION = 'bee3e20bc5db33f5668f620679074217b392e81b';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2024-11-14 19:08:30';
public const RELEASE_DATE = '2024-11-15 10:10:00';
/**
* @var int
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Php/PhpVersionResolver/ComposerJsonPhpVersionResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ public static function resolve(string $composerJson) : ?int
return self::$cachedPhpVersions[$composerJson];
}
$projectComposerJson = JsonFileSystem::readFilePath($composerJson);
// give this one a priority, as more generic one
$requirePhpVersion = $projectComposerJson['require']['php'] ?? null;
// give this one a priority, as more generic one. see https://github.com/composer/composer/issues/7914
$requirePhpVersion = $projectComposerJson['require']['php'] ?? $projectComposerJson['require']['php-64bit'] ?? null;
if ($requirePhpVersion !== null) {
self::$cachedPhpVersions[$composerJson] = self::createIntVersionFromComposerVersion($requirePhpVersion);
return self::$cachedPhpVersions[$composerJson];
Expand Down

0 comments on commit 555ce93

Please sign in to comment.