fixed psalm typing

Author: transistive

src/Bolt/BoltUnmanagedTransaction.php

@@ -143,10 +143,7 @@ public function runStatements(iterable $statements): CypherList
         return new CypherList($tbr);
     }
 
-    /**
-     * @return Bolt|mixed
-     */
-    private function getBolt()
+    private function getBolt(): Bolt
     {
         return $this->connection->getImplementation();
     }

src/Common/TransactionHelper.php

@@ -98,7 +98,7 @@ public static function connectionFromSocket(
 
         /**
          * @var array{'name': 0, 'version': 1, 'edition': 2}
-         * @psalm-suppress PossiblyUndefinedStringArrayOffset
+         * @psalm-suppress all
          */
         $fields = array_flip($bolt->run(<<<'CYPHER'
 CALL dbms.components()

src/Contracts/FormatterInterface.php

@@ -74,7 +74,8 @@ interface FormatterInterface
     public function formatBoltResult(array $meta, array $results, ConnectionInterface $connection, float $resultAvailableAfter, float $resultConsumedAfter, Statement $statement);
 
     /**
-     * @param CypherResponseSet $body
+     * @param CypherResponseSet   $body
+     * @param iterable<Statement> $statements
      *
      * @throws JsonException
      *

src/Databags/ResultSummary.php

@@ -20,6 +20,7 @@ final class ResultSummary
 {
     private SummaryCounters $counters;
     private DatabaseInfo $databaseInfo;
+    /** @var CypherList<Notification> */
     private CypherList $notifications;
     private ?Plan $plan;
     private ?ProfiledPlan $profiledPlan;
@@ -29,6 +30,9 @@ final class ResultSummary
     private float $resultConsumedAfter;
     private ServerInfo $serverInfo;
 
+    /**
+     * @param CypherList<Notification> $notifications
+     */
     public function __construct(
         SummaryCounters $counters,
         DatabaseInfo $databaseInfo,

src/Exception/UnsupportedScheme.php

@@ -18,6 +18,9 @@
 
 final class UnsupportedScheme extends RuntimeException
 {
+    /**
+     * @param list<string> $supportedSchemas
+     */
     public static function make(string $schema, array $supportedSchemas): self
     {
         return new self('Unsupported schema: '.$schema.', available schema\'s are: '.implode(',', $supportedSchemas));

src/Formatter/Specialised/HttpOGMArrayTranslator.php

@@ -129,16 +129,16 @@ public function translate(Iterator $meta, Iterator $relationship, array $nodes,
      */
     private function translateNode(array $nodes, int $id, CypherMap $tbr): Node
     {
-        /** @var list<string> $labels */
-        $labels = [];
+        /** @var Vector<string> */
+        $labels = new Vector();
         foreach ($nodes as $node) {
             if ((int) $node['id'] === $id) {
-                $labels = $node['labels'];
+                $labels = new Vector($node['labels']);
                 break;
             }
         }
 
-        return new Node($id, new CypherList(new Vector($labels)), $tbr);
+        return new Node($id, new CypherList($labels), $tbr);
     }
 
     /**

src/Formatter/SummarizedResultFormatter.php

@@ -18,10 +18,10 @@
 use function is_int;
 use Laudis\Neo4j\Contracts\ConnectionInterface;
 use Laudis\Neo4j\Contracts\FormatterInterface;
-use Laudis\Neo4j\Databags\SummarizedResult;
 use Laudis\Neo4j\Databags\ResultSummary;
 use Laudis\Neo4j\Databags\ServerInfo;
 use Laudis\Neo4j\Databags\Statement;
+use Laudis\Neo4j\Databags\SummarizedResult;
 use Laudis\Neo4j\Databags\SummaryCounters;
 use Laudis\Neo4j\Enum\QueryTypeEnum;
 use Laudis\Neo4j\Types\CypherList;
@@ -51,7 +51,13 @@ public function __construct(FormatterInterface $formatter)
         $this->formatter = $formatter;
     }
 
-    public function formatHttpStats(array $response, ConnectionInterface $connection, Statement $statement, float $resultAvailableAfter, float $resultConsumedAfter, CypherList $results): SummarizedResult
+    /**
+     * @param CypherResponse $response
+     * @param T              $results
+     *
+     * @return SummarizedResult<T>
+     */
+    public function formatHttpStats(array $response, ConnectionInterface $connection, Statement $statement, float $resultAvailableAfter, float $resultConsumedAfter, $results): SummarizedResult
     {
         if (!isset($response['stats'])) {
             throw new UnexpectedValueException('No stats found in the response set');
@@ -163,13 +169,15 @@ public function formatBoltResult(array $meta, array $results, ConnectionInterfac
 
     public function formatHttpResult(ResponseInterface $response, array $body, ConnectionInterface $connection, float $resultsAvailableAfter, float $resultsConsumedAfter, iterable $statements): CypherList
     {
-        /** @var Vector<SummarizedResult> $tbr */
+        /** @var Vector<SummarizedResult<T>> */
         $tbr = new Vector();
 
         $toDecorate = $this->formatter->formatHttpResult($response, $body, $connection, $resultsAvailableAfter, $resultsConsumedAfter, $statements);
-        foreach ($statements as $i => $statement) {
+        $i = 0;
+        foreach ($statements as $statement) {
             $result = $body['results'][$i];
             $tbr->push($this->formatHttpStats($result, $connection, $statement, $resultsAvailableAfter, $resultsConsumedAfter, $toDecorate->get($i)));
+            ++$i;
         }
 
         return new CypherList($tbr);

src/Types/CypherList.php

@@ -29,9 +29,9 @@ final class CypherList implements CypherContainerInterface
     private Vector $vector;
 
     /**
-     * @param iterable<T> $vector
+     * @param Vector<T> $vector
      */
-    public function __construct(iterable $vector)
+    public function __construct(Vector $vector)
     {
         $this->vector = new Vector($vector);
     }

src/Types/CypherMap.php

@@ -157,6 +157,7 @@ public function intersect($map): CypherMap
             $map = $map->map;
         }
 
+        /** @var Map<string, T> $map */
         return new CypherMap($this->map->intersect($map));
     }
 
@@ -171,6 +172,7 @@ public function diff($map): CypherMap
             $map = $map->map;
         }
 
+        /** @var Map<string, T> $map */
         return new CypherMap($this->map->diff($map));
     }
 
@@ -319,6 +321,7 @@ public function union($map): CypherMap
             $map = $map->map;
         }
 
+        /** @var Map<string, T> $map */
         return new CypherMap($this->map->union($map));
     }
 
@@ -333,6 +336,7 @@ public function xor($map): CypherMap
             $map = $map->map;
         }
 
+        /** @var Map<string, T> $map */
         return new CypherMap($this->map->xor($map));
     }