Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions src/Composer/InstalledPackageResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
final class InstalledPackageResolver
{
/**
* @var null|InstalledPackage[]
* @var null|array<string, InstalledPackage>
*/
private ?array $resolvedInstalledPackages = null;

Expand All @@ -33,7 +33,7 @@ public function __construct(
}

/**
* @return InstalledPackage[]
* @return array<string, InstalledPackage>
*/
public function resolve(): array
{
Expand Down Expand Up @@ -61,28 +61,20 @@ public function resolve(): array

public function resolvePackageVersion(string $packageName): ?string
{
$installedPackages = $this->resolve();
foreach ($installedPackages as $installedPackage) {
if ($installedPackage->getName() !== $packageName) {
continue;
}

return $installedPackage->getVersion();
}

return null;
return ($this->resolve()[$packageName] ?? null)?->getVersion();
}

/**
* @param mixed[] $packages
* @return InstalledPackage[]
* @return array<string, InstalledPackage>
*/
private function createInstalledPackages(array $packages): array
{
$installedPackages = [];

foreach ($packages as $package) {
$installedPackages[] = new InstalledPackage($package['name'], $package['version_normalized']);
$name = $package['name'];
$installedPackages[$name] = new InstalledPackage($name, $package['version_normalized']);
}

return $installedPackages;
Expand Down
12 changes: 5 additions & 7 deletions src/Set/ValueObject/ComposerTriggeredSet.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,17 @@ public function getSetFilePath(): string
}

/**
* @param InstalledPackage[] $installedPackages
* @param array<string, InstalledPackage> $installedPackages
*/
public function matchInstalledPackages(array $installedPackages): bool
{
foreach ($installedPackages as $installedPackage) {
if ($installedPackage->getName() !== $this->packageName) {
continue;
}
$installedVersion = ($installedPackages[$this->packageName] ?? null)?->getVersion();

return Semver::satisfies($installedPackage->getVersion(), '^' . $this->version);
if ($installedVersion === null) {
return false;
}

return false;
return Semver::satisfies($installedVersion, '^' . $this->version);
}

public function getName(): string
Expand Down
Loading