mapping functions receive value before key as parameter

Author: transistive

src/Types/AbstractCypherSequence.php

@@ -116,15 +116,15 @@ final public function hasValue($value): bool
     /**
      * Creates a filtered the sequence with the provided callback.
      *
-     * @param pure-callable(TKey, TValue):bool $callback
+     * @param pure-callable(TValue, TKey):bool $callback
      *
      * @return static
      */
     final public function filter(callable $callback): self
     {
         $tbr = [];
         foreach ($this->sequence as $key => $value) {
-            if ($callback($key, $value)) {
+            if ($callback($value, $key)) {
                 $tbr[$key] = $value;
             }
         }
@@ -137,15 +137,15 @@ final public function filter(callable $callback): self
      *
      * @template U
      *
-     * @param pure-callable(TKey, TValue):U $callback
+     * @param pure-callable(TValue, TKey):U $callback
      *
      * @return static
      */
     final public function map(callable $callback): self
     {
         $tbr = [];
         foreach ($this->sequence as $key => $value) {
-            $tbr[$key] = $callback($key, $value);
+            $tbr[$key] = $callback($value, $key);
         }
 
         return $this::fromIterable($tbr);
@@ -156,15 +156,15 @@ final public function map(callable $callback): self
      *
      * @template TInitial
      *
-     * @param pure-callable(TInitial|null, TKey, TValue):TInitial $callback
+     * @param pure-callable(TInitial|null, TValue, TKey):TInitial $callback
      * @param TInitial|null                                       $initial
      *
      * @return TInitial
      */
     final public function reduce(callable $callback, $initial = null)
     {
         foreach ($this->sequence as $key => $value) {
-            $initial = $callback($initial, $key, $value);
+            $initial = $callback($initial, $value, $key);
         }
 
         return $initial;

tests/Unit/CypherListTest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /*
  * This file is part of the Laudis Neo4j package.
@@ -130,21 +131,21 @@ public function testFilterBlock(): void
 
     public function testFilterSelective(): void
     {
-        $filter = $this->list->filter(static fn (int $i, string $x) => $x === 'B' || $i === 2);
+        $filter = $this->list->filter(static fn (string $x, int $i) => $x === 'B' || $i === 2);
 
         self::assertEquals(new CypherList(['B', 'C']), $filter);
     }
 
     public function testMap(): void
     {
-        $filter = $this->list->map(static fn (int $i, string $x) => $i.':'.$x);
+        $filter = $this->list->map(static fn (string $x, int $i) => $i.':'.$x);
 
         self::assertEquals(new CypherList(['0:A', '1:B', '2:C']), $filter);
     }
 
     public function testReduce(): void
     {
-        $count = $this->list->reduce(static function (?int $initial, int $key, string $value) {
+        $count = $this->list->reduce(static function (?int $initial, string $value, int $key) {
             return ($initial ?? 0) + $key * hexdec($value);
         }, 5);