Merge pull request #22 from weirdan/fix-partition-type

Fixed Collection::partition closure type
psalm · Jul 20, 2019 · e554698 · e554698
2 parents 30ea862 + bd21816
commit e554698
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/stubs/Collections.php b/stubs/Collections.php
@@ -143,7 +143,7 @@ public function forAll(Closure $p);
     public function map(Closure $func);
 
     /**
-     * @param Closure(TValue=):bool $p
+     * @param Closure(TKey=,TValue=):bool $p
      * @return array{0:Collection<TKey,TValue>,1:Collection<TKey,TValue>}
      */
     public function partition(Closure $p);

diff --git a/tests/acceptance/Collections.feature b/tests/acceptance/Collections.feature
@@ -572,11 +572,11 @@ Feature: Collections
       """
       /** @var Collection<int,string> */
       $c = new ArrayCollection(["a", "b", "c"]);
-      atan($c->partition(function(string $_p): bool { return (bool) rand(0,1); }));
+      atan($c->partition(function(int $_k, string $_p): bool { return (bool) rand(0,1); }));
       """
     When I run Psalm
     Then I see these errors
-      | Type            | Message                                                                                                                                                        |
+      | Type            | Message                                                                                                                                                          |
       | InvalidArgument | Argument 1 of atan expects float, array{0:%Doctrine\Common\Collections\Collection<int, string>, 1:%Doctrine\Common\Collections\Collection<int, string>} provided |
     And I see no other errors
 
@@ -586,12 +586,12 @@ Feature: Collections
       """
       /** @var Collection<int,string> */
       $c = new ArrayCollection(["a", "b", "c"]);
-      $c->partition(function(int $_p): bool { return (bool) rand(0,1); });
+      $c->partition(function(string $_p): bool { return (bool) rand(0,1); });
       """
     When I run Psalm
     Then I see these errors
-      | Type                  | Message                                                                                                                   |
-      | InvalidScalarArgument | Argument 1 of Doctrine\Common\Collections\Collection::partition expects Closure(string=):bool, Closure(int):bool provided |
+      | Type                  | Message                                                                                                                            |
+      | InvalidScalarArgument | Argument 1 of Doctrine\Common\Collections\Collection::partition expects Closure(int=, string=):bool, Closure(string):bool provided |
     And I see no other errors
 
   @Collection::partition
@@ -600,12 +600,12 @@ Feature: Collections
       """
       /** @var Collection<int,string> */
       $c = new ArrayCollection(["a", "b", "c"]);
-      $c->partition(function(string $_p): int { return rand(0,1); });
+      $c->partition(function(int $_p): int { return rand(0,1); });
       """
     When I run Psalm
     Then I see these errors
-      | Type                  | Message                                                                                                                     |
-      | InvalidScalarArgument | Argument 1 of Doctrine\Common\Collections\Collection::partition expects Closure(string=):bool, Closure(string):int provided |
+      | Type                  | Message                                                                                                                        |
+      | InvalidScalarArgument | Argument 1 of Doctrine\Common\Collections\Collection::partition expects Closure(int=, string=):bool, Closure(int):int provided |
     And I see no other errors
 
   @Collection::partition