removed all uses of php ds

transistive · transistive · commit f895cebfb666 · 2021-09-10T20:01:31.000+02:00
diff --git a/src/Formatter/BasicFormatter.php b/src/Formatter/BasicFormatter.php
@@ -16,8 +16,6 @@
 use function array_slice;
 use Bolt\structures\Path;
 use function count;
-use Ds\Map;
-use Ds\Vector;
 use function get_class;
 use function gettype;
 use function is_array;
@@ -53,22 +51,22 @@ public function formatBoltResult(array $meta, array $results, ?ConnectionInterfa
     {
         $results = array_slice($results, 0, count($results) - 1);
 
-        /** @var Vector<CypherMap<scalar|array|null>> */
-        $tbr = new Vector();
+        /** @var list<CypherMap<scalar|array|null>> */
+        $tbr = [];
         foreach ($results as $result) {
-            $tbr->push($this->formatRow($meta, $result));
+            $tbr[] = $this->formatRow($meta, $result);
         }
 
         return new CypherList($tbr);
     }
 
     public function formatHttpResult(ResponseInterface $response, array $body, ?ConnectionInterface $connection = null, ?float $resultsAvailableAfter = null, ?float $resultsConsumedAfter = null, ?iterable $statements = null): CypherList
     {
-        /** @var Vector<CypherList<CypherMap<scalar|array|null>>> */
-        $tbr = new Vector();
+        /** @var list<CypherList<CypherMap<scalar|array|null>>> */
+        $tbr = [];
 
         foreach ($body['results'] as $results) {
-            $tbr->push($this->buildResult($results));
+            $tbr[] = $this->buildResult($results);
         }
 
         return new CypherList($tbr);
@@ -81,19 +79,19 @@ public function formatHttpResult(ResponseInterface $response, array $body, ?Conn
      */
     private function buildResult(array $result): CypherList
     {
-        /** @psalm-var Vector<CypherMap<null|scalar|array>> */
-        $tbr = new Vector();
+        /** @var list<CypherMap<scalar|array|null>> */
+        $tbr = [];
 
         $columns = $result['columns'];
         foreach ($result['data'] as $dataRow) {
             $row = $dataRow['row'];
-            /** @psalm-var Map<string,null|scalar|array> $map */
-            $map = new Map();
-            $vector = new Vector($row);
+            /** @var array<string, scalar|array|null> $map */
+            $map = [];
+            $vector = $row;
             foreach ($columns as $index => $key) {
-                $map->put($key, $vector->get($index));
+                $map[$key] = $vector[$index];
             }
-            $tbr->push(new CypherMap($map));
+            $tbr[] = new CypherMap($map);
         }
 
         return new CypherList($tbr);
@@ -106,10 +104,10 @@ private function buildResult(array $result): CypherList
      */
     private function formatRow(array $meta, array $result): CypherMap
     {
-        /** @var Map<string, scalar|array|null> $map */
-        $map = new Map();
+        /** @var array<string, scalar|array|null> $map */
+        $map = [];
         foreach ($meta['fields'] as $i => $column) {
-            $map->put($column, $this->mapValue($result[$i]));
+            $map[$column] = $this->mapValue($result[$i]);
         }
 
         return new CypherMap($map);
diff --git a/src/Formatter/OGMFormatter.php b/src/Formatter/OGMFormatter.php
@@ -16,8 +16,6 @@
 use function array_slice;
 use ArrayIterator;
 use function count;
-use Ds\Map;
-use Ds\Vector;
 use Exception;
 use Laudis\Neo4j\Contracts\ConnectionInterface;
 use Laudis\Neo4j\Contracts\FormatterInterface;
@@ -81,11 +79,11 @@ public function formatBoltResult(array $meta, array $results, ConnectionInterfac
         /** @var list<list<mixed>> $results */
         $results = array_slice($results, 0, count($results) - 1);
 
-        /** @var Vector<CypherMap<OGMTypes>> $tbr */
-        $tbr = new Vector();
+        /** @var list<CypherMap<OGMTypes>> $tbr */
+        $tbr = [];
 
         foreach ($results as $result) {
-            $tbr->push($this->formatRow($meta, $result));
+            $tbr[] = $this->formatRow($meta, $result);
         }
 
         return new CypherList($tbr);
@@ -96,12 +94,12 @@ 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<CypherList<CypherMap<OGMTypes>>> $tbr */
-        $tbr = new Vector();
+        /** @var list<CypherList<CypherMap<OGMTypes>>> $tbr */
+        $tbr = [];
 
         foreach ($body['results'] as $results) {
             /** @var CypherResult $results */
-            $tbr->push($this->buildResult($results));
+            $tbr[] = $this->buildResult($results);
         }
 
         return new CypherList($tbr);
@@ -116,22 +114,22 @@ public function formatHttpResult(ResponseInterface $response, array $body, Conne
      */
     private function buildResult(array $result): CypherList
     {
-        /** @var Vector<CypherMap<OGMTypes>> $tbr */
-        $tbr = new Vector();
+        /** @var list<CypherMap<OGMTypes>> $tbr */
+        $tbr = [];
 
         $columns = $result['columns'];
         foreach ($result['data'] as $data) {
             $meta = new ArrayIterator($data['meta']);
             $nodes = $data['graph']['nodes'];
             $relationship = new ArrayIterator($data['graph']['relationships']);
 
-            /** @var Map<string, OGMTypes> $record */
-            $record = new Map();
+            /** @var array<string, OGMTypes> $record */
+            $record = [];
             foreach ($data['row'] as $i => $value) {
-                $record->put($columns[$i], $this->httpTranslator->translate($meta, $relationship, $nodes, $value));
+                $record[$columns[$i]] = $this->httpTranslator->translate($meta, $relationship, $nodes, $value);
             }
 
-            $tbr->push(new CypherMap($record));
+            $tbr[] = new CypherMap($record);
         }
 
         return new CypherList($tbr);
@@ -145,10 +143,10 @@ private function buildResult(array $result): CypherList
      */
     private function formatRow(array $meta, array $result): CypherMap
     {
-        /** @var Map<string, OGMTypes> $map */
-        $map = new Map();
+        /** @var array<string, OGMTypes> $map */
+        $map = [];
         foreach ($meta['fields'] as $i => $column) {
-            $map->put($column, $this->boltTranslator->mapValueToType($result[$i]));
+            $map[$column] = $this->boltTranslator->mapValueToType($result[$i]);
         }
 
         return new CypherMap($map);
diff --git a/src/Formatter/Specialised/BoltOGMTranslator.php b/src/Formatter/Specialised/BoltOGMTranslator.php
@@ -25,8 +25,6 @@
 use Bolt\structures\Relationship as BoltRelationship;
 use Bolt\structures\Time as BoltTime;
 use function call_user_func;
-use Ds\Map;
-use Ds\Vector;
 use Laudis\Neo4j\Types\Cartesian3DPoint;
 use Laudis\Neo4j\Types\CartesianPoint;
 use Laudis\Neo4j\Types\CypherList;
@@ -77,22 +75,22 @@ public function __construct()
 
     private function makeFromBoltNode(BoltNode $node): Node
     {
-        /** @var Map<string, OGMTypes> $properties */
-        $properties = new Map();
+        /** @var array<string, OGMTypes> $properties */
+        $properties = [];
         /**
          * @var string $name
          * @var mixed  $property
          */
         foreach ($node->properties() as $name => $property) {
-            $properties->put($name, $this->mapValueToType($property));
+            $properties[$name] = $this->mapValueToType($property);
         }
 
         /**
          * @psalm-suppress MixedArgumentTypeCoercion
          */
         return new Node(
             $node->id(),
-            new CypherList(new Vector($node->labels())),
+            new CypherList($node->labels()),
             new CypherMap($properties)
         );
     }
@@ -134,14 +132,14 @@ private function makeFromBoltLocalTime(BoltLocalTime $time): LocalTime
 
     private function makeFromBoltRelationship(BoltRelationship $rel): Relationship
     {
-        /** @var Map<string, OGMTypes> $map */
-        $map = new Map();
+        /** @var array<string, OGMTypes> $map */
+        $map = [];
         /**
          * @var string $key
          * @var mixed  $property
          */
         foreach ($rel->properties() as $key => $property) {
-            $map->put($key, $this->mapValueToType($property));
+            $map[$key] = $this->mapValueToType($property);
         }
 
         return new Relationship(
@@ -166,9 +164,9 @@ private function makeFromBoltPoint3D(BoltPoint3D $x): Cartesian3DPoint
     private function makeFromBoltPath(BoltPath $path): Path
     {
         return new Path(
-            new CypherList(new Vector($path->ids())),
-            new CypherList(new Vector($path->rels())),
-            new CypherList(new Vector($path->nodes()))
+            new CypherList($path->ids()),
+            new CypherList($path->rels()),
+            new CypherList($path->nodes())
         );
     }
 
@@ -178,24 +176,24 @@ private function makeFromBoltPath(BoltPath $path): Path
     private function mapArray(array $value)
     {
         if (isset($value[0])) {
-            /** @var Vector<OGMTypes> $vector */
-            $vector = new Vector();
+            /** @var array<OGMTypes> $vector */
+            $vector = [];
             /** @var mixed $x */
             foreach ($value as $x) {
-                $vector->push($this->mapValueToType($x));
+                $vector[] = $this->mapValueToType($x);
             }
 
             return new CypherList($vector);
         }
 
-        /** @var Map<string, OGMTypes> */
-        $map = new Map();
+        /** @var array<string, OGMTypes> */
+        $map = [];
         /**
          * @var string $key
          * @var mixed  $x
          */
         foreach ($value as $key => $x) {
-            $map->put($key, $this->mapValueToType($x));
+            $map[$key] = $this->mapValueToType($x);
         }
 
         return new CypherMap($map);
diff --git a/src/Formatter/Specialised/HttpOGMArrayTranslator.php b/src/Formatter/Specialised/HttpOGMArrayTranslator.php
@@ -43,17 +43,17 @@ private function relationship(Iterator $relationship): Relationship
     {
         $rel = $relationship->current();
         $relationship->next();
-        /** @var Map<string, OGMTypes> $map */
-        $map = new Map();
+        /** @var array<string, OGMTypes> $map */
+        $map = [];
         foreach ($rel['properties'] ?? [] as $key => $x) {
             // We only need to recurse over array types.
             // Nested types gets erased in the legacy http api.
             // We need to use JOLT instead for finer control,
             // which will be a different translator.
             if (is_array($x)) {
-                $map->put($key, $this->translateContainer($x));
+                $map[$key] = $this->translateContainer($x);
             } else {
-                $map->put($key, $x);
+                $map[$key] = $x;
             }
         }
 
@@ -73,18 +73,18 @@ private function relationship(Iterator $relationship): Relationship
      */
     private function translateCypherList(array $value): CypherList
     {
-        /** @var Vector<OGMTypes> $tbr */
-        $tbr = new Vector();
+        /** @var array<OGMTypes> $tbr */
+        $tbr = [];
         foreach ($value as $x) {
             // We only need to recurse over array types.
             // Nested types gets erased in the legacy http api.
             // We need to use JOLT instead for finer control,
             // which will be a different translator.
             if (is_array($x)) {
                 /** @var array<array-key, array|scalar|null> $x */
-                $tbr->push($this->translateContainer($x));
+                $tbr[] = $this->translateContainer($x);
             } else {
-                $tbr->push($x);
+                $tbr[] = $x;
             }
         }
 
@@ -129,11 +129,11 @@ public function translate(Iterator $meta, Iterator $relationship, array $nodes,
      */
     private function translateNode(array $nodes, int $id, CypherMap $tbr): Node
     {
-        /** @var Vector<string> */
-        $labels = new Vector();
+        /** @var list<string> */
+        $labels = [];
         foreach ($nodes as $node) {
             if ((int) $node['id'] === $id) {
-                $labels = new Vector($node['labels']);
+                $labels = $node['labels'];
                 break;
             }
         }
diff --git a/src/Formatter/SummarizedResultFormatter.php b/src/Formatter/SummarizedResultFormatter.php
@@ -83,7 +83,7 @@ public function formatHttpStats(array $response, ConnectionInterface $connection
         $summary = new ResultSummary(
             $counters,
             $connection->getDatabaseInfo(),
-            new CypherList(new Vector()),
+            new CypherList(),
             null,
             null,
             $statement,
@@ -149,7 +149,7 @@ public function formatBoltResult(array $meta, array $results, ConnectionInterfac
         $summary = new ResultSummary(
             $counters,
             $connection->getDatabaseInfo(),
-            new CypherList(new Vector()),
+            new CypherList(),
             null,
             null,
             $statement,
@@ -169,14 +169,14 @@ 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<T>> */
-        $tbr = new Vector();
+        /** @var list<SummarizedResult<T>> */
+        $tbr = [];
 
         $toDecorate = $this->formatter->formatHttpResult($response, $body, $connection, $resultsAvailableAfter, $resultsConsumedAfter, $statements);
         $i = 0;
         foreach ($statements as $statement) {
             $result = $body['results'][$i];
-            $tbr->push($this->formatHttpStats($result, $connection, $statement, $resultsAvailableAfter, $resultsConsumedAfter, $toDecorate->get($i)));
+            $tbr[] = $this->formatHttpStats($result, $connection, $statement, $resultsAvailableAfter, $resultsConsumedAfter, $toDecorate->get($i));
             ++$i;
         }
 
