fixes #41 (#42)

* fixes #41

Author: transistive

psalm.xml

@@ -19,6 +19,6 @@
         </ignoreFiles>
     </projectFiles>
     <stubs>
-        <file name="tools/psalm/vendor/vimeo/psalm/stubs/ext-ds.php"/>
+        <file name="tools/psalm/vendor/vimeo/psalm/stubs/ext-ds.phpstub"/>
     </stubs>
 <plugins><pluginClass class="Psalm\PhpUnitPlugin\Plugin"/></plugins></psalm>

src/Network/Bolt/BoltInjections.php

@@ -101,10 +101,13 @@ public function withAutoRouting($routing): self
 
     public function database(): string
     {
-        if (is_callable($this->database)) {
-            $this->database = call_user_func($this->database);
+        if (is_string($this->database)) {
+            return $this->database;
         }
 
+        /** @var string */
+        $this->database = call_user_func($this->database);
+
         return $this->database;
     }
 

src/Network/Http/HttpInjections.php

@@ -125,10 +125,13 @@ public function requestFactory(): RequestFactoryInterface
 
     public function database(): string
     {
-        if (is_callable($this->database)) {
-            $this->database = call_user_func($this->database);
+        if (is_string($this->database)) {
+            return $this->database;
         }
 
+        /** @var string */
+        $this->database = call_user_func($this->database);
+
         return $this->database;
     }
 

tests/Integration/ComplexQueryTests.php

@@ -123,11 +123,13 @@ private static function generate(): Generator
     public function testInvalidParameters(string $alias): void
     {
         $this->expectException(InvalidArgumentException::class);
+        /** @var iterable<string, iterable<mixed, mixed>|scalar|null> $generator */
+        $generator = self::generate();
         $this->client->run(<<<'CYPHER'
 MERGE (x:Node {slug: 'a'})
 WITH x
 MATCH (x) WHERE x.slug IN $listOrMap RETURN x
-CYPHER, self::generate(), $alias);
+CYPHER, $generator, $alias);
     }
 
     /**

tests/Unit/BoltInjectionsTest.php

@@ -26,6 +26,12 @@ public function testConstruct(): void
         self::assertEquals('abc', $injections->database());
     }
 
+    public function testSystem(): void
+    {
+        $injections = BoltInjections::create('system');
+        self::assertEquals('system', $injections->database());
+    }
+
     public function testWithDatabase(): void
     {
         $injections = new BoltInjections('abc');

tests/Unit/HttpInjectionsTest.php

@@ -29,6 +29,11 @@ public function testConstruct(): void
         self::assertEquals('abc', $injections->database());
     }
 
+    public function testSystem(): void
+    {
+        self::assertEquals('system', HttpInjections::create()->withDatabase('system')->database());
+    }
+
     public function testWithDatabase(): void
     {
         self::assertEquals('test', HttpInjections::create()->withDatabase('test')->database());