Skip to content

Commit e87aa34

Browse files
committed
Use any constraint for finding matching packages
1 parent 0fb498f commit e87aa34

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/Command/CommandHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ static function (array $match) use ($output, $pieComposer): array {
390390

391391
return $match;
392392
},
393-
$findMatchingPackages->for($pieComposer, $requestedPackageName, $exception->requestedPackageAndVersion->version ?? '*'),
393+
$findMatchingPackages->for($pieComposer, $requestedPackageName),
394394
);
395395

396396
if (count($matches)) {

src/Command/InstallExtensionsForProjectCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ function (Link $link) use ($pieComposer, $phpEnabledExtensions, $installedPiePac
201201
));
202202

203203
try {
204-
$matches = $this->findMatchingPackages->for($pieComposer, $extension->name(), $linkRequiresConstraint);
204+
$matches = $this->findMatchingPackages->for($pieComposer, $extension->name());
205205
} catch (OutOfRangeException) {
206206
$anyErrorsHappened = true;
207207

src/Installing/InstallForPhpProject/FindMatchingPackages.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
class FindMatchingPackages
2626
{
2727
/** @return MatchingPackages */
28-
public function for(Composer $pieComposer, string $searchTerm, string $stringConstraint): array
28+
public function for(Composer $pieComposer, string $searchTerm): array
2929
{
3030
$matches = [];
3131
foreach ($pieComposer->getRepositoryManager()->getRepositories() as $repo) {
@@ -38,8 +38,8 @@ public function for(Composer $pieComposer, string $searchTerm, string $stringCon
3838

3939
$matches = array_filter(
4040
$matches,
41-
static function (array $match) use ($pieComposer, $extensionName, $stringConstraint): bool {
42-
$package = $pieComposer->getRepositoryManager()->findPackage($match['name'], $stringConstraint);
41+
static function (array $match) use ($pieComposer, $extensionName): bool {
42+
$package = $pieComposer->getRepositoryManager()->findPackage($match['name'], '*');
4343

4444
if (! $package instanceof CompletePackage) {
4545
return false;

test/unit/Installing/InstallForPhpProject/FindMatchingPackagesTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function testSearchResultsAreFilteredByExtensionName(): void
6565
'description' => 'The best extension there is',
6666
],
6767
],
68-
(new FindMatchingPackages())->for($composer, 'bar', '*'),
68+
(new FindMatchingPackages())->for($composer, 'bar'),
6969
);
7070
}
7171
}

0 commit comments

Comments
 (0)