Remove unnecessary code in PackagesListBuilder + Refactor tests (#157)

.github/workflows/build.yml

@@ -10,6 +10,7 @@ on:
       - 'psalm.xml'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'docs/**'
       - 'README.md'

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 1.5.0 under development
 
 - New #155: Add ability to specify recursion depth for recursive modifier (@vjik)
+- Enh #157: Remove unnecessary code in `PackagesListBuilder` (@vjik)
 
 ## 1.4.0 November 17, 2023
 

src/Composer/EventHandler.php

@@ -34,13 +34,19 @@ public static function getSubscribedEvents(): array
         ];
     }
 
+    /**
+     * @codeCoverageIgnore This method runs via eval and does not get into coverage.
+     */
     public function onCommand(CommandEvent $event): void
     {
         if ($event->getCommandName() === 'dump-autoload') {
             $this->runOnAutoloadDump = true;
         }
     }
 
+    /**
+     * @codeCoverageIgnore This method runs via eval and does not get into coverage.
+     */
     public function onPostAutoloadDump(Event $event): void
     {
         if ($this->runOnAutoloadDump) {

src/Composer/PackagesListBuilder.php

@@ -5,7 +5,7 @@
 namespace Yiisoft\Config\Composer;
 
 use Composer\Composer;
-use Composer\Package\CompletePackage;
+use Composer\Package\BasePackage;
 use Composer\Package\PackageInterface;
 
 use function array_key_exists;
@@ -24,7 +24,7 @@ public function __construct(
     /**
      * Builds and returns packages.
      *
-     * @return array<string, CompletePackage>
+     * @return array<string, BasePackage>
      */
     public function build(): array
     {
@@ -68,7 +68,7 @@ private function getSortedPackageNames(array $packageDepths): array
     }
 
     /**
-     * @param array<string, CompletePackage> $allPackages
+     * @param array<string, BasePackage> $allPackages
      * @param array<string, int> $packageDepths
      */
     private function calculatePackageDepths(
@@ -105,7 +105,7 @@ private function calculatePackageDepths(
     }
 
     /**
-     * @return array<string, CompletePackage>
+     * @return array<string, BasePackage>
      */
     private function getAllPackages(): array
     {
@@ -116,10 +116,6 @@ private function getAllPackages(): array
 
         $result = [];
         foreach ($packages as $package) {
-            if (!$package instanceof CompletePackage) {
-                continue;
-            }
-
             if (!in_array($package->getType(), $this->packageTypes)) {
                 continue;
             }

src/Composer/ProcessHelper.php

@@ -6,7 +6,7 @@
 
 use Composer\Composer;
 use Composer\Factory;
-use Composer\Package\CompletePackage;
+use Composer\Package\BasePackage;
 use Composer\Package\PackageInterface;
 use Yiisoft\Config\ConfigPaths;
 use Yiisoft\Config\Options;
@@ -28,7 +28,7 @@ final class ProcessHelper
     private array $rootPackageExtra;
 
     /**
-     * @psalm-var array<string, CompletePackage>
+     * @psalm-var array<string, BasePackage>
      */
     private array $packages;
 
@@ -65,7 +65,7 @@ public function __construct(Composer $composer)
     /**
      * Returns all vendor packages.
      *
-     * @psalm-return array<string, CompletePackage>
+     * @psalm-return array<string, BasePackage>
      */
     public function getPackages(): array
     {
@@ -75,7 +75,7 @@ public function getPackages(): array
     /**
      * Returns vendor packages without packages from the vendor override sublayer.
      *
-     * @psalm-return array<string, CompletePackage>
+     * @psalm-return array<string, BasePackage>
      */
     public function getVendorPackages(): array
     {
@@ -93,7 +93,7 @@ public function getVendorPackages(): array
     /**
      * Returns vendor packages only from the vendor override sublayer.
      *
-     * @psalm-return array<string, CompletePackage>
+     * @psalm-return array<string, BasePackage>
      */
     public function getVendorOverridePackages(): array
     {