Revert & fix

Author: danog

src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArrayFunctionArgumentsAnalyzer.php

@@ -355,6 +355,9 @@ public static function handleSplice(
         if (($array_arg_type = $statements_analyzer->node_data->getType($array_arg))
             && $array_arg_type->hasArray()
         ) {
+            /**
+             * @var TArray|TKeyedArray
+             */
             $array_type = $array_arg_type->getArray();
             if ($generic_array_type = ArrayType::infer($array_type)) {
                 $array_size = $generic_array_type->count;

src/Psalm/Internal/Type/ArrayType.php

@@ -23,10 +23,8 @@ public function __construct(public Union $key, public Union $value, public bool
 
     /**
      * @return (
-     *     $type is TKeyedArray ? self : (
-     *         $type is TNonEmptyArray ? self : (
-     *             $type is TArray ? self : null
-     *         )
+     *     $type is TArrayKey ? self : (
+     *         $type is TArray ? self : null
      *     )
      * )
      */

src/Psalm/Internal/Type/TemplateInferredTypeReplacer.php

@@ -455,12 +455,6 @@ private static function replaceConditional(
                     null,
                     false,
                     false,
-                ) && null === Type::intersectUnionTypes(
-                    new Union([$candidate_atomic_type]),
-                    $conditional_type,
-                    $codebase,
-                    false,
-                    false,
                 )) {
                     $matching_else_types[] = $candidate_atomic_type;
                 }

src/Psalm/Type.php

@@ -803,26 +803,8 @@ public static function intersectUnionTypes(
 
             //if a type is contained by the other, the intersection is the narrowest type
             if (!$intersection_performed) {
-                $type_1_in_2 = UnionTypeComparator::isContainedBy(
-                    $codebase,
-                    $type_1,
-                    $type_2,
-                    false,
-                    false,
-                    null,
-                    $allow_interface_equality,
-                    $allow_float_int_equality,
-                );
-                $type_2_in_1 = UnionTypeComparator::isContainedBy(
-                    $codebase,
-                    $type_2,
-                    $type_1,
-                    false,
-                    false,
-                    null,
-                    $allow_interface_equality,
-                    $allow_float_int_equality,
-                );
+                $type_1_in_2 = UnionTypeComparator::isContainedBy($codebase, $type_1, $type_2);
+                $type_2_in_1 = UnionTypeComparator::isContainedBy($codebase, $type_2, $type_1);
                 if ($type_1_in_2) {
                     $intersection_performed = true;
                     $combined_type = $type_1->getBuilder();

tests/Template/ConditionalReturnTypeTest.php

@@ -1043,7 +1043,7 @@ function getSomething(string $string)
                 'code' => '<?php
                     /**
                      * @param string|int $stringOrInt
-                     * @psalm-return ($string is non-empty-string|int ? string : int)
+                     * @psalm-return ($stringOrInt is (non-empty-string|int) ? string : int)
                      */
                     function getSomething($stringOrInt)
                     {
@@ -1053,14 +1053,15 @@ function getSomething($stringOrInt)
                         return "";
                     }
                     /** @var string $string */
-                    $string;
+                    $string = "";
                     $something = getSomething($string);
+
                     /** @var non-empty-string $nonEmptyString */
-                    $nonEmptyString;
+                    $nonEmptyString = "test";
                     $something2 = getSomething($nonEmptyString);
                 ',
                 'assertions' => [
-                    '$something' => 'int|string',
+                    '$something' => 'int',
                     '$something2' => 'string',
                 ],
                 'ignored_issues' => [],