fixed type hints in basic formatter

Author: transistive

src/Contracts/FormatterInterface.php

@@ -83,7 +83,6 @@ public function formatBoltResult(array $meta, array $results, ConnectionInterfac
     /**
      * Formats the results of the HTTP protocol to the unified format.
      *
-     * @param stdClass            $body
      * @param iterable<Statement> $statements
      *
      * @throws JsonException

src/Formatter/BasicFormatter.php

@@ -13,7 +13,6 @@
 
 namespace Laudis\Neo4j\Formatter;
 
-use stdClass;
 use function array_slice;
 use Bolt\structures\Path;
 use function count;
@@ -28,16 +27,12 @@
 use Laudis\Neo4j\Types\CypherMap;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use stdClass;
 use UnexpectedValueException;
 
 /**
  * Formats the result in basic CypherLists and CypherMaps. All cypher types are erased so that the map only contains scalar, null or array values.
  *
- * @psalm-import-type CypherError from \Laudis\Neo4j\Contracts\FormatterInterface
- * @psalm-import-type CypherRowResponse from \Laudis\Neo4j\Contracts\FormatterInterface
- * @psalm-import-type CypherResponse from \Laudis\Neo4j\Contracts\FormatterInterface
- * @psalm-import-type CypherResponseSet from \Laudis\Neo4j\Contracts\FormatterInterface
- *
  * @psalm-type BasicResults = CypherList<CypherMap<scalar|array|null>>
  *
  * @implements FormatterInterface<BasicResults>
@@ -80,6 +75,7 @@ public function formatHttpResult(ResponseInterface $response, stdClass $body, ?C
         /** @var list<CypherList<CypherMap<scalar|array|null>>> */
         $tbr = [];
 
+        /** @var stdClass $results */
         foreach ($body->results as $results) {
             $tbr[] = $this->buildResult($results);
         }
@@ -95,15 +91,19 @@ private function buildResult(stdClass $result): CypherList
         /** @var list<CypherMap<scalar|array|null>> */
         $tbr = [];
 
+        /** @var list<string> $columns */
         $columns = (array) $result->columns;
+        /** @var stdClass $dataRow */
         foreach ($result->data as $dataRow) {
-            $row = $dataRow->row;
             /** @var array<string, scalar|array|null> $map */
             $map = [];
-            $vector = $row;
+            /** @var list<stdClass|scalar|array|null> */
+            $vector = $dataRow->row;
             foreach ($columns as $index => $key) {
-                // Make sure it are all arrays now
-                $map[$key] = json_decode(json_encode($vector[$index], JSON_THROW_ON_ERROR), true, 512, JSON_THROW_ON_ERROR);
+                // Removes the stdClasses from the json objects
+                /** @var scalar|array|null */
+                $decoded = json_decode(json_encode($vector[$index], JSON_THROW_ON_ERROR), true, 512, JSON_THROW_ON_ERROR);
+                $map[$key] = $decoded;
             }
             $tbr[] = new CypherMap($map);
         }

src/Formatter/Specialised/HttpMetaInfo.php

@@ -15,17 +15,11 @@
 use stdClass;
 
 /**
- * @psalm-type RelationshipArray = array{id: string, type: string, startNode: string, endNode: string, properties: array<string, scalar|null|array<array-key, scalar|null|array>>}
- * @psalm-type NodeArray = array{id: string, labels: list<string>, properties: array<string, scalar|null|array}
- * @psalm-type Meta = array{id?: int, type: string, deleted?: bool}
- * @psalm-type MetaArray = list<Meta|null|list<array{id: int, type: string, deleted: bool}>>
- * @psalm-type CypherResultDataRow = array{row: list<scalar|array|null>, meta: MetaArray, graph: array{nodes: list<NodeArray>, relationships: list<RelationshipArray>}}
- *
  * @psalm-immutable
  */
 final class HttpMetaInfo
 {
-    /** @var list<stdClass|list> */
+    /** @var list<stdClass|list<stdClass>> */
     private array $meta;
     /** @var list<stdClass> */
     private array $nodes;
@@ -58,11 +52,12 @@ public static function createFromData(stdClass $data): self
         /** @var stdClass */
         $graph = $data->graph;
 
+        /** @psalm-suppress MixedArgument */
         return new self($data->meta, $graph->nodes, $graph->relationships);
     }
 
     /**
-     * @return stdClass|list|null
+     * @return stdClass|list<stdClass>|null
      */
     public function currentMeta()
     {
@@ -112,15 +107,19 @@ public function getCurrentType(): ?string
             return null;
         }
 
+        /** @var string */
         return $currentMeta->type;
     }
 
     public function withNestedMeta(): self
     {
         $tbr = clone $this;
 
-        $tbr->meta = (array) $this->currentMeta();
-        $tbr->currentMeta = 0;
+        $currentMeta = $this->currentMeta();
+        if (is_array($currentMeta)) {
+            $tbr->meta = $currentMeta;
+            $tbr->currentMeta = 0;
+        }
 
         return $tbr;
     }

src/Formatter/SummarizedResultFormatter.php

@@ -13,7 +13,6 @@
 
 namespace Laudis\Neo4j\Formatter;
 
-use stdClass;
 use function in_array;
 use function is_int;
 use Laudis\Neo4j\Contracts\ConnectionInterface;
@@ -28,6 +27,7 @@
 use Laudis\Neo4j\Types\CypherMap;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use stdClass;
 use UnexpectedValueException;
 
 /**

tests/Integration/OGMFormatterIntegrationTest.php

@@ -37,7 +37,6 @@
 use function range;
 use function sprintf;
 use function str_contains;
-use function str_starts_with;
 
 /**
  * @psalm-import-type OGMResults from \Laudis\Neo4j\Formatter\OGMFormatter