Merge pull request #61 from adrmrn/php84-compatibility

Make package compatible with PHP 8.4

.github/workflows/test.yaml

@@ -19,6 +19,7 @@ jobs:
           - php-version: '8.1'
           - php-version: '8.2'
           - php-version: '8.3'
+          - php-version: '8.4'
     services:
       qdrant:
         image: qdrant/qdrant

src/Endpoints/Collections/Points.php

@@ -50,7 +50,7 @@ public function search(SearchRequest $searchParams, array $queryParams = []): Re
     /**
      * @throws InvalidArgumentException
      */
-    public function scroll(Filter|ScrollRequest $scrollParams = null, array $queryParams = []): Response
+    public function scroll(Filter|ScrollRequest|null $scrollParams = null, array $queryParams = []): Response
     {
         $body = [];
         if ($scrollParams instanceof Filter) {
@@ -133,7 +133,7 @@ public function id(int|string $id, array $queryParams = []): Response
     /**
      * @throws InvalidArgumentException
      */
-    public function count(Filter $filter = null, $exact = false): Response
+    public function count(?Filter $filter = null, $exact = false): Response
     {
         $body = [
             'exact' => $exact,

src/Endpoints/Collections/Points/Payload.php

@@ -37,10 +37,11 @@ public function clear(array $points): Response
      * @param array $points
      * @param array $keys
      * @param Filter|null $filter
+     * @param array $queryParams
      * @return Response
      * @throws InvalidArgumentException
      */
-    public function delete(array $points, array $keys, Filter $filter = null, array $queryParams = []): Response
+    public function delete(array $points, array $keys, ?Filter $filter = null, array $queryParams = []): Response
     {
         $data = [
             'points' => $points,
@@ -75,4 +76,4 @@ public function set(array $points, array $payload, array $queryParams = []): Res
             )
         );
     }
-}
+}

src/Endpoints/Collections/Snapshots.php

@@ -68,7 +68,7 @@ public function download(string $snapshotName): Response
     /**
      * @throws InvalidArgumentException
      */
-    public function recover(bool $wait = null): Response
+    public function recover(?bool $wait = null): Response
     {
         return $this->client->execute(
             $this->createRequest(
@@ -77,4 +77,4 @@ public function recover(bool $wait = null): Response
             )
         );
     }
-}
+}

src/Http/Builder.php

@@ -15,7 +15,7 @@
 class Builder
 {
     protected ?ClientInterface $client;
-    public function __construct(ClientInterface $client = null) {
+    public function __construct(?ClientInterface $client = null) {
         $this->client = $client ?: Psr18ClientDiscovery::find();
     }
 
@@ -26,4 +26,4 @@ public function build(Config $config): Transport
             $config
         );
     }
-}
+}

src/Models/MultiVectorStruct.php

@@ -29,7 +29,7 @@ public function getName(): ?string
         return array_key_first($this->vectors);
     }
 
-    public function toSearchArray(string $name = null): array
+    public function toSearchArray(?string $name = null): array
     {
         // Throw an error if no name is given
         if ($name === null) {

src/Models/Request/CreateCollection.php

@@ -37,7 +37,7 @@ class CreateCollection implements RequestModel
 
     protected ?QuantizationConfig $quantizationConfig = null;
 
-    public function addVector(VectorParams $vectorParams, string $name = null): CreateCollection
+    public function addVector(VectorParams $vectorParams, ?string $name = null): CreateCollection
     {
         if ($name !== null) {
             $this->vectors[$name] = $vectorParams->toArray();
@@ -150,4 +150,4 @@ public function toArray(): array
 
         return $data;
     }
-}
+}

src/Models/Request/CreateIndex.php

@@ -11,7 +11,7 @@ class CreateIndex implements RequestModel
     protected string $fieldName;
     protected ?array $fieldSchema;
 
-    public function __construct(string $fieldName, array|string $fieldSchema = null)
+    public function __construct(string $fieldName, array|string|null $fieldSchema = null)
     {
         if (is_string($fieldSchema)) {
             $this->fieldSchema = [
@@ -31,4 +31,4 @@ public function toArray(): array
             'field_schema' => $this->fieldSchema
         ]);
     }
-}
+}

src/Models/VectorStruct.php

@@ -26,7 +26,7 @@ public function getName(): ?string
         return $this->name;
     }
 
-    public function toSearchArray(string $name = null): array
+    public function toSearchArray(?string $name = null): array
     {
         if ($this->isNamed()) {
             return [
@@ -46,4 +46,4 @@ public function toArray(): array
         }
         return $this->vector;
     }
-}
+}

src/Models/VectorStructInterface.php

@@ -17,12 +17,12 @@ public function getName(): ?string;
      * @param string|null $name
      * @return array
      */
-    public function toSearchArray(string $name = null): array;
+    public function toSearchArray(?string $name = null): array;
 
     /**
      * Convert this vector an array for Point and PointsBatch.
      *
      * @return array
      */
     public function toArray(): array;
-}
+}

src/Qdrant.php

@@ -20,7 +20,7 @@ public function __construct(private readonly Transport $transport)
     {
     }
 
-    public function collections(string $collectionName = null): Collections
+    public function collections(?string $collectionName = null): Collections
     {
         return (new Collections($this))->setCollectionName($collectionName);
     }
@@ -60,4 +60,4 @@ public function execute(RequestInterface $request): Response
 
         return new Response($res);
     }
-}
+}

tests/Integration/AbstractIntegration.php

@@ -40,7 +40,7 @@ private static function sampleCollectionOption(): CreateCollection
             ->addVector(new VectorParams(3, VectorParams::DISTANCE_COSINE), 'text');
     }
 
-    protected function createCollections($name, CreateCollection $withConfiguration = null): void
+    protected function createCollections($name, ?CreateCollection $withConfiguration = null): void
     {
         $this->collections = new Collections($this->client);
         $response = $this->collections->setCollectionName($name)
@@ -55,4 +55,4 @@ public function getCollections(string $collectionsName): Collections
 
         return $this->collections;
     }
-}
+}