Get psalm passing

Author: cooperaj

src/Command/ChangePathPrefix.php

@@ -87,15 +87,24 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $fixer = new PathFixer(
-            $input->getArgument('original_prefix'),
-            $input->getArgument('replacement_prefix')
-        );
+        $directory = $input->getArgument('directory_to_search');
+        $originalPrefix = $input->getArgument('original_prefix');
+        $replacementPrefix = $input->getArgument('replacement_prefix');
+
+        /** @var bool $asClover */
+        $asClover = $input->getOption('clover');
+
+        if (!is_string($directory) || !is_string($originalPrefix) || !is_string($replacementPrefix)) {
+            throw new \InvalidArgumentException('Argument(s) not specified as string');
+        }
+
+        $fixer = new PathFixer($originalPrefix, $replacementPrefix);
 
         try {
-            $files = $this->finder->findCoverage($input->getArgument('directory_to_search'));
+            $files = $this->finder->findCoverage($directory);
             $output->writeln(sprintf('%d .cov files found', count($files)));
 
+            /** @var array<string, CodeCoverage> $files */
             $files = $this->iterateCoverageFiles(
                 $files,
                 $fixer
@@ -104,10 +113,14 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $this->writer->setFiles($files);
 
             if ($path = $input->getOption('merge')) {
+                if (!is_string($path)) {
+                    throw new \InvalidArgumentException('Path to merged file must be provided as a string');
+                }
+
                 $this->writer->merge($path);
             }
 
-            $this->writer->write($input->getOption('clover'));
+            $this->writer->write($asClover);
         } catch (\Exception $ex) {
             $output->writeln($ex->getMessage());
             return 1;
@@ -116,13 +129,21 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
+    /**
+     * @param string[] $files
+     * @param PathFixer $fixer
+     * @return CodeCoverage[]
+     */
     protected function iterateCoverageFiles(array $files, PathFixer $fixer): array
     {
-        return array_map(function(array $file) use ($fixer) {
-            $coverage = $this->loader->loadCoverage($file[0]);
+        return array_map(function(string $file) use ($fixer) {
+            $coverage = $this->loader->loadCoverage($file);
+
+            $data = $coverage->getData();
+            $data = $fixer->fix($data);
 
-            $data = $fixer->fix($coverage->getData());
-            $whiteList = $fixer->fix( $coverage->filter()->getWhitelistedFiles());
+            $whiteList = $coverage->filter()->getWhitelistedFiles();
+            $whiteList = $fixer->fix($whiteList);
 
             $filter = new Filter();
             $filter->setWhitelistedFiles($whiteList);

src/Service/CoverageLoader.php

@@ -15,6 +15,10 @@ class CoverageLoader
      */
     public function loadCoverage(string $file): CodeCoverage
     {
+        /**
+         * @psalm-suppress MixedAssignment
+         * @psalm-suppress UnresolvableInclude
+         */
         $coverage = include $file;
 
         if (!($coverage instanceof CodeCoverage)) {

src/Service/FileFinder.php

@@ -11,6 +11,10 @@
 
 class FileFinder
 {
+    /**
+     * @param string $directory
+     * @return string[]
+     */
     public function findCoverage(string $directory): array
     {
         $path = realpath($directory);
@@ -19,6 +23,7 @@ public function findCoverage(string $directory): array
         $iterator = new RecursiveIteratorIterator($directory);
         $filtered = new RegexIterator($iterator, '/^.+\.cov$/i', RecursiveRegexIterator::GET_MATCH);
 
-        return iterator_to_array($filtered);
+        /** @var string[] */
+        return array_keys(iterator_to_array($filtered));
     }
 }

src/Service/FileWriter.php

@@ -11,14 +11,14 @@
 class FileWriter
 {
     /**
-     * @var CodeCoverage[]
+     * @var array<string, CodeCoverage>
      */
     private $files;
 
     /**
      * FileWriter constructor.
      *
-     * @param CodeCoverage[] $files
+     * @param array<string, CodeCoverage> $files
      */
     public function __construct(array $files = [])
     {
@@ -40,7 +40,7 @@ public function addFile(string $path, CodeCoverage $coverage): FileWriter
     }
 
     /**
-     * @return CodeCoverage[]
+     * @return array<string, CodeCoverage>
      */
     public function getFiles(): array
     {
@@ -69,7 +69,7 @@ public function merge(string $path): FileWriter
     /**
      * Fluent method that allows the replacement of the list of files to write
      *
-     * @param CodeCoverage[] $files
+     * @param array<string, CodeCoverage> $files
      * @return FileWriter
      */
     public function setFiles(array $files): FileWriter
@@ -88,6 +88,7 @@ public function setFiles(array $files): FileWriter
      */
     public function write(bool $asClover = false): void
     {
+        /** @psalm-suppress MixedPropertyTypeCoercion */
         array_walk($this->files, function(CodeCoverage $coverage, string $path) use ($asClover) {
             if ($asClover) {
                 $filename = basename($path, '.cov');

src/Service/PathFixer.php

@@ -37,9 +37,17 @@ public function fix(array $data): array
         $originalPrefix = $this->originalPrefix;
         $replacementPrefix = $this->replacementPrefix;
 
-        return array_combine(array_map(function(string $el) use ($originalPrefix, $replacementPrefix) {
+        /** @var string[] $keys */
+        $keys = array_keys($data);
+
+        /** @var string[] $keys */
+        $keys = array_map(function(string $el) use ($originalPrefix, $replacementPrefix) {
             $el = preg_replace('#^' . $originalPrefix . '#', $replacementPrefix, $el);
             return $el;
-        }, array_keys($data)), array_values($data));
+        }, $keys);
+
+        $fixed = array_combine($keys, array_values($data));
+
+        return ($fixed !== false) ? $fixed : [];
     }
 }