Greenbarred tests

Author: transistive

src/Formatter/OGMFormatter.php

@@ -130,16 +130,18 @@ private function buildResult(array $result): CypherList
             $relationship = $data['graph']['relationships'];
             $metaIndex = 0;
             $relationshipIndex = 0;
+            $nodeIndex = 0;
 
             /** @var array<string, OGMTypes> $record */
             $record = [];
             foreach ($data['row'] as $i => $value) {
                 if (is_array($value)) {
-                    $translation = $this->arrayTranslator->translate($meta, $relationship, $metaIndex, $relationshipIndex, $nodes, $value);
+                    $translation = $this->arrayTranslator->translate($meta, $relationship, $metaIndex, $relationshipIndex, $nodeIndex, $nodes, $value);
 
                     $relationshipIndex += $translation[1];
                     $metaIndex += $translation[0];
-                    $record[$columns[$i]] = $translation[2];
+                    $nodeIndex += $translation[2];
+                    $record[$columns[$i]] = $translation[3];
                 } elseif (is_string($value)) {
                     [$metaIncrement, $translation] = $this->stringTranslator->translate($metaIndex, $meta, $value);
                     $metaIndex += $metaIncrement;

src/Formatter/Specialised/HttpOGMArrayTranslator.php

@@ -99,9 +99,9 @@ private function translateCypherList(array $value): CypherList
      * @param MetaArray               $meta
      * @param list<NodeArray>         $nodes
      *
-     * @return array{0: int, 1: int, 2:Cartesian3DPoint|CartesianPoint|CypherList|CypherMap|Node|Relationship|WGS843DPoint|WGS84Point|Path}
+     * @return array{0: int, 1: int, 2: int, 3:Cartesian3DPoint|CartesianPoint|CypherList|CypherMap|Node|Relationship|WGS843DPoint|WGS84Point|Path}
      */
-    public function translate(array $meta, array $relationships, int $metaIndex, int $relationshipIndex, array $nodes, array $value): array
+    public function translate(array $meta, array $relationships, int $metaIndex, int $relationshipIndex, int $nodeIndex, array $nodes, array $value): array
     {
         $currentMeta = $meta[$metaIndex];
         $metaIncrease = 1;
@@ -127,18 +127,20 @@ public function translate(array $meta, array $relationships, int $metaIndex, int
                 $tbr = $this->translatePoint($value);
                 break;
             default:
-                if ($type === 'node' && isset($currentMeta['id'])) {
+                if ($type === 'node' && isset($currentMeta['id']) && $value === $nodes[$nodeIndex]['properties']) {
                     /** @var int $id */
                     $id = $currentMeta['id'];
-                    $tbr = $this->translateNode($nodes, $id);
+                    $node = $nodes[$nodeIndex];
+                    ++$nodeIndex;
+                    $tbr = new Node($id, new CypherList($node['labels']), $this->translateCypherMap($node['properties']));
                 } else {
                     /** @var array<array-key, array|scalar|null> $value */
                     $tbr = $this->translateContainer($value);
                 }
                 break;
         }
 
-        return [$metaIncrease, $relationshipIncrease, $tbr];
+        return [$metaIncrease, $relationshipIncrease, $nodeIndex, $tbr];
     }
 
     /**

tests/Fixtures/MoviesFixture.php

@@ -1,13 +1,13 @@
 <?php
 
 /*
-* This file is part of the Laudis Neo4j package.
-*
-* (c) Laudis technologies <http://laudis.tech>
-*
-* For the full copyright and license information, please view the LICENSE
-* file that was distributed with this source code.
-*/
+ * This file is part of the Laudis Neo4j package.
+ *
+ * (c) Laudis technologies <http://laudis.tech>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace Laudis\Neo4j\Tests\Fixtures;
 

tests/Integration/DriverParityTest.php

@@ -13,12 +13,16 @@
 
 namespace Laudis\Neo4j\Tests\Integration;
 
+use Laudis\Neo4j\Contracts\ClientInterface;
 use Laudis\Neo4j\Contracts\FormatterInterface;
 use Laudis\Neo4j\Formatter\SummarizedResultFormatter;
 use Laudis\Neo4j\Tests\Fixtures\MoviesFixture;
 use Laudis\Neo4j\Types\CypherMap;
 
-class DriverParityTest extends SelectableDriverIntegrationTestCase
+/**
+ * @psalm-suppress all
+ */
+final class DriverParityTest extends SelectableDriverIntegrationTestCase
 {
     private const TESTABLE_SCHEMES = ['bolt', 'http'];
 
@@ -38,11 +42,10 @@ protected static function formatter(): FormatterInterface
 
     public function testCanHandleMapLiterals(): void
     {
-        $this->runParityTest(function($client) {
-
+        $this->runParityTest(function (ClientInterface $client) {
             $results = $client->run('MATCH (n:Person)-[r:ACTED_IN]->(m) RETURN n, {movie: m, roles: r.roles} AS actInfo LIMIT 5');
-    
-            foreach($results as $result) {
+
+            foreach ($results as $result) {
                 $actorInfo = $result->get('actInfo');
 
                 $this->assertInstanceOf(CypherMap::class, $actorInfo);
@@ -54,12 +57,11 @@ public function testCanHandleMapLiterals(): void
 
     private function runParityTest(callable $test): void
     {
-        foreach(self::TESTABLE_SCHEMES as $scheme) {
+        foreach (self::TESTABLE_SCHEMES as $scheme) {
             $client = $this->getClientForScheme($scheme);
-            echo "Testing ".$scheme.' for '.$this->getName().PHP_EOL;
+            echo 'Testing '.$scheme.' for '.$this->getName().PHP_EOL;
             $test($client);
             echo $scheme.' passed'.PHP_EOL;
-
         }
     }
 }

tests/Integration/SelectableDriverIntegrationTestCase.php

@@ -13,15 +13,17 @@
 
 namespace Laudis\Neo4j\Tests\Integration;
 
+use function array_values;
 use Exception;
 use Laudis\Neo4j\ClientBuilder;
 use Laudis\Neo4j\Common\Uri;
 use Laudis\Neo4j\Contracts\ClientInterface;
 use Laudis\Neo4j\Contracts\FormatterInterface;
+use function sprintf;
 
 abstract class SelectableDriverIntegrationTestCase extends EnvironmentAwareIntegrationTest
 {
-    /** @var array<string,ClientInterface> */
+    /** @var array<string, ClientInterface> */
     protected static array $drivers = [];
 
     abstract protected static function formatter(): FormatterInterface;
@@ -34,26 +36,26 @@ public static function setUpBeforeClass(): void
 
     protected static function createClient(): ClientInterface
     {
-        $connections = self::buildConnections();
-
-        foreach ($connections as $i => $connection) {
+        foreach (self::buildConnections() as $i => $connection) {
             $builder = ClientBuilder::create();
             $uri = Uri::create($connection);
             $alias = $uri->getScheme().'_'.$i;
             $builder = $builder->withDriver($alias, $connection);
-            $client = $builder->withFormatter(static::formatter())->build();
-            self::$drivers[$alias] = $client;
+
+            self::$drivers[$alias] = $builder->withFormatter(static::formatter())->build();
         }
 
-        return \array_values(self::$drivers)[0];
+        /** @psalm-suppress PossiblyUndefinedIntArrayOffset */
+        return array_values(self::$drivers)[0];
     }
 
     protected function getClientForScheme(string $scheme): ClientInterface
     {
-        $firstAliasForScheme = current(array_filter(array_keys(self::$drivers), fn($alias) => str_starts_with($alias, $scheme)));
+        $firstAliasForScheme = current(array_filter(array_keys(self::$drivers), fn ($alias) => str_starts_with($alias, $scheme)));
         if (false === $firstAliasForScheme) {
-            throw new Exception(\sprintf("No client for scheme %s found", $scheme));
+            throw new Exception(sprintf('No client for scheme %s found', $scheme));
         }
+
         return self::$drivers[$firstAliasForScheme];
     }
 }