Fix few typing issues

Author: kylekatarnls

src/Phug/Split/Command/Analyze.php

@@ -66,7 +66,7 @@ protected function calculatePackagesTree(Split $cli): bool
             return $cli->error('Root project directory should contains a '.$this->composerFile.' file.');
         }
 
-        $data = (array) json_decode(file_get_contents($this->composerFile), true);
+        $data = (array) json_decode((string) file_get_contents($this->composerFile), true);
         $vendorDirectory = ($data['config'] ?? [])['vendor-dir'] ?? 'vendor';
 
         $cli->writeLine((string) $data['name']);
@@ -93,7 +93,7 @@ protected function getPackages(): iterable
 
     protected function dumpPackagesTree(Split $cli, iterable $packages, int $level = 0): bool
     {
-        $count = is_countable($packages) ? count($packages) : INF;
+        $count = is_countable($packages) ? count($packages) : 0;
 
         foreach ($packages as $index => $package) {
             $symbol = $index === $count - 1 ? '└' : '├';
@@ -106,7 +106,8 @@ protected function dumpPackagesTree(Split $cli, iterable $packages, int $level =
 
     protected function mapDirectories(string $directory, callable $callback): iterable
     {
-        foreach (scandir($directory) as $element) {
+        /** @psalm-suppress RiskyTruthyFalsyComparison */
+        foreach ((scandir($directory) ?: []) as $element) {
             if (substr($element, 0, 1) === '.') {
                 continue;
             }
@@ -141,7 +142,7 @@ protected function scanDirectories(string $directory): iterable
         $composerPath = $directory.DIRECTORY_SEPARATOR.$this->composerFile;
 
         if (file_exists($composerPath)) {
-            $data = json_decode(file_get_contents($composerPath), true);
+            $data = json_decode((string) file_get_contents($composerPath), true);
             $mainPackage = $this->getPackage($directory, $data);
         }
 

src/Phug/Split/Command/CommandBase.php

@@ -53,14 +53,15 @@ protected function gitEscape(string $value): string
      *
      * @return string
      *
-     * @psalm-suppress UndefinedThisPropertyFetch RiskyTruthyFalsyComparison
+     * @psalm-suppress UndefinedThisPropertyFetch
      */
     protected function getGitCommand(string $command, array $options = [], ?string $redirect = null): string
     {
         foreach ($options as $name => $value) {
             $command .= ' --'.$name.'='.$this->gitEscape($value);
         }
 
+        /** @psalm-suppress RiskyTruthyFalsyComparison */
         return $this->gitProgram.' '.$command.($redirect ? ' '.$redirect : '');
     }
 
@@ -71,13 +72,13 @@ protected function getGitCommand(string $command, array $options = [], ?string $
      * @param array       $options  CLI git command options
      * @param string|null $redirect redirection suffix (like '2>&1')
      *
-     * @return string|null
+     * @return string
      */
-    protected function git(string $command, array $options = [], ?string $redirect = null): ?string
+    protected function git(string $command, array $options = [], ?string $redirect = null): string
     {
         $command = $this->getGitCommand($command, $options, $redirect);
 
-        return shell_exec($command);
+        return (string) shell_exec($command);
     }
 
     /**
@@ -117,6 +118,7 @@ protected function last(string $directory = ''): Commit
      * @throws Exception
      *
      * @return string|null
+     * @psalm-return truthy-string|null
      *
      * @psalm-suppress UndefinedThisPropertyFetch
      */

src/Phug/Split/Command/Copy.php

@@ -65,7 +65,8 @@ public function run(SimpleCli $cli): bool
             return $cli->error('Last commit must be linked to a mono-repository commit.');
         }
 
-        $destination = realpath($this->destination);
+        /** @psalm-var truthy-string|false $destination */
+        $destination = @realpath($this->destination);
 
         if (!$destination) {
             return $cli->error('Destination directory "'.$this->destination.'" does not seem to exist.');

src/Phug/Split/Command/Dist.php

@@ -72,20 +72,23 @@ protected function distribute(Split $cli): bool
         $this->remove($this->output);
         $cli->chdir($this->directory);
         @mkdir($this->output, 0777, true);
-        $this->output = @realpath($this->output);
+        /** @psalm-var truthy-string|false $output */
+        $output = @realpath($this->output);
 
-        if (!$this->output) {
+        if (!$output) {
             return $cli->error('Unable to create output directory.');
         }
 
-        if (!preg_match('/^\* (.+)$/m', (string) $this->git('branch', [], '2>&1') ?: '', $branch)) {
+        $this->output = $output;
+
+        if (!preg_match('/^\* (.+)$/m', $this->git('branch', [], '2>&1') ?: '', $branch)) {
             return $cli->error('You must be on a branch in a git repository to run this command.');
         }
 
         $branch = $branch[1];
 
         if (substr($branch, 0, 18) === '(HEAD detached at ') {
-            $branch = trim(explode("\n", (string) $this->git('describe --contains --all HEAD', [], '2>&1') ?: '')[0]);
+            $branch = trim(explode("\n", $this->git('describe --contains --all HEAD', [], '2>&1') ?: '')[0]);
         }
 
         foreach ($this->getPackages() as $package) {
@@ -103,7 +106,7 @@ protected function distributePackage(Split $cli, array $package, string $branch)
 
         $name = (string) $package['name'];
 
-        $data = (array) json_decode(file_get_contents(strtr($this->api, ['%s' => $name])), true);
+        $data = (array) json_decode((string) file_get_contents(strtr($this->api, ['%s' => $name])), true);
         $config = $data['packages'][$name] ?? [];
         $config = $config['dev-master'] ?? next($config);
 

src/Phug/Split/Command/Update.php

@@ -45,8 +45,8 @@ class Update extends Dist
     protected function getPackage(string $directory, array $data): array
     {
         return [
-            'name' => $data['name'],
-            'directory' => realpath($directory),
+            'name' => (string) $data['name'],
+            'directory' => (string) realpath($directory),
             'children' => [],
         ];
     }
@@ -184,7 +184,7 @@ protected function cherryPickCommit(
 
         if (!$this->noPush) {
             $name = $package['name'];
-            $push = (string) $this->git("push origin $branch", [], '2>&1');
+            $push = $this->git("push origin $branch", [], '2>&1');
             $cli->writeLine("Pushing $name\n".$push, strpos($push, 'error:') === false ? 'light_cyan' : 'red');
         }
 
@@ -215,7 +215,7 @@ protected function distributePackage(Split $cli, array $package, string $branch)
         }
 
         $hash = $this->getCurrentLinkedCommitHash();
-        $distributionDirectory = getcwd();
+        $distributionDirectory = (string) getcwd();
         $sourceDirectory = $package['directory'];
 
         $cli->chdir($sourceDirectory);

src/Phug/Split/Git/Commit.php

@@ -126,6 +126,9 @@ public function getMessage(): string
      * @param non-empty-string $regExp
      *
      * @return string|null
+     * @psalm-return truthy-string|null
+     *
+     * @psalm-suppress LessSpecificReturnStatement, MoreSpecificReturnType
      */
     public function findInMessage(string $regExp): ?string
     {