improve types

Author: DavidBadura

src/BulkWriteResult.php

@@ -4,20 +4,20 @@
 
 namespace Patchlevel\Rango;
 
-final class BulkWriteResult
+final readonly class BulkWriteResult
 {
     /**
      * @param array<int, mixed> $insertedIds
      * @param array<int, mixed> $upsertedIds
      */
     public function __construct(
-        private readonly int $insertedCount,
-        private readonly int $matchedCount,
-        private readonly int $modifiedCount,
-        private readonly int $deletedCount,
-        private readonly int $upsertedCount,
-        private readonly array $insertedIds,
-        private readonly array $upsertedIds,
+        private int $insertedCount,
+        private int $matchedCount,
+        private int $modifiedCount,
+        private int $deletedCount,
+        private int $upsertedCount,
+        private array $insertedIds,
+        private array $upsertedIds,
     ) {
     }
 

src/Client.php

@@ -6,7 +6,6 @@
 
 use Patchlevel\Rango\Sql\Identifier;
 use PDO;
-
 use function sprintf;
 
 final class Client
@@ -34,6 +33,16 @@ public function selectDatabase(string $name): Database
         return $this->getDatabase($name);
     }
 
+    /**
+     * @template TDocument of array<string, mixed>
+     *
+     * @return Collection<TDocument>
+     */
+    public function selectCollection(string $databaseName, string $collectionName): Collection
+    {
+        return $this->getDatabase($databaseName)->getCollection($collectionName);
+    }
+
     public function dropDatabase(string $name): void
     {
         SqlRunner::exec($this->pdo, sprintf('DROP SCHEMA IF EXISTS %s CASCADE', Identifier::quote($name)));

src/Collection.php

@@ -72,16 +72,16 @@ public function findOne(array $filter = [], array $options = []): array|null
     }
 
     /**
-     * @param list<array<string, mixed>> $documents
-     * @param array<string, mixed>       $options
+     * @param list<TDocument>      $documents
+     * @param array<string, mixed> $options
      */
     public function insertMany(array $documents, array $options = []): InsertManyResult
     {
         return $this->client->run(new Operation\InsertMany($this->databaseName, $this->collectionName, $documents, $options));
     }
 
     /**
-     * @param array<string, mixed> $document
+     * @param TDocument            $document
      * @param array<string, mixed> $options
      */
     public function insertOne(array $document, array $options = []): InsertOneResult
@@ -91,7 +91,7 @@ public function insertOne(array $document, array $options = []): InsertOneResult
 
     /**
      * @param array<string, mixed> $filter
-     * @param array<string, mixed> $replacement
+     * @param TDocument            $replacement
      * @param array<string, mixed> $options
      */
     public function replaceOne(array $filter, array $replacement, array $options = []): UpdateResult
@@ -161,7 +161,7 @@ public function findOneAndDelete(array $filter, array $options = []): array|null
 
     /**
      * @param array<string, mixed> $filter
-     * @param array<string, mixed> $replacement
+     * @param TDocument            $replacement
      * @param array<string, mixed> $options
      *
      * @return TDocument|null

src/Cursor.php

@@ -24,11 +24,11 @@
  * @template TDocument of array<string, mixed>
  * @implements IteratorAggregate<int, TDocument>
  */
-class Cursor implements IteratorAggregate, Countable
+final readonly class Cursor implements IteratorAggregate, Countable
 {
     /** @param list<string>|PDOStatement $data */
     public function __construct(
-        private readonly array|PDOStatement $data = [],
+        private array|PDOStatement $data = [],
     ) {
     }
 
@@ -62,24 +62,20 @@ public function count(): int
         return count($this->data);
     }
 
-    /** @return array<int|string, TDocument> */
+    /** @return list<TDocument> */
     public function toArray(): array
     {
         if ($this->data instanceof PDOStatement) {
-            $data = array_map(
+            return array_map(
                 fn ($item) => $this->decode(is_string($item) ? $item : ''),
                 $this->data->fetchAll(PDO::FETCH_COLUMN),
             );
-
-            return $data;
         }
 
-        $data = array_map(
+        return array_map(
             fn (string $item) => $this->decode($item),
             $this->data,
         );
-
-        return $data;
     }
 
     /** @return array<string, mixed> */

src/Database.php

@@ -12,13 +12,21 @@ public function __construct(
     ) {
     }
 
-    /** @return Collection<array<string, mixed>> */
+    /**
+     * @template TDocument of array<string, mixed>
+     *
+     * @return Collection<TDocument>
+     */
     public function getCollection(string $collectionName): Collection
     {
         return new Collection($this->client, $this->databaseName, $collectionName);
     }
 
-    /** @return Collection<array<string, mixed>> */
+    /**
+     * @template TDocument of array<string, mixed>
+     *
+     * @return Collection<TDocument>
+     */
     public function selectCollection(string $collectionName): Collection
     {
         return $this->getCollection($collectionName);

src/DeleteResult.php

@@ -4,10 +4,10 @@
 
 namespace Patchlevel\Rango;
 
-final class DeleteResult
+final readonly class DeleteResult
 {
     public function __construct(
-        private readonly int $deletedCount,
+        private int $deletedCount,
     ) {
     }
 

src/InsertManyResult.php

@@ -6,11 +6,11 @@
 
 use function count;
 
-final class InsertManyResult
+final readonly class InsertManyResult
 {
     /** @param array<int, mixed> $insertedIds */
     public function __construct(
-        private readonly array $insertedIds,
+        private array $insertedIds,
     ) {
     }
 

src/InsertOneResult.php

@@ -4,10 +4,10 @@
 
 namespace Patchlevel\Rango;
 
-final class InsertOneResult
+final readonly class InsertOneResult
 {
     public function __construct(
-        private readonly mixed $insertedId,
+        private mixed $insertedId,
     ) {
     }
 

src/Query/AggregationBuilder.php

@@ -17,12 +17,12 @@
 use function str_replace;
 use function str_starts_with;
 
-final class AggregationBuilder
+final readonly class AggregationBuilder
 {
     public function __construct(
-        private readonly PDO $pdo,
-        private readonly FilterBuilder $filterBuilder,
-        private readonly ProjectionBuilder $projectionBuilder,
+        private PDO $pdo,
+        private FilterBuilder $filterBuilder,
+        private ProjectionBuilder $projectionBuilder,
     ) {
     }
 

src/Query/FilterBuilder.php

@@ -19,10 +19,10 @@
 use function str_contains;
 use function str_starts_with;
 
-final class FilterBuilder
+final readonly class FilterBuilder
 {
     public function __construct(
-        private readonly PDO $pdo,
+        private PDO $pdo,
     ) {
     }