qa: resolve errors flagged by Psalm

Signed-off-by: Matthew Weier O'Phinney <matthew@weierophinney.net>
laminas · Sep 7, 2021 · 91c1055 · 91c1055
1 parent 69bba18
commit 91c1055
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/src/AbstractDependencyRewriter.php b/src/AbstractDependencyRewriter.php
@@ -81,10 +81,21 @@ public function onPreCommandRun(PreCommandRunEvent $event)
             return;
         }
 
+        /** @psalm-var null|array<array-key, string|numeric> $packages */
         $packages = $input->getArgument('packages');
+
+        // Ensure we have an array of strings
+        $packages = is_array($packages) ? $packages : [];
+        $packages = array_map(
+            function ($value) {
+                return (string) $value;
+            },
+            $packages
+        );
+
         $input->setArgument(
             'packages',
-            is_array($packages) ? array_map([$this, 'updatePackageArgument'], $packages) : []
+            array_map([$this, 'updatePackageArgument'], $packages)
         );
     }
 

diff --git a/src/DependencyRewriterPluginDelegator.php b/src/DependencyRewriterPluginDelegator.php
@@ -39,7 +39,7 @@ public function __construct(?RewriterInterface $rewriter = null)
     public static function getSubscribedEvents()
     {
         if (version_compare(PluginInterface::PLUGIN_API_VERSION, '2.0', 'lt')) {
-            /** @psalm-suppress UndefinedConstant */
+            /** @psalm-suppress UndefinedConstant,MixedArrayOffset */
             return [
                 InstallerEvents::PRE_DEPENDENCIES_SOLVING => ['onPreDependenciesSolving', 1000],
                 PackageEvents::PRE_PACKAGE_INSTALL        => ['onPrePackageInstallOrUpdate', 1000],

diff --git a/src/DependencyRewriterV1.php b/src/DependencyRewriterV1.php
@@ -42,7 +42,6 @@ public function onPreDependenciesSolving(InstallerEvent $event)
         $jobs = $request->getJobs();
 
         foreach ($jobs as $index => $job) {
-            /** @psalm-var array<string, string> $job */
             if (! isset($job['cmd']) || ! in_array($job['cmd'], ['install', 'update'], true)) {
                 continue;
             }

diff --git a/test/DependencyRewriterV2Test.php b/test/DependencyRewriterV2Test.php
@@ -1024,6 +1024,7 @@ public function testComposerOptionsArePassedToUpdateLockCommand(
     }
 
     /**
+     * @psalm-suppress MoreSpecificReturnType
      * @psalm-return iterable<non-empty-string,array{0:TComposerOptions,1:TComposerOptions}>
      */
     public function composerUpdateLockArguments(): iterable
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         /**
+         * @psalm-suppress MoreSpecificReturnType
          * @psalm-return iterable<non-empty-string,array{0:TComposerOptions,1:TComposerOptions}>
          */
         public function composerUpdateLockArguments(): iterable
@@ Expand Down @@