Merge remote-tracking branch 'origin/6.x'

Author: danog

dictionaries/CallMap_84.php

@@ -38168,15 +38168,15 @@
   'idn_to_ascii' => 
   array (
     0 => 'false|string',
-    'domain' => 'string',
+    'domain' => 'non-empty-string',
     'flags=' => 'int',
     'variant=' => 'int',
     '&w_idna_info=' => 'array<array-key, mixed>',
   ),
   'idn_to_utf8' => 
   array (
     0 => 'false|string',
-    'domain' => 'string',
+    'domain' => 'non-empty-string',
     'flags=' => 'int',
     'variant=' => 'int',
     '&w_idna_info=' => 'array<array-key, mixed>',

dictionaries/override/CallMap.php

@@ -23956,15 +23956,15 @@
   'idn_to_ascii' => 
   array (
     0 => 'false|string',
-    'domain' => 'string',
+    'domain' => 'non-empty-string',
     'flags=' => 'int',
     'variant=' => 'int',
     '&w_idna_info=' => 'array<array-key, mixed>',
   ),
   'idn_to_utf8' => 
   array (
     0 => 'false|string',
-    'domain' => 'string',
+    'domain' => 'non-empty-string',
     'flags=' => 'int',
     'variant=' => 'int',
     '&w_idna_info=' => 'array<array-key, mixed>',

dictionaries/override/CallMap_84_delta.php

@@ -147,6 +147,44 @@
         'return=' => 'bool',
       ),
     ),
+    'idn_to_ascii' => 
+    array (
+      'old' => 
+      array (
+        0 => 'false|string',
+        'domain' => 'string',
+        'flags=' => 'int',
+        'variant=' => 'int',
+        '&w_idna_info=' => 'array<array-key, mixed>',
+      ),
+      'new' => 
+      array (
+        0 => 'false|string',
+        'domain' => 'non-empty-string',
+        'flags=' => 'int',
+        'variant=' => 'int',
+        '&w_idna_info=' => 'array<array-key, mixed>',
+      ),
+    ),
+    'idn_to_utf8' => 
+    array (
+      'old' => 
+      array (
+        0 => 'false|string',
+        'domain' => 'string',
+        'flags=' => 'int',
+        'variant=' => 'int',
+        '&w_idna_info=' => 'array<array-key, mixed>',
+      ),
+      'new' => 
+      array (
+        0 => 'false|string',
+        'domain' => 'non-empty-string',
+        'flags=' => 'int',
+        'variant=' => 'int',
+        '&w_idna_info=' => 'array<array-key, mixed>',
+      ),
+    ),
     'imagick::convolveimage' => 
     array (
       'old' => 

src/Psalm/Internal/Type/SimpleNegatedAssertionReconciler.php

@@ -1697,7 +1697,7 @@ private static function reconcileArray(
                 }
             } elseif ($type instanceof TCallable) {
                 $non_array_types[] = new TCallableString();
-                $non_array_types[] = new TCallableObject();
+                $non_array_types[] = new TCallableObject($type->from_docblock, $type);
                 $redundant = false;
             } elseif ($type instanceof TIterable) {
                 if (!$type->type_params[0]->isMixed() || !$type->type_params[1]->isMixed()) {

tests/CallableTest.php

@@ -2384,6 +2384,21 @@ function f(callable $c): void {
                 f($ca);
                 PHP,
             ],
+            'callableWithoutArray' => [
+                'code' => '<?php
+                    /**
+                     * @param array|(callable():array) $var
+                     */
+                    function text($var): array
+                    {
+                        if (is_array($var)) {
+                            return $var;
+                        }
+
+                        //callable-string can\'t specify return type but it doesn\'t error
+                        return call_user_func($var);
+                    }',
+            ],
         ];
     }