From f61b0db02ca6dc113d68d5aef30ef5a43347316c Mon Sep 17 00:00:00 2001 From: onspli Date: Fri, 27 Sep 2024 17:19:28 +0200 Subject: [PATCH] Fix code formatting --- src/PackageSelection/PackageSelection.php | 9 +++---- .../PackageSelection/PackageSelectionTest.php | 26 +++++++++---------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/PackageSelection/PackageSelection.php b/src/PackageSelection/PackageSelection.php index 5e149562..4a471521 100644 --- a/src/PackageSelection/PackageSelection.php +++ b/src/PackageSelection/PackageSelection.php @@ -917,14 +917,13 @@ private function filterRepositories(array $repositories): array $repositories, function ($repository) { if ($repository instanceof ConfigurableRepositoryInterface) { - $config = $repository->getRepoConfig(); if (!isset($config['url'])) { return false; } + return in_array($config['url'], $this->repositoriesFilter ?? [], true); - - } else if ($repository instanceof ArrayRepository) { + } elseif ($repository instanceof ArrayRepository) { $packages = $repository->getPackages(); foreach ($packages as $package) { if (in_array($package->getSourceUrl(), $this->repositoriesFilter ?? [], true)) { @@ -932,10 +931,10 @@ function ($repository) { } } - return false; - } else { return false; } + + return false; } ); } diff --git a/tests/PackageSelection/PackageSelectionTest.php b/tests/PackageSelection/PackageSelectionTest.php index 4be2b036..8218f178 100644 --- a/tests/PackageSelection/PackageSelectionTest.php +++ b/tests/PackageSelection/PackageSelectionTest.php @@ -788,8 +788,8 @@ public function dataFilterRepos(): array 'source' => [ 'url' => 'git@github.com:vendor/project-alpha.git', 'type' => 'vcs', - 'reference' => '1.2.3.1' - ] + 'reference' => '1.2.3.1', + ], ], 'alpha2' => [ 'name' => 'vendor/project-alpha', @@ -797,8 +797,8 @@ public function dataFilterRepos(): array 'source' => [ 'url' => 'git@github.com:vendor/project-alpha.git', 'type' => 'vcs', - 'reference' => '1.2.3.2' - ] + 'reference' => '1.2.3.2', + ], ], 'beta1' => [ 'name' => 'vendor/project-beta', @@ -806,8 +806,8 @@ public function dataFilterRepos(): array 'source' => [ 'url' => 'git@github.com:vendor/project-beta.git', 'type' => 'vcs', - 'reference' => '1.2.3.1' - ] + 'reference' => '1.2.3.1', + ], ], 'gamma1' => [ 'name' => 'vendor/project-gamma', @@ -815,8 +815,8 @@ public function dataFilterRepos(): array 'source' => [ 'url' => 'git@github.com:vendor/project-gamma.git', 'type' => 'vcs', - 'reference' => '1.2.3.1' - ] + 'reference' => '1.2.3.1', + ], ], ]; @@ -826,19 +826,19 @@ public function dataFilterRepos(): array 'package' => [ $packages['alpha1'], $packages['alpha2'], - ] + ], ], 'beta_packages' => [ 'type' => 'package', 'package' => [ $packages['beta1'], - ] + ], ], 'gamma_packages' => [ 'type' => 'package', 'package' => [ $packages['gamma1'], - ] + ], ], ]; @@ -868,7 +868,7 @@ public function dataFilterRepos(): array ], ['git@github.com:vendor/project-beta.git'], ]; - + $data['Filter by two repositories'] = [ [ $packages['alpha1'], @@ -890,11 +890,9 @@ public function dataFilterRepos(): array * @param string[] $expected * @param array $config * @param string[]|null $filterRepos - * @param string[]|null $filterPackages */ public function testFilterRepos(array $expected, array $config, array $filterRepos = null): void { - unset(Config::$defaultRepositories['packagist'], Config::$defaultRepositories['packagist.org']); $composer = (new Factory())->createComposer(new NullIO(), $config, true, null, false);