Fix #4349 - improve types for suggested unions

src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeAnalyzer.php

@@ -305,7 +305,7 @@ class ReturnTypeAnalyzer
 
                     if (IssueBuffer::accepts(
                         new MissingClosureReturnType(
-                            'Closure does not have a return type, expecting ' . $inferred_return_type,
+                            'Closure does not have a return type, expecting ' . $inferred_return_type->getId(),
                             new CodeLocation($function_like_analyzer, $function, null, true)
                         ),
                         $suppressed_issues,
@@ -345,7 +345,7 @@ class ReturnTypeAnalyzer
             if (IssueBuffer::accepts(
                 new MissingReturnType(
                     'Method ' . $cased_method_id . ' does not have a return type' .
-                      (!$inferred_return_type->hasMixed() ? ', expecting ' . $inferred_return_type : ''),
+                      (!$inferred_return_type->hasMixed() ? ', expecting ' . $inferred_return_type->getId() : ''),
                     new CodeLocation($function_like_analyzer, $function->name, null, true)
                 ),
                 $suppressed_issues,

src/Psalm/Type/Atomic/TLiteralInt.php

@@ -44,6 +44,6 @@ class TLiteralInt extends TInt
         ?string $this_class,
         bool $use_phpdoc_format
     ): string {
-        return 'int';
+        return $use_phpdoc_format ? 'int' : $this->value;
     }
 }

src/Psalm/Type/Atomic/TPositiveInt.php

@@ -8,6 +8,11 @@ class TPositiveInt extends TInt
         return 'positive-int';
     }
 
+    public function __toString(): string
+    {
+        return 'positive-int';
+    }
+
     /**
      * @return false
      */
@@ -15,4 +20,17 @@ class TPositiveInt extends TInt
     {
         return false;
     }
+
+    /**
+     * @param  array<string> $aliased_classes
+     *
+     */
+    public function toNamespacedString(
+        ?string $namespace,
+        array $aliased_classes,
+        ?string $this_class,
+        bool $use_phpdoc_format
+    ): string {
+        return 'positive-int';
+    }
 }

src/Psalm/Type/Union.php

@@ -402,40 +402,28 @@ class Union implements TypeNode
         ?string $this_class,
         bool $use_phpdoc_format
     ): string {
-        $printed_int = false;
-        $printed_float = false;
-        $printed_string = false;
-
         $types = [];
 
+        $multi_ints = count($this->literal_int_types) > 1;
+        $multi_strings = count($this->literal_string_types) > 1;
+        $multi_floats = count($this->literal_float_types) > 1;
+
         foreach ($this->types as $type) {
             $type_string = $type->toNamespacedString($namespace, $aliased_classes, $this_class, $use_phpdoc_format);
 
-            if ($type instanceof TLiteralFloat && $type_string === 'float') {
+            if ($type instanceof TLiteralInt && !$multi_ints) {
-                if ($printed_float) {
+                $type_string = 'int';
-                    continue;
+            } elseif ($type instanceof TLiteralFloat && !$multi_floats) {
-                }
+                $type_string = 'float';
-
+            } elseif ($type instanceof TLiteralString && !$multi_strings) {
-                $printed_float = true;
+                $type_string = 'string';
-            } elseif ($type instanceof TLiteralString && $type_string === 'string') {
-                if ($printed_string) {
-                    continue;
-                }
-
-                $printed_string = true;
-            } elseif ($type instanceof TLiteralInt && $type_string === 'int') {
-                if ($printed_int) {
-                    continue;
-                }
-
-                $printed_int = true;
             }
 
             $types[] = $type_string;
         }
 
         sort($types);
-        return implode('|', $types);
+        return implode('|', array_unique($types));
     }
 
     /**

tests/BinaryOperationTest.php

@@ -174,9 +174,9 @@ class BinaryOperationTest extends TestCase
                 'assertions' => [
                     '$a' => 'int',
                     '$b' => 'int',
-                    '$c' => 'int',
+                    '$c' => 'positive-int',
-                    '$d' => 'int',
+                    '$d' => 'positive-int',
-                    '$e' => 'int',
+                    '$e' => 'positive-int',
                     '$f' => 'string',
                 ],
             ],
@@ -187,8 +187,8 @@ class BinaryOperationTest extends TestCase
                     $c = (true xor false);
                     $d = (false xor false);',
                 'assertions' => [
-                    '$a' => 'int',
+                    '$a' => 'positive-int',
-                    '$b' => 'int',
+                    '$b' => 'positive-int',
                     '$c' => 'bool',
                     '$d' => 'bool',
                 ],
@@ -220,7 +220,7 @@ class BinaryOperationTest extends TestCase
                     $b = 4 ^ 5;',
                 'assertions' => [
                     '$a' => 'string',
-                    '$b' => 'int',
+                    '$b' => 'positive-int',
                 ],
             ],
             'bitwiseNot' => [

tests/JsonOutputTest.php

@@ -98,7 +98,7 @@ class JsonOutputTest extends TestCase
                     function fooFoo() {
                         return "hello";
                     }',
-                'message' => 'Method fooFoo does not have a return type, expecting string',
+                'message' => 'Method fooFoo does not have a return type, expecting string(hello)',
                 'line' => 2,
                 'error' => 'fooFoo',
             ],

tests/Php56Test.php

@@ -49,8 +49,8 @@ class Php56Test extends TestCase
                     $c4 = (new C)->four;',
                 'assertions' => [
                     '$c1' => 'int',
-                    '$c2' => 'int',
+                    '$c2' => 'positive-int',
-                    '$c3' => 'int',
+                    '$c3' => 'positive-int',
                     '$c1_3rd' => 'float|int',
                     '$c_sentence' => 'string',
                     '$cf' => 'int',

tests/TypeReconciliation/TypeTest.php

@@ -863,7 +863,7 @@ class TypeTest extends \Psalm\Tests\TestCase
                     $a = 0;
                     $b = $a++;',
                 'assertions' => [
-                    '$a' => 'int',
+                    '$a' => 'positive-int',
                 ],
             ],
             'typedValueAssertion' => [