Merge pull request #480 from fezfez/php8.3

allow php 8.3
Roave · Sep 15, 2023 · 3dd4ea3 · 3dd4ea3
2 parents a5c3ce1 + e5a8f39
commit 3dd4ea3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 74 deletions.
diff --git a/bin/roave-infection-static-analysis-plugin b/bin/roave-infection-static-analysis-plugin
@@ -5,9 +5,9 @@ declare(strict_types=1);
 
 namespace Roave\InfectionStaticAnalysis\Application;
 
+use Composer\InstalledVersions;
 use Infection\Console\Application;
 use Infection\Container;
-use PackageVersions\Versions;
 use Psalm\Config;
 use Psalm\Internal\Analyzer\ProjectAnalyzer;
 use Psalm\Internal\IncludeCollector;
@@ -52,11 +52,11 @@ use function var_export;
     require_once $projectPath . '/vendor/autoload.php';
 
     if (! defined('PSALM_VERSION')) {
-        define('PSALM_VERSION', Versions::getVersion('vimeo/psalm'));
+        define('PSALM_VERSION', InstalledVersions::getVersion('vimeo/psalm'));
     }
 
     if (! defined('PHP_PARSER_VERSION')) {
-        define('PHP_PARSER_VERSION', Versions::getVersion('nikic/php-parser'));
+        define('PHP_PARSER_VERSION', InstalledVersions::getVersion('nikic/php-parser'));
     }
 
     /** @var list<non-empty-string> */

diff --git a/composer.json b/composer.json
@@ -13,11 +13,11 @@
         "bin/roave-infection-static-analysis-plugin"
     ],
     "require": {
-        "php": "~8.1.0 || ~8.2.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "composer-runtime-api": "^2.2",
         "infection/infection": "0.27.0",
-        "ocramius/package-versions": "^2.7.0",
         "sanmai/later": "^0.1.2",
-        "vimeo/psalm": "^4.30.0 || ^5.0.0"
+        "vimeo/psalm": "^4.30.0 || ^5.15"
     },
     "require-dev": {
         "doctrine/coding-standard": "^12.0.0",

diff --git a/composer.lock b/composer.lock
diff --git a/test/unit/Roave/InfectionStaticAnalysisTest/Psalm/RunStaticAnalysisAgainstMutantTest.php b/test/unit/Roave/InfectionStaticAnalysisTest/Psalm/RunStaticAnalysisAgainstMutantTest.php
@@ -4,11 +4,11 @@
 
 namespace Roave\InfectionStaticAnalysisTest\Psalm;
 
+use Composer\InstalledVersions;
 use Infection\Mutant\Mutant;
 use Infection\Mutation\Mutation;
 use Infection\Mutation\MutationAttributeKeys;
 use Infection\PhpParser\MutatedNode;
-use PackageVersions\Versions;
 use PHPUnit\Framework\TestCase;
 use Psalm\Config;
 use Psalm\Internal\Analyzer\ProjectAnalyzer;
@@ -110,11 +110,11 @@ function hasMethod(object $input, string $method): bool {
         file_put_contents($repeatedDeclaredClassSymbolPath, $declaredClassSymbol);
 
         if (! defined('PSALM_VERSION')) {
-            define('PSALM_VERSION', Versions::getVersion('vimeo/psalm'));
+            define('PSALM_VERSION', InstalledVersions::getVersion('vimeo/psalm'));
         }
 
         if (! defined('PHP_PARSER_VERSION')) {
-            define('PHP_PARSER_VERSION', Versions::getVersion('nikic/php-parser'));
+            define('PHP_PARSER_VERSION', InstalledVersions::getVersion('nikic/php-parser'));
         }
 
         RuntimeCaches::clearAll();