fixed merge conflicts and solved psalm errors

Author: p123-stack

src/Formatter/Specialised/BoltOGMTranslator.php

@@ -300,8 +300,6 @@ private function makeFromBoltPath(BoltPath $path): Path
         }
         /** @var list<int> $indices */
         $indices = $path->indices;
-        /** @var list<int> $ids */
-        $ids = $path->indices;
 
         return new Path(
             new CypherList($nodes),

tests/Unit/SummarizedResultListTest.php

@@ -56,7 +56,12 @@ public function testListAfterNextOmitsConsumedRow(): void
             $nValues[] = $n;
         }
         self::assertSame([2, 3, 4, 5], $nValues);
-        self::assertSame([2, 3, 4, 5], array_map(static fn (CypherMap $m): int => $m->get('n'), $rows));
+        self::assertSame([2, 3, 4, 5], array_map(static function (CypherMap $m): int {
+            $n = $m->get('n');
+            self::assertIsInt($n);
+
+            return $n;
+        }, $rows));
 
         $nValues = [];
         foreach ($rows as $row) {

tests/Unit/TypeCasterTest.php

@@ -96,8 +96,6 @@ public function __toString(): string
 
         foreach ($inputs as $inputName => $inputValue) {
             foreach ($matrix as $method => $expectations) {
-                /** @psalm-suppress MixedAssignment */
-                $expected = $expectations[$inputName] ?? null;
                 $expected = self::expectedValueForInput($expectations, $inputName);
                 $key = $inputName.'->'.$method;