(WIP)

Author: axlon

src/Type/Php/ArgumentBasedFunctionReturnTypeExtension.php

@@ -25,14 +25,12 @@ final class ArgumentBasedFunctionReturnTypeExtension implements DynamicFunctionR
 		'array_diff' => 0,
 		'array_udiff_assoc' => 0,
 		'array_udiff_uassoc' => 0,
-		'array_udiff' => 0,
 		'array_intersect_assoc' => 0,
 		'array_intersect_uassoc' => 0,
 		'array_intersect_ukey' => 0,
 		'array_intersect' => 0,
 		'array_uintersect_assoc' => 0,
 		'array_uintersect_uassoc' => 0,
-		'array_uintersect' => 0,
 	];
 
 	public function isFunctionSupported(FunctionReflection $functionReflection): bool

stubs/arrayFunctions.stub

@@ -58,30 +58,32 @@ function uksort(array &$array, callable $callback): bool
 }
 
 /**
- * @template T
- * @template U
- * @param array<T> $one
- * @param array<U> $two
- * @param callable(T, U): int $three
+ * @template T of array
+ * @template U of array
+ * @param T $one
+ * @param U $two
+ * @param callable(value-of<T>, value-of<U>): int $three
+ * @return array<key-of<T>, value-of<T>>
  */
 function array_udiff(
     array $one,
     array $two,
     callable $three
-): int {}
+): array {}
 
 /**
- * @template T
- * @template U
- * @param array<T> $one
- * @param array<U> $two
- * @param callable(T, U): int $three
+ * @template T of array
+ * @template U of array
+ * @param T $one
+ * @param U $two
+ * @param callable(value-of<T>, value-of<U>): int $three
+ * @return array<key-of<T>, value-of<T>>
  */
 function array_uintersect(
     array $one,
     array $two,
     callable $three
-): int {}
+): array {}
 
 /**
  * @param array<array-key, mixed> $value

tests/PHPStan/Analyser/nsrt/array_udiff.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace ArrayUdiff;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param array<int> $array1
+ * @param array<string> $array2
+ * @param array<int, int> $array3
+ * @param list<string> $list
+ * @param non-empty-array<int> $nonEmptyArray
+ */
+function test(array $array1, array $array2, array $array3, array $list, array $nonEmptyArray): void
+{
+	assertType('array<int|string, int>', array_udiff($array1, $array2, static function (mixed $a, mixed $b) {
+		assertType('int', $a);
+		assertType('string', $b);
+
+		return strcasecmp((string) $a, $b);
+	}));
+
+	assertType('array<int|string, string>', array_udiff($array2, $array1, static function (mixed $a, mixed $b) {
+		assertType('string', $a);
+		assertType('int', $b);
+
+		return strcasecmp($a, (string) $b);
+	}));
+
+	assertType('array<int|string, int>', array_udiff($array1, $array3, static function (mixed $a, mixed $b) {
+		assertType('int', $a);
+		assertType('int', $b);
+
+		return $a <=> $b;
+	}));
+
+	assertType('array<int, int>', array_udiff($array3, $array1, static function (mixed $a, mixed $b) {
+		assertType('int', $a);
+		assertType('int', $b);
+
+		return $a <=> $b;
+	}));
+
+	assertType('array<int|string, int>', array_udiff($array1, $list, static function (mixed $a, mixed $b) {
+		assertType('int', $a);
+		assertType('string', $b);
+
+		return strcasecmp((string) $a, $b);
+	}));
+
+	assertType('array<int, string>', array_udiff($list, $array1, static function (mixed $a, mixed $b) {
+		assertType('string', $a);
+		assertType('int', $b);
+
+		return strcasecmp($a, (string) $b);
+	}));
+
+	assertType('array<int|string, int>', array_udiff($nonEmptyArray, $array1, static function (mixed $a, mixed $b) {
+		assertType('int', $a);
+		assertType('int', $b);
+
+		return $a <=> $b;
+	}));
+
+	assertType('array<int|string, int>', array_udiff($array1, $nonEmptyArray, static function (mixed $a, mixed $b) {
+		assertType('int', $a);
+		assertType('int', $b);
+
+		return $a <=> $b;
+	}));
+}

tests/PHPStan/Analyser/nsrt/array_uintersect.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace ArrayUintersect;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param array<int> $array1
+ * @param array<string> $array2
+ * @param array<int, int> $array3
+ * @param list<string> $list
+ * @param non-empty-array<int> $nonEmptyArray
+ */
+function test(array $array1, array $array2, array $array3, array $list, array $nonEmptyArray): void
+{
+	assertType('array<int|string, int>', array_uintersect($array1, $array2, static function (mixed $a, mixed $b) {
+		assertType('int', $a);
+		assertType('string', $b);
+
+		return strcasecmp((string) $a, $b);
+	}));
+
+	assertType('array<int|string, string>', array_uintersect($array2, $array1, static function (mixed $a, mixed $b) {
+		assertType('string', $a);
+		assertType('int', $b);
+
+		return strcasecmp($a, (string) $b);
+	}));
+
+	assertType('array<int|string, int>', array_uintersect($array1, $array3, static function (mixed $a, mixed $b) {
+		assertType('int', $a);
+		assertType('int', $b);
+
+		return $a <=> $b;
+	}));
+
+	assertType('array<int, int>', array_uintersect($array3, $array1, static function (mixed $a, mixed $b) {
+		assertType('int', $a);
+		assertType('int', $b);
+
+		return $a <=> $b;
+	}));
+
+	assertType('array<int|string, int>', array_uintersect($array1, $list, static function (mixed $a, mixed $b) {
+		assertType('int', $a);
+		assertType('string', $b);
+
+		return strcasecmp((string) $a, $b);
+	}));
+
+	assertType('array<int, string>', array_uintersect($list, $array1, static function (mixed $a, mixed $b) {
+		assertType('string', $a);
+		assertType('int', $b);
+
+		return strcasecmp($a, (string) $b);
+	}));
+
+	assertType('array<int|string, int>', array_uintersect($nonEmptyArray, $array1, static function (mixed $a, mixed $b) {
+		assertType('int', $a);
+		assertType('int', $b);
+
+		return $a <=> $b;
+	}));
+
+	assertType('array<int|string, int>', array_uintersect($array1, $nonEmptyArray, static function (mixed $a, mixed $b) {
+		assertType('int', $a);
+		assertType('int', $b);
+
+		return $a <=> $b;
+	}));
+}