chore: fix psalm issues

Author: roxblnfk

psalm-baseline.xml

@@ -37,20 +37,26 @@
     <MoreSpecificReturnType>
       <code><![CDATA[list<DownloadConfig>]]></code>
     </MoreSpecificReturnType>
-    <PropertyNotSetInConstructor>
-      <code><![CDATA[Get]]></code>
-      <code><![CDATA[Get]]></code>
-    </PropertyNotSetInConstructor>
   </file>
   <file src="src/Command/ListSoftware.php">
-    <PropertyNotSetInConstructor>
-      <code><![CDATA[ListSoftware]]></code>
-      <code><![CDATA[ListSoftware]]></code>
-    </PropertyNotSetInConstructor>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$software->homepage]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
+  <file src="src/Command/Show.php">
+    <InvalidArrayOffset>
+      <code><![CDATA[$units[$i]]]></code>
+    </InvalidArrayOffset>
+    <InvalidOperand>
+      <code><![CDATA[$bytes /= 1024]]></code>
+    </InvalidOperand>
+    <MixedArgument>
+      <code><![CDATA[$units[$i]]]></code>
+    </MixedArgument>
+    <PossiblyFalseArgument>
+      <code><![CDATA[$destinationPath]]></code>
+    </PossiblyFalseArgument>
+  </file>
   <file src="src/DLoad.php">
     <ArgumentTypeCoercion>
       <code><![CDATA[$files]]></code>
@@ -101,6 +107,22 @@
       <code><![CDATA[ZipPharArchive]]></code>
     </PropertyNotSetInConstructor>
   </file>
+  <file src="src/Module/Binary/Internal/BinaryExecutor.php">
+    <MixedArgumentTypeCoercion>
+      <code><![CDATA[$output]]></code>
+      <code><![CDATA[$output]]></code>
+    </MixedArgumentTypeCoercion>
+  </file>
+  <file src="src/Module/Binary/Internal/VersionComparator.php">
+    <PossiblyNullArgument>
+      <code><![CDATA[$versionOnly]]></code>
+      <code><![CDATA[\preg_replace('/[-+].*$/', '', $constraint)]]></code>
+    </PossiblyNullArgument>
+    <RedundantCondition>
+      <code><![CDATA[!$hasPreB]]></code>
+      <code><![CDATA[$bIsNum]]></code>
+    </RedundantCondition>
+  </file>
   <file src="src/Module/Common/Config/Action/Download.php">
     <MissingConstructor>
       <code><![CDATA[$software]]></code>

psalm.xml

@@ -12,6 +12,11 @@
         <RedundantConditionGivenDocblockType errorLevel="suppress"/>
         <RedundantCastGivenDocblockType errorLevel="suppress"/>
         <MissingOverrideAttribute errorLevel="suppress"/>
+        <PropertyNotSetInConstructor>
+            <errorLevel type="suppress">
+                <directory name="src/Command"/>
+            </errorLevel>
+        </PropertyNotSetInConstructor>
     </issueHandlers>
     <projectFiles>
         <directory name="src"/>

src/Command/Show.php

@@ -7,6 +7,7 @@
 use Internal\DLoad\Module\Binary\Binary;
 use Internal\DLoad\Module\Binary\BinaryProvider;
 use Internal\DLoad\Module\Common\Config\Actions;
+use Internal\DLoad\Module\Common\FileSystem\Path;
 use Internal\DLoad\Module\Downloader\SoftwareCollection;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -47,7 +48,7 @@ protected function execute(
         // Get all software from collection
         $collection = $this->container->get(SoftwareCollection::class);
         $binaryProvider = $this->container->get(BinaryProvider::class);
-        $softwareName = $input->getArgument('software');
+        $softwareName = (string) $input->getArgument('software');
 
         // Get configuration if available
         $configFile = $this->getConfigFile($input);
@@ -57,7 +58,7 @@ protected function execute(
             $actions = $this->container->get(Actions::class);
         }
 
-        if ($softwareName !== null) {
+        if ($softwareName !== '') {
             return $this->showSoftwareDetails($softwareName, $collection, $binaryProvider, $actions, $output);
         }
 
@@ -71,8 +72,8 @@ private function listAllSoftware(
         InputInterface $input,
         OutputInterface $output,
     ): int {
-        $showAll = $input->getOption('all');
-        $destinationPath = \getcwd();
+        $showAll = (bool) $input->getOption('all');
+        $destinationPath = Path::create((string) \getcwd());
 
         $configSoftwareIds = [];
         if ($actions !== null) {
@@ -197,6 +198,9 @@ private function listAllSoftware(
         return Command::SUCCESS;
     }
 
+    /**
+     * @param non-empty-string $softwareName
+     */
     private function showSoftwareDetails(
         string $softwareName,
         SoftwareCollection $collection,
@@ -242,7 +246,7 @@ private function showSoftwareDetails(
             ->writeln(\sprintf('<info>Alias:</info> %s', $software->alias));
         $software->description and $output
             ->writeln(\sprintf('<info>Description:</info> %s', $software->description));
-        $software->homepage and $output
+        $software->homepage === null or $output
             ->writeln(\sprintf('<info>Homepage:</info> %s', $software->homepage));
 
         // Show project config information
@@ -292,9 +296,10 @@ private function displayBinaryDetails(?Binary $binary, OutputInterface $output):
         $output->writeln(\sprintf('  <info>Version:</info> %s', $binary->getVersion() ?? 'unknown'));
         $output->writeln(\sprintf('  <info>Size:</info> %s', $this->formatSize($binary->getSize())));
 
-        $output->writeln(\sprintf(
+        $mtime = $binary->getMTime();
+        $mtime === null or $output->writeln(\sprintf(
             '  <info>Last modified:</info> %s',
-            $binary->getMTime()->format('Y-m-d H:i:s'),
+            $mtime->format('Y-m-d H:i:s'),
         ));
     }
 

src/Module/Binary/BinaryProvider.php

@@ -5,6 +5,7 @@
 namespace Internal\DLoad\Module\Binary;
 
 use Internal\DLoad\Module\Common\Config\Embed\Binary as BinaryConfig;
+use Internal\DLoad\Module\Common\FileSystem\Path;
 
 /**
  * Provider for obtaining binary instances.
@@ -14,9 +15,9 @@ interface BinaryProvider
     /**
      * Gets a binary for the given configuration.
      *
-     * @param non-empty-string $destinationPath Directory path where binary should exist
+     * @param Path|non-empty-string $destinationPath Directory path where binary should exist
      * @param BinaryConfig $config Binary configuration
      * @return Binary|null Binary instance or null if it doesn't exist
      */
-    public function getBinary(string $destinationPath, BinaryConfig $config): ?Binary;
+    public function getBinary(Path|string $destinationPath, BinaryConfig $config): ?Binary;
 }