fix

Author: hkulekci

.env.test.example

@@ -0,0 +1,3 @@
+QDRANT_URL=127.0.0.1
+QDRANT_API_KEY=
+QDRANT_CLUSTER_MODE=false

.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

.gitignore

@@ -4,3 +4,4 @@ vendor/
 coverage
 /composer.lock
 /.idea
+.env.test

composer.json

@@ -16,7 +16,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",
-        "mockery/mockery": "^1.5",
+        "mockery/mockery": "^1.6",
         "phpunit/php-code-coverage": "^10.1@dev",
         "symfony/http-client": "^6.4.3|^7.1.0",
         "nyholm/psr7": "^1.8@dev",

phpunit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
+         bootstrap="tests/bootstrap.php"
          cacheDirectory=".phpunit.cache"
          executionOrder="depends,defects"
          beStrictAboutCoverageMetadata="true"

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/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 [

src/Models/VectorStructInterface.php

@@ -7,7 +7,7 @@ interface VectorStructInterface
     /**
      * Get the name of the vector
      *
-     * @return string
+     * @return string|null
      */
     public function getName(): ?string;
 
@@ -17,7 +17,7 @@ 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.

tests/Integration/AbstractIntegration.php

@@ -25,7 +25,15 @@ abstract class AbstractIntegration extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $config = (new Config('127.0.0.1'));
+
+        $qdrantUrl = getenv('QDRANT_URL') ?: '127.0.0.1';
+        $qdrantApiKey = getenv('QDRANT_API_KEY') ?: '';
+
+        $config = new Config($qdrantUrl);
+        if ($qdrantApiKey) {
+            $config->setApiKey($qdrantApiKey);
+        }
+
         $transform = (new Builder())->build($config);
         $this->client = new Qdrant($transform);
     }
@@ -40,7 +48,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)

tests/Integration/ClientTest.php

@@ -25,7 +25,11 @@ class ClientTest extends AbstractIntegration
 {
     public function testClient(): void
     {
-        $config = (new Config('127.0.0.1'));
+        $qdrantUrl = getenv('QDRANT_URL') ?: '127.0.0.1';
+        $qdrantApiKey = getenv('QDRANT_API_KEY') ?: null;
+
+        $config = (new Config($qdrantUrl));
+        $config->setApiKey($qdrantApiKey);
         $transform = (new Builder())->build($config);
         $client = new Qdrant($transform);
         $httpFactory = Psr17FactoryDiscovery::findRequestFactory();
@@ -40,7 +44,11 @@ public function testClient(): void
      */
     public function testClientService(): void
     {
-        $config = (new Config('127.0.0.1'));
+        $qdrantUrl = getenv('QDRANT_URL') ?: '127.0.0.1';
+        $qdrantApiKey = getenv('QDRANT_API_KEY') ?: null;
+
+        $config = (new Config($qdrantUrl));
+        $config->setApiKey($qdrantApiKey);
         $transform = (new Builder())->build($config);
         $client = new Qdrant($transform);
 
@@ -50,7 +58,6 @@ public function testClientService(): void
 
         $collections = $client->collections();
         $collections->setCollectionName('sample-collection');
-        $this->assertInstanceOf(Collections::class, $collections);
         $this->assertEquals('sample-collection', $collections->getCollectionName());
     }
 }