Use Composer InstalledVersions

phpstan · Aug 10, 2022 · 1ebd2c3 · 1ebd2c3
1 parent 43de398
commit 1ebd2c3
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 101 deletions.
diff --git a/bin/phpstan b/bin/phpstan
@@ -1,7 +1,6 @@
 #!/usr/bin/env php
 <?php declare(strict_types=1);
 
-use PackageVersions\Versions;
 use PHPStan\Command\AnalyseCommand;
 use PHPStan\Command\ClearResultCacheCommand;
 use PHPStan\Command\FixerWorkerCommand;
@@ -155,7 +154,7 @@ use Symfony\Component\Console\Helper\ProgressBar;
 
 	$version = 'Version unknown';
 	try {
-		$version = explode('@', Versions::getVersion('phpstan/phpstan'))[0] ?: $version;
+		$version = \Composer\InstalledVersions::getPrettyVersion('phpstan/phpstan') ?: $version;
 	} catch (\OutOfBoundsException $e) {
 
 	}

diff --git a/composer.json b/composer.json
@@ -6,10 +6,10 @@
 	],
 	"require": {
 		"php": "^8.0",
+		"composer-runtime-api": "^2.0",
 		"clue/block-react": "^1.4",
 		"clue/ndjson-react": "^1.0",
 		"composer/ca-bundle": "^1.2",
-		"composer/package-versions-deprecated": "1.11.99.5",
 		"composer/xdebug-handler": "^3.0.3",
 		"hoa/compiler": "3.17.08.08",
 		"hoa/exception": "^1.0",
@@ -68,7 +68,6 @@
 		"platform-check": false,
 		"sort-packages": true,
 		"allow-plugins": {
-			"composer/package-versions-deprecated": true,
 			"vaimo/composer-patches": true
 		}
 	},

diff --git a/composer.lock b/composer.lock
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -43,14 +43,6 @@ parameters:
 			count: 1
 			path: src/Analyser/NodeScopeResolver.php
 
-		-
-			message: """
-				#^Call to method getVersion\\(\\) of deprecated class PackageVersions\\\\Versions\\:
-				in favor of the Composer\\\\InstalledVersions class provided by Composer 2\\. Require composer\\-runtime\\-api\\:\\^2 to ensure it is present\\.$#
-			"""
-			count: 1
-			path: src/Analyser/ResultCache/ResultCacheManager.php
-
 		-
 			message: "#^Template type TNodeType is declared as covariant, but occurs in contravariant position in parameter node of method PHPStan\\\\Collectors\\\\Collector\\:\\:processNode\\(\\)\\.$#"
 			count: 1
@@ -121,14 +113,6 @@ parameters:
 			count: 1
 			path: src/Command/FixerApplication.php
 
-		-
-			message: """
-				#^Call to method getVersion\\(\\) of deprecated class PackageVersions\\\\Versions\\:
-				in favor of the Composer\\\\InstalledVersions class provided by Composer 2\\. Require composer\\-runtime\\-api\\:\\^2 to ensure it is present\\.$#
-			"""
-			count: 1
-			path: src/Command/FixerApplication.php
-
 		-
 			message: "#^Parameter \\#1 \\$arg of function escapeshellarg expects string, string\\|false given\\.$#"
 			count: 1

diff --git a/src/Analyser/ResultCache/ResultCacheManager.php b/src/Analyser/ResultCache/ResultCacheManager.php
@@ -2,10 +2,10 @@
 
 namespace PHPStan\Analyser\ResultCache;
 
+use Composer\InstalledVersions;
 use Nette\DI\Definitions\Statement;
 use Nette\Neon\Neon;
 use OutOfBoundsException;
-use PackageVersions\Versions;
 use PHPStan\Analyser\AnalyserResult;
 use PHPStan\Analyser\Error;
 use PHPStan\Collectors\CollectedData;
@@ -29,7 +29,6 @@
 use function array_unique;
 use function array_values;
 use function count;
-use function explode;
 use function get_loaded_extensions;
 use function is_array;
 use function is_file;
@@ -809,7 +808,7 @@ private function getExecutedFileHashes(): array
 	private function getPhpStanVersion(): string
 	{
 		try {
-			return explode('@', Versions::getVersion('phpstan/phpstan'))[0];
+			return InstalledVersions::getPrettyVersion('phpstan/phpstan') ?? '';
 		} catch (OutOfBoundsException) {
 			return 'Version unknown';
 		}

diff --git a/src/Command/FixerApplication.php b/src/Command/FixerApplication.php
@@ -5,12 +5,12 @@
 use Clue\React\NDJson\Decoder;
 use Clue\React\NDJson\Encoder;
 use Composer\CaBundle\CaBundle;
+use Composer\InstalledVersions;
 use DateTime;
 use DateTimeImmutable;
 use DateTimeZone;
 use Nette\Utils\Json;
 use OutOfBoundsException;
-use PackageVersions\Versions;
 use Phar;
 use PHPStan\Analyser\AnalyserResult;
 use PHPStan\Analyser\Error;
@@ -52,7 +52,6 @@
 use function count;
 use function defined;
 use function escapeshellarg;
-use function explode;
 use function fclose;
 use function fopen;
 use function fwrite;
@@ -561,7 +560,7 @@ private function reanalyseAfterFileChanges(
 	private function getPhpstanVersion(): string
 	{
 		try {
-			return explode('@', Versions::getVersion('phpstan/phpstan'))[0];
+			return InstalledVersions::getPrettyVersion('phpstan/phpstan') ?? '';
 		} catch (OutOfBoundsException) {
 			return 'Version unknown';
 		}