fixed psalm typing issues

Author: transistive

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.0-cli
+FROM php:7.4-cli
 RUN apt-get update && apt-get install -y \
         libfreetype6-dev \
         libjpeg62-turbo-dev \

src/Types/CypherMap.php

@@ -180,22 +180,19 @@ public function values(): CypherList
     /**
      * Creates a new map using exclusive or on the keys.
      *
-     * @param iterable<TValue> $map
+     * @param iterable<array-key, TValue> $map
      *
      * @return CypherMap<TValue>
      */
     public function xor(iterable $map): CypherMap
     {
         $tbr = $this->sequence;
 
-        /**
-         * @var mixed $key
-         */
         foreach ($map as $key => $value) {
             if (array_key_exists($key, $this->sequence)) {
-                unset($tbr[$key]);
+                unset($tbr[(string) $key]);
             } else {
-                $tbr[$key] = $value;
+                $tbr[(string) $key] = $value;
             }
         }
 
@@ -265,13 +262,13 @@ public function intersect(iterable $map): self
      *
      * @return CypherMap<TValue>
      */
-    public function diff($map): CypherMap
+    public function diff(iterable $map): CypherMap
     {
         $tbr = $this->sequence;
 
         /** @psalm-suppress UnusedForeachValue */
         foreach ($map as $key => $value) {
-            unset($tbr[$key]);
+            unset($tbr[(string) $key]);
         }
 
         return new self($tbr);

tests/Unit/CypherListTest.php

@@ -22,6 +22,7 @@
 
 final class CypherListTest extends TestCase
 {
+    /** @var CypherList<string> */
     private CypherList $list;
 
     public function setUp(): void
@@ -343,7 +344,7 @@ public function testSortedDefault(): void
 
     public function testSortedCustom(): void
     {
-        $sorted = $this->list->sorted(static fn (string $x, $y) => -1 * ($x <=> $y));
+        $sorted = $this->list->sorted(static fn (string $x, string $y): int => -1 * ($x <=> $y));
 
         self::assertEquals(new CypherList(['C', 'B', 'A']), $sorted);
         self::assertEquals(new CypherList(['A', 'B', 'C']), $this->list);

tests/Unit/CypherMapTest.php

@@ -27,6 +27,7 @@
 
 final class CypherMapTest extends TestCase
 {
+    /** @var CypherMap<string> */
     private CypherMap $map;
 
     public function setUp(): void
@@ -341,11 +342,11 @@ public function testJoinEmpty(): void
 
     public function testDiff(): void
     {
-        $subtract = new CypherMap(['B' => null, 'Z' => 'z']);
+        $subtract = new CypherMap(['B' => 'x', 'Z' => 'z']);
         $result = $this->map->diff($subtract);
 
         self::assertEquals(new CypherMap(['A' => 'x', 'C' => 'z']), $result);
-        self::assertEquals(new CypherMap(['B' => null, 'Z' => 'z']), $subtract);
+        self::assertEquals(new CypherMap(['B' => 'x', 'Z' => 'z']), $subtract);
         self::assertEquals(new CypherMap(['A' => 'x', 'B' => 'y', 'C' => 'z']), $this->map);
     }
 
@@ -356,31 +357,31 @@ public function testDiffEmpty(): void
 
     public function testIntersect(): void
     {
-        $intersect = new CypherMap(['B' => null, 'Z' => 'z']);
+        $intersect = new CypherMap(['B' => 'x', 'Z' => 'z']);
         $result = $this->map->intersect($intersect);
 
         self::assertEquals(new CypherMap(['B' => 'y']), $result);
-        self::assertEquals(new CypherMap(['B' => null, 'Z' => 'z']), $intersect);
+        self::assertEquals(new CypherMap(['B' => 'x', 'Z' => 'z']), $intersect);
         self::assertEquals(new CypherMap(['A' => 'x', 'B' => 'y', 'C' => 'z']), $this->map);
     }
 
     public function testUnion(): void
     {
-        $intersect = new CypherMap(['B' => null, 'Z' => 'z']);
+        $intersect = new CypherMap(['B' => 'x', 'Z' => 'z']);
         $result = $this->map->union($intersect);
 
         self::assertEquals(new CypherMap(['A' => 'x', 'B' => 'y', 'C' => 'z', 'Z' => 'z']), $result);
-        self::assertEquals(new CypherMap(['B' => null, 'Z' => 'z']), $intersect);
+        self::assertEquals(new CypherMap(['B' => 'x', 'Z' => 'z']), $intersect);
         self::assertEquals(new CypherMap(['A' => 'x', 'B' => 'y', 'C' => 'z']), $this->map);
     }
 
     public function testXor(): void
     {
-        $intersect = new CypherMap(['B' => null, 'Z' => 'z']);
+        $intersect = new CypherMap(['B' => 'x', 'Z' => 'z']);
         $result = $this->map->xor($intersect);
 
         self::assertEquals(new CypherMap(['A' => 'x', 'C' => 'z', 'Z' => 'z']), $result);
-        self::assertEquals(new CypherMap(['B' => null, 'Z' => 'z']), $intersect);
+        self::assertEquals(new CypherMap(['B' => 'x', 'Z' => 'z']), $intersect);
         self::assertEquals(new CypherMap(['A' => 'x', 'B' => 'y', 'C' => 'z']), $this->map);
     }
 
@@ -435,7 +436,7 @@ public function testSortedDefault(): void
 
     public function testSortedCustom(): void
     {
-        $sorted = $this->map->sorted(static fn (string $x, $y) => -1 * ($x <=> $y));
+        $sorted = $this->map->sorted(static fn (string $x, string $y): int => -1 * ($x <=> $y));
 
         self::assertEquals(new CypherMap(['C' => 'z', 'B' => 'y', 'A' => 'x']), $sorted);
         self::assertEquals(new CypherMap(['A' => 'x', 'B' => 'y', 'C' => 'z']), $this->map);
@@ -449,7 +450,7 @@ public function testKSorted(): void
 
     public function testKSortedCustom(): void
     {
-        $sorted = $this->map->ksorted(static fn (string $x, $y) => -1 * ($x <=> $y));
+        $sorted = $this->map->ksorted(static fn (string $x, string $y) => -1 * ($x <=> $y));
 
         self::assertEquals(new CypherMap(['C' => 'z', 'B' => 'y', 'A' => 'x']), $sorted);
         self::assertEquals(new CypherMap(['A' => 'x', 'B' => 'y', 'C' => 'z']), $this->map);