psalm/cs fixes

Author: FBGER\dwinter

.psalm/baseline.xml

@@ -4,17 +4,6 @@
     <InvalidScalarArgument>
       <code>$limit</code>
     </InvalidScalarArgument>
-    <MixedAssignment>
-      <code>$bar</code>
-    </MixedAssignment>
-    <MixedMethodCall>
-      <code>advance</code>
-      <code>finish</code>
-      <code>setRedrawFrequency</code>
-    </MixedMethodCall>
-    <UndefinedClass>
-      <code>ProgressBar</code>
-    </UndefinedClass>
   </file>
   <file src="src/Console/ImportCommandHelpRenderer.php">
     <MixedAssignment>
@@ -29,14 +18,6 @@
       <code>createTable</code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="src/Console/ImportCommandResultRenderer.php">
-    <MixedAssignment>
-      <code>$count</code>
-    </MixedAssignment>
-    <MixedOperand>
-      <code>$count</code>
-    </MixedOperand>
-  </file>
   <file src="src/DependencyInjection/Configuration.php">
     <PossiblyNullReference>
       <code>scalarNode</code>
@@ -52,9 +33,6 @@
     <MixedAssignment>
       <code>$value</code>
     </MixedAssignment>
-    <ReservedWord>
-      <code>$loader-&gt;load('services.yaml')</code>
-    </ReservedWord>
   </file>
   <file src="src/EntityImporter.php">
     <MixedArgumentTypeCoercion>

src/Console/Command/ImportCommand.php

@@ -12,6 +12,8 @@
 use Fastbolt\EntityImporter\Console\ImportCommandResultRenderer;
 use Fastbolt\EntityImporter\EntityImporterManager;
 use Fastbolt\EntityImporter\Exceptions\ImporterDefinitionNotFoundException;
+use Fastbolt\EntityImporter\Exceptions\InvalidInputFormatException;
+use Fastbolt\EntityImporter\Exceptions\SourceUnavailableException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputArgument;
@@ -24,33 +26,16 @@
 class ImportCommand extends Command
 {
     /**
-     * @var EntityImporterManager
-     */
-    private EntityImporterManager $entityImporterManager;
-
-    /**
-     * @var ImportCommandHelpRenderer
-     */
-    private ImportCommandHelpRenderer $helpRenderer;
-
-    /**
-     * @var ImportCommandResultRenderer
-     */
-    private ImportCommandResultRenderer $resultRenderer;
-
-    /**
-     * @param EntityImporterManager $entityImporterManager
+     * @param EntityImporterManager       $entityImporterManager
+     * @param ImportCommandHelpRenderer   $helpRenderer
+     * @param ImportCommandResultRenderer $resultRenderer
      */
     public function __construct(
-        EntityImporterManager $entityImporterManager,
-        ImportCommandHelpRenderer $helpRenderer,
-        ImportCommandResultRenderer $resultRenderer
+        private readonly EntityImporterManager $entityImporterManager,
+        private readonly ImportCommandHelpRenderer $helpRenderer,
+        private readonly ImportCommandResultRenderer $resultRenderer
     ) {
         parent::__construct();
-
-        $this->entityImporterManager = $entityImporterManager;
-        $this->helpRenderer          = $helpRenderer;
-        $this->resultRenderer        = $resultRenderer;
     }
 
     /**
@@ -69,6 +54,8 @@ protected function configure(): void
      * @param OutputInterface $output
      *
      * @return int
+     * @throws InvalidInputFormatException
+     * @throws SourceUnavailableException
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {

src/Reader/Factory/ApiReaderFactory.php

@@ -24,7 +24,7 @@ class ApiReaderFactory implements ReaderFactoryInterface
      */
     public function __construct(?callable $clientFactory = null)
     {
-        if (!$clientFactory) {
+        if ($clientFactory === null) {
             $clientFactory = static function (): Client {
                 return new Client(['verify' => false]);
             };

src/Reader/XlsxReader.php

@@ -70,6 +70,11 @@ public function __construct(SplFileObject $file, array $columnHeaders, ?int $hea
         $this->setColumnHeaders($columnHeaders);
     }
 
+    /**
+     * @param array $columnHeaders
+     *
+     * @return void
+     */
     public function setColumnHeaders(array $columnHeaders): void
     {
         $this->columnHeaders = $columnHeaders;
@@ -99,46 +104,75 @@ public function getErrors(): array
         return $this->errors;
     }
 
-    public function current()
+    /**
+     * @return mixed
+     */
+    public function current(): mixed
     {
+        /** @var array $row */
         $row = $this->worksheet[$this->pointer];
 
         // If the spreadsheet file has column headers, use them to construct an associative
         // array for the columns in this line
         if (!empty($this->columnHeaders) && count($this->columnHeaders) === count($row)) {
-            return array_combine(array_values($this->columnHeaders), $row);
+            /** @var array<int, array-key> $headers */
+            $headers = array_values($this->columnHeaders);
+            return array_combine($headers, $row);
         }
 
         // Else just return the column values
         return $row;
     }
 
+    /**
+     * @param int $rowNumber
+     *
+     * @return void
+     */
     public function setHeaderRowNumber(int $rowNumber): void
     {
         $this->headerRowNumber = $rowNumber;
+        /**
+         * @psalm-suppress MixedAssignment
+         */
         $this->columnHeaders   = $this->worksheet[$rowNumber];
     }
 
+    /**
+     * @return array
+     */
     public function getColumnHeaders(): array
     {
         return $this->columnHeaders;
     }
 
+    /**
+     * @return void
+     */
     public function next(): void
     {
         $this->pointer++;
     }
 
-    public function key(): mixed
+    /**
+     * @return int
+     */
+    public function key(): int
     {
         return $this->pointer;
     }
 
+    /**
+     * @return bool
+     */
     public function valid(): bool
     {
         return isset($this->worksheet[$this->pointer]);
     }
 
+    /**
+     * @return void
+     */
     public function rewind(): void
     {
         if (null === $this->headerRowNumber) {