Merge branch 'fix-downstream-analysis-issues'

Author: lkrms

phpstan-baseline-7.4.neon

@@ -99,28 +99,28 @@ abstract class GenerateCommand extends Command
      * The parent of the generated class, or interfaces extended by the
      * generated interface
      *
-     * @var class-string[]
+     * @var string[]
      */
     protected array $Extends = [];
 
     /**
      * Interfaces implemented by the generated class
      *
-     * @var class-string[]
+     * @var string[]
      */
     protected array $Implements = [];
 
     /**
      * Traits used by the generated class
      *
-     * @var class-string[]
+     * @var string[]
      */
     protected array $Uses = [];
 
     /**
      * Modifiers applied to the generated class
      *
-     * @var class-string[]
+     * @var string[]
      */
     protected array $Modifiers = [];
 
@@ -486,11 +486,14 @@ function ($match) use (
      * Convert a built-in or user-defined type to a code-safe identifier, using
      * the same alias as the declaring class if possible
      *
+     * @template TReturnFqcn of bool
+     *
      * @param string $type Either a built-in type (e.g. `bool`) or a FQCN.
      * @param string|null $filename File where `$type` is declared (if
      * applicable).
-     * @param bool $returnFqcn If `false`, return `null` instead of `$type` if
-     * the alias has already been claimed.
+     * @param TReturnFqcn $returnFqcn If `false`, return `null` instead of
+     * `$type` if the alias has already been claimed.
+     * @return (TReturnFqcn is true ? string : string|null)
      */
     protected function getTypeAlias(string $type, ?string $filename = null, bool $returnFqcn = true): ?string
     {
@@ -516,10 +519,13 @@ protected function getTypeAlias(string $type, ?string $filename = null, bool $re
      * Otherwise, `use $fqcn[ as $alias];` will be queued for output and
      * `$alias` will be returned.
      *
+     * @template TReturnFqcn of bool
+     *
      * @param string|null $alias If `null`, the basename of `$fqcn` will be
      * used.
-     * @param bool $returnFqcn If `false`, return `null` instead of the FQCN if
-     * `$alias` has already been claimed.
+     * @param TReturnFqcn $returnFqcn If `false`, return `null` instead of the
+     * FQCN if `$alias` has already been claimed.
+     * @return (TReturnFqcn is true ? string : string|null)
      */
     protected function getFqcnAlias(string $fqcn, ?string $alias = null, bool $returnFqcn = true): ?string
     {
@@ -669,7 +675,7 @@ protected function generateImports(): array
     /**
      * Get an array that maps imports to aliases
      *
-     * @return array<class-string,string|null>
+     * @return array<class-string,string>
      */
     protected function getImportMap(bool $sort = true): array
     {

phpstan-baseline-8.3.neon

@@ -355,7 +355,7 @@ protected function run(string ...$args)
                     $summary = $_phpDoc ? $_phpDoc->unwrap($_phpDoc->Params[$_param->getName()]->Description ?? null) : null;
                 }
 
-                $type = ($type ?? '') !== '' ? "$type " : '';
+                $type = $type !== '' ? "$type " : '';
                 $methods[] = " * @method \$this $name($type\$value$default)"
                     . $this->getSummary(
                         $summary,  // Taken from property PHPDoc if set, otherwise constructor PHPDoc if set, otherwise `null`
@@ -515,7 +515,7 @@ protected function run(string ...$args)
                 }
                 $docBlocks[$name] = implode(\PHP_EOL, $lines);
             } else {
-                $type = ($type ?? '') !== '' ? "$type " : '';
+                $type = $type !== '' ? "$type " : '';
                 $methods[] = " * @method \$this $name($type\$value$default)"
                     . $this->getSummary(
                         $summary,  // Taken from constructor PHPDoc if set, otherwise property PHPDoc if set, otherwise `null`
@@ -725,8 +725,11 @@ protected function run(string ...$args)
             $docBlock[] = ' *';
             foreach ($this->InputClassTemplates as $template => $tag) {
                 $tag = clone $tag;
-                if (!Test::isPhpReservedWord($tag->Type) &&
-                        !array_key_exists($tag->Type, $this->InputClassTemplates)) {
+                if (
+                    $tag->Type !== null &&
+                    !Test::isPhpReservedWord($tag->Type) &&
+                    !array_key_exists($tag->Type, $this->InputClassTemplates)
+                ) {
                     $tag->Type = $this->getPhpDocTypeAlias(
                         $tag,
                         [],

src/Sli/Command/Generate/Concept/GenerateCommand.php

@@ -45,7 +45,7 @@ final class SendHttpRequest extends Command
     private function getMethod(): string
     {
         return $this->HttpMethod
-            ?? ($this->HttpMethod = Str::upper(Arr::last($this->nameParts())));
+            ??= Str::upper((string) Arr::last($this->nameParts()));
     }
 
     public function description(): string

src/Sli/Command/Generate/GenerateBuilder.php

@@ -311,7 +311,9 @@ public function run()
             // Print usage info if the last remaining $arg is "--help"
             if ($arg === '--help' && !$args) {
                 $usage = $this->getHelp($name, $node);
-                Console::stdout($usage);
+                if ($usage !== null) {
+                    Console::stdout($usage);
+                }
                 return $this;
             }
 
@@ -332,7 +334,9 @@ public function run()
                 !Pcre::match('/^[a-zA-Z][a-zA-Z0-9_-]*$/', $arg)
             ) {
                 $usage = $this->getUsage($name, $node);
-                Console::out($usage);
+                if ($usage !== null) {
+                    Console::out($usage);
+                }
                 $this->LastExitStatus =
                     $arg === null
                         ? 0
@@ -410,6 +414,7 @@ public function run()
             }
             if (
                 $node &&
+                $name !== null &&
                 ($usage = $this->getUsage($name, $node)) !== null
             ) {
                 Console::out("\n" . $usage);
@@ -483,8 +488,10 @@ private function generateHelp(string $name, $node, int $target, string ...$args)
         }
 
         $usage = $this->getHelp($name, $node, $style);
-        $usage = $formatter->formatTags($usage);
-        $usage = Str::eolToNative($usage);
-        printf('%s%s', str_replace('\ ', "\u{00A0}", $usage), \PHP_EOL);
+        if ($usage !== null) {
+            $usage = $formatter->formatTags($usage);
+            $usage = Str::eolToNative($usage);
+        }
+        printf('%s%s', str_replace('\ ', "\u{00A0}", (string) $usage), \PHP_EOL);
     }
 }

src/Sli/Command/Http/SendHttpRequest.php

@@ -491,7 +491,7 @@ final public function getHelp(?CliHelpStyle $style = null): array
         $synopsis = $this->getSynopsis($style);
 
         $description = $this->getLongDescription();
-        if ((string) $description !== '') {
+        if ($description !== null && $description !== '') {
             $description = $this->prepareHelp($style, $description);
         }
 

src/Toolkit/Cli/CliApplication.php

@@ -395,6 +395,7 @@ function (array $match) use (
             }
 
             if ($match['block'] !== null) {
+                /** @var array{fence:string,infostring:string,block:string} $match */
                 // Reinstate unwrapped newlines before blocks
                 if ($unwrap && $string !== '' && $string[-1] !== "\n") {
                     $string[-1] = "\n";
@@ -423,6 +424,7 @@ function (array $match) use (
             }
 
             if ($match['span'] !== null) {
+                /** @var array{backtickstring:string,span:string} $match */
                 $span = $match['span'];
                 // As per CommonMark:
                 // - Convert line endings to spaces

src/Toolkit/Cli/CliCommand.php

@@ -830,7 +830,7 @@ public function logProgress(
             return $this;
         }
 
-        if ((string) $msg2 === '') {
+        if ($msg2 === null || $msg2 === '') {
             $msg1 = rtrim($msg1, "\r") . "\r";
         } else {
             $msg2 = rtrim($msg2, "\r") . "\r";
@@ -931,6 +931,7 @@ public function groupEnd(bool $printMessage = false)
     {
         $msg = array_pop($this->State->GroupMessageStack);
         if ($printMessage &&
+                $msg !== null &&
                 $msg !== '' &&
                 ($msg = Formatter::removeTags($msg)) !== '') {
             $this->write(Level::NOTICE, '', $msg ? "{ $msg } complete" : null, MessageType::GROUP_END);
@@ -1128,7 +1129,7 @@ private function _write(
             }
 
             $_msg2 = null;
-            if ((string) $msg2 !== '') {
+            if ($msg2 !== null && $msg2 !== '') {
                 $_msg2 = $msg2HasTags ? $formatter->formatTags($msg2) : $msg2;
                 $_msg2 = strpos($msg2, "\n") !== false
                     ? str_replace("\n", "\n" . str_repeat(' ', $margin + $indent + 2), "\n" . ltrim($_msg2))

src/Toolkit/Console/ConsoleFormatter.php

@@ -50,7 +50,7 @@ public function __construct(string $before = '', string $after = '', array $repl
      */
     public function apply(?string $text, $attributes = null): string
     {
-        if ((string) $text === '') {
+        if ($text === null || $text === '') {
             return '';
         }