Skip to content

Commit 3dd4ea3

Browse files
authored
Merge pull request #480 from fezfez/php8.3
allow php 8.3
2 parents a5c3ce1 + e5a8f39 commit 3dd4ea3

File tree

4 files changed

+13
-74
lines changed

4 files changed

+13
-74
lines changed

bin/roave-infection-static-analysis-plugin

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ declare(strict_types=1);
55

66
namespace Roave\InfectionStaticAnalysis\Application;
77

8+
use Composer\InstalledVersions;
89
use Infection\Console\Application;
910
use Infection\Container;
10-
use PackageVersions\Versions;
1111
use Psalm\Config;
1212
use Psalm\Internal\Analyzer\ProjectAnalyzer;
1313
use Psalm\Internal\IncludeCollector;
@@ -52,11 +52,11 @@ use function var_export;
5252
require_once $projectPath . '/vendor/autoload.php';
5353

5454
if (! defined('PSALM_VERSION')) {
55-
define('PSALM_VERSION', Versions::getVersion('vimeo/psalm'));
55+
define('PSALM_VERSION', InstalledVersions::getVersion('vimeo/psalm'));
5656
}
5757

5858
if (! defined('PHP_PARSER_VERSION')) {
59-
define('PHP_PARSER_VERSION', Versions::getVersion('nikic/php-parser'));
59+
define('PHP_PARSER_VERSION', InstalledVersions::getVersion('nikic/php-parser'));
6060
}
6161

6262
/** @var list<non-empty-string> */

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
"bin/roave-infection-static-analysis-plugin"
1414
],
1515
"require": {
16-
"php": "~8.1.0 || ~8.2.0",
16+
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
17+
"composer-runtime-api": "^2.2",
1718
"infection/infection": "0.27.0",
18-
"ocramius/package-versions": "^2.7.0",
1919
"sanmai/later": "^0.1.2",
20-
"vimeo/psalm": "^4.30.0 || ^5.0.0"
20+
"vimeo/psalm": "^4.30.0 || ^5.15"
2121
},
2222
"require-dev": {
2323
"doctrine/coding-standard": "^12.0.0",

composer.lock

Lines changed: 4 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/unit/Roave/InfectionStaticAnalysisTest/Psalm/RunStaticAnalysisAgainstMutantTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
namespace Roave\InfectionStaticAnalysisTest\Psalm;
66

7+
use Composer\InstalledVersions;
78
use Infection\Mutant\Mutant;
89
use Infection\Mutation\Mutation;
910
use Infection\Mutation\MutationAttributeKeys;
1011
use Infection\PhpParser\MutatedNode;
11-
use PackageVersions\Versions;
1212
use PHPUnit\Framework\TestCase;
1313
use Psalm\Config;
1414
use Psalm\Internal\Analyzer\ProjectAnalyzer;
@@ -110,11 +110,11 @@ function hasMethod(object $input, string $method): bool {
110110
file_put_contents($repeatedDeclaredClassSymbolPath, $declaredClassSymbol);
111111

112112
if (! defined('PSALM_VERSION')) {
113-
define('PSALM_VERSION', Versions::getVersion('vimeo/psalm'));
113+
define('PSALM_VERSION', InstalledVersions::getVersion('vimeo/psalm'));
114114
}
115115

116116
if (! defined('PHP_PARSER_VERSION')) {
117-
define('PHP_PARSER_VERSION', Versions::getVersion('nikic/php-parser'));
117+
define('PHP_PARSER_VERSION', InstalledVersions::getVersion('nikic/php-parser'));
118118
}
119119

120120
RuntimeCaches::clearAll();

0 commit comments

Comments
 (0)