fix list methods so psalm doesn't see it as list<never>

Author: alleknalle

src/Assert.php

@@ -1986,11 +1986,9 @@ public static function countBetween(mixed $array, mixed $min, mixed $max, string
     /**
      * @psalm-pure
      *
-     * @psalm-assert list<T> $array
+     * @psalm-assert list<mixed> $array
      *
-     * @psalm-return list<T>
-     *
-     * @template T
+     * @psalm-return list<mixed>
      *
      * @throws InvalidArgumentException
      */
@@ -2008,11 +2006,9 @@ public static function isList(mixed $array, string $message = ''): array
     /**
      * @psalm-pure
      *
-     * @psalm-assert non-empty-list<T> $array
+     * @psalm-assert non-empty-list<mixed> $array
      *
-     * @psalm-return non-empty-list<T>
-     *
-     * @template T
+     * @psalm-return non-empty-list<mixed>
      *
      * @throws InvalidArgumentException
      */

src/Mixin.php

@@ -4754,27 +4754,29 @@ public static function allNullOrCountBetween(mixed $array, mixed $min, mixed $ma
     /**
      * @psalm-pure
      *
-     * @psalm-assert list<T>|null $array
+     * @psalm-assert list<mixed>|null $array
      *
-     * @template T
-     * @return list<T>|null
+     * @return list<mixed>|null
      *
      * @throws InvalidArgumentException
      */
-    public static function nullOrIsList(mixed $array, string $message = ''): mixed
+    public static function nullOrIsList(mixed $array, string $message = ''): ?array
     {
-        null === $array || static::isList($array, $message);
+        if($array === null) {
+            return null;
+        }
+
+        static::isList($array, $message);
 
         return $array;
     }
 
     /**
      * @psalm-pure
      *
-     * @psalm-assert iterable<list<T>> $array
+     * @psalm-assert iterable<list<mixed>> $array
      *
-     * @template T
-     * @return iterable<list<T>>
+     * @return iterable<list<mixed>>
      *
      * @throws InvalidArgumentException
      */
@@ -4792,10 +4794,9 @@ public static function allIsList(mixed $array, string $message = ''): mixed
     /**
      * @psalm-pure
      *
-     * @psalm-assert iterable<list<T>|null> $array
+     * @psalm-assert iterable<list<mixed>|null> $array
      *
-     * @template T
-     * @return iterable<list<T>|null>
+     * @return iterable<list<mixed>|null>
      *
      * @throws InvalidArgumentException
      */
@@ -4813,27 +4814,29 @@ public static function allNullOrIsList(mixed $array, string $message = ''): mixe
     /**
      * @psalm-pure
      *
-     * @psalm-assert non-empty-list<T>|null $array
+     * @psalm-assert non-empty-list|null $array
      *
-     * @template T
-     * @return non-empty-list<T>|null
+     * @return non-empty-list|null
      *
      * @throws InvalidArgumentException
      */
-    public static function nullOrIsNonEmptyList(mixed $array, string $message = ''): mixed
+    public static function nullOrIsNonEmptyList(mixed $array, string $message = ''): ?array
     {
-        null === $array || static::isNonEmptyList($array, $message);
+        if($array === null) {
+            return null;
+        }
+
+        static::isNonEmptyList($array, $message);
 
         return $array;
     }
 
     /**
      * @psalm-pure
      *
-     * @psalm-assert iterable<non-empty-list<T>> $array
+     * @psalm-assert iterable<non-empty-list> $array
      *
-     * @template T
-     * @return iterable<non-empty-list<T>>
+     * @return iterable<non-empty-list>
      *
      * @throws InvalidArgumentException
      */
@@ -4851,10 +4854,9 @@ public static function allIsNonEmptyList(mixed $array, string $message = ''): mi
     /**
      * @psalm-pure
      *
-     * @psalm-assert iterable<non-empty-list<T>|null> $array
+     * @psalm-assert iterable<non-empty-list|null> $array
      *
-     * @template T
-     * @return iterable<non-empty-list<T>|null>
+     * @return iterable<non-empty-list|null>
      *
      * @throws InvalidArgumentException
      */

tests/static-analysis/assert-isNonEmptyList.php

@@ -20,6 +20,18 @@ function isNonEmptyList(mixed $value): array
     return $value;
 }
 
+/**
+ * @psalm-pure
+ */
+function isNonEmptyListWithRange(): mixed
+{
+    $value = range(1, 100);
+
+    Assert::isNonEmptyList($value);
+
+    return $value[0];
+}
+
 /**
  * @psalm-pure
  *