Skip to content

Commit 5683c46

Browse files
committed
Don't call deprecated InstalledVersions::getRawData()
1 parent 568e465 commit 5683c46

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

src/ProxyManager/Generator/Util/IdentifierSuffixer.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use Composer\InstalledVersions;
88

9+
use function is_callable;
910
use function preg_match;
1011
use function serialize;
1112
use function sha1;
@@ -48,6 +49,10 @@ public static function getIdentifier(string $name): string
4849

4950
private static function loadBaseHashSalt(): string
5051
{
51-
return sha1(serialize(InstalledVersions::getRawData()));
52+
return sha1(serialize(
53+
is_callable([InstalledVersions::class, 'getAllRawData'])
54+
? InstalledVersions::getAllRawData() // Composer >= 2.0.14
55+
: InstalledVersions::getRawData()
56+
));
5257
}
5358
}

tests/ProxyManagerTest/Generator/Util/IdentifierSuffixerTest.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use PHPUnit\Framework\TestCase;
99
use ProxyManager\Generator\Util\IdentifierSuffixer;
1010

11+
use function is_callable;
1112
use function serialize;
1213
use function sha1;
1314
use function strlen;
@@ -37,8 +38,14 @@ public function testGeneratesSuffixedIdentifiers(string $name): void
3738
*/
3839
public function testGeneratedSuffixDependsOnPackageInstalledVersions(string $name): void
3940
{
41+
$hashedData = sha1(serialize(
42+
is_callable([InstalledVersions::class, 'getAllRawData'])
43+
? InstalledVersions::getAllRawData()
44+
: InstalledVersions::getRawData()
45+
));
46+
4047
self::assertStringEndsWith(
41-
substr(sha1($name . sha1(serialize(InstalledVersions::getRawData()))), 0, 5),
48+
substr(sha1($name . $hashedData), 0, 5),
4249
IdentifierSuffixer::getIdentifier($name)
4350
);
4451
}

0 commit comments

Comments
 (0)