chore: Fix CS and Psalm

Author: p123-stack

composer.json

@@ -78,5 +78,9 @@
         "platform": {
             "php": "8.1.17"
         }
+    },
+    "scripts": {
+        "fix-cs": "./vendor/bin/php-cs-fixer fix",
+        "psalm": "./vendor/bin/psalm"
     }
 }

src/Bolt/ConnectionPool.php

@@ -23,11 +23,7 @@
 use Laudis\Neo4j\Databags\ConnectionRequestData;
 use Laudis\Neo4j\Databags\DriverConfiguration;
 use Laudis\Neo4j\Databags\SessionConfiguration;
-
 use Laudis\Neo4j\Exception\ConnectionPoolException;
-use function method_exists;
-use function microtime;
-
 use Psr\Http\Message\UriInterface;
 
 use function shuffle;
@@ -45,7 +41,7 @@ public function __construct(
         private readonly BoltFactory $factory,
         private readonly ConnectionRequestData $data,
         private readonly ?Neo4jLogger $logger,
-        private readonly float $acquireConnectionTimeout
+        private readonly float $acquireConnectionTimeout,
     ) {
     }
 
@@ -72,6 +68,9 @@ public static function create(
 
     public function acquire(SessionConfiguration $config): Generator
     {
+        /**
+         * @var Generator<int, float, bool, BoltConnection>
+         */
         return (function () use ($config) {
             $connection = $this->reuseConnectionIfPossible($config);
             if ($connection !== null) {
@@ -93,7 +92,7 @@ public function acquire(SessionConfiguration $config): Generator
 
                     $generator->next();
                 } else {
-                    throw new ConnectionPoolException('Connection acquire timeout reached: ' . $waitTime);
+                    throw new ConnectionPoolException('Connection acquire timeout reached: '.($waitTime ?? 0.0));
                 }
             }
 
@@ -127,7 +126,7 @@ public function getLogger(): ?Neo4jLogger
         return $this->logger;
     }
 
-    private function reuseConnectionIfPossible(SessionConfiguration $config): ?ConnectionInterface
+    private function reuseConnectionIfPossible(SessionConfiguration $config): ?BoltConnection
     {
         // Ensure random connection reuse before picking one.
         shuffle($this->activeConnections);

src/Bolt/Messages/BoltCommitMessage.php

@@ -40,6 +40,11 @@ public function send(): BoltCommitMessage
     {
         $this->logger?->log(LogLevel::DEBUG, 'COMMIT');
         $response = $this->protocol->commit()->getResponse();
+        // TODO: This is an issue with the underlying bolt library.
+        // The serverState should be READY after a successful commit but
+        // it's still in TX_STREAMING if the results were not consumed
+        //
+        // This should be removed once it's fixed
         $this->protocol->serverState = ServerState::READY;
 
         /** @var array{bookmark?: string} $content */

src/Bolt/Session.php

@@ -163,9 +163,13 @@ private function beginInstantTransaction(
     private function acquireConnection(TransactionConfiguration $config, SessionConfiguration $sessionConfig): BoltConnection
     {
         $this->getLogger()?->log(LogLevel::INFO, 'Acquiring connection', ['config' => $config, 'sessionConfig' => $sessionConfig]);
-        $connection = $this->pool->acquire($sessionConfig);
-        /** @var BoltConnection $connection */
-        $connection = GeneratorHelper::getReturnFromGenerator($connection);
+        $connectionGenerator = $this->pool->acquire($sessionConfig);
+        /**
+         * @var BoltConnection $connection
+         *
+         * @psalm-suppress UnnecessaryVarAnnotation
+         */
+        $connection = GeneratorHelper::getReturnFromGenerator($connectionGenerator);
 
         // We try and let the server do the timeout management.
         // Since the client should not run indefinitely, we just add the client side by two, just in case

src/Contracts/ConnectionPoolInterface.php

@@ -35,7 +35,7 @@ interface ConnectionPoolInterface
      *      int,
      *      float,
      *      bool,
-     *      Connection|null
+     *      Connection
      * >
      */
     public function acquire(SessionConfiguration $config): Generator;

src/Exception/ConnectionPoolException.php

@@ -1,8 +1,20 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * This file is part of the Neo4j PHP Client and Driver package.
+ *
+ * (c) Nagels <https://nagels.tech>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Laudis\Neo4j\Exception;
 
-final class ConnectionPoolException extends \RuntimeException
-{
+use RuntimeException;
 
+final class ConnectionPoolException extends RuntimeException
+{
 }

src/Neo4j/Neo4jConnectionPool.php

@@ -143,7 +143,11 @@ public function acquire(SessionConfiguration $config): Generator
                     $this->data->getUri()->withHost($address)
                 );
                 try {
-                    /** @var BoltConnection $connection */
+                    /**
+                     * @var BoltConnection $connection
+                     *
+                     * @psalm-suppress UnnecessaryVarAnnotation
+                     */
                     $connection = GeneratorHelper::getReturnFromGenerator($pool->acquire($config));
                     $table = $this->routingTable($connection, $config);
                 } catch (ConnectException $e) {

tests/Integration/EdgeCasesTest.php

@@ -105,7 +105,7 @@ public function testRunALotOfStatements(): void
         $count = 0;
         foreach ($personIds as $personId) {
             foreach ($movieIds as $movieId) {
-                $count++;
+                ++$count;
                 $this->getSession()->runStatement(Statement::create(
                     'MATCH (a), (b) WHERE id(a) = $ida AND id(b) = $idb MERGE (a) <-[r:ACTED_IN]- (b) RETURN id(r)',
                     ['ida' => $personId, 'idb' => $movieId]