fixed fix-cs and psalm errors

Author: p123-stack

src/Bolt/BoltConnection.php

@@ -334,12 +334,12 @@ public function close(): void
     {
         try {
             if ($this->isOpen()) {
-                if ($this->isStreaming() && ($this->connectionUsed['reader'] || $this->connectionUsed['writer'])) {
+                if ($this->isStreaming() && (($this->connectionUsed['reader'] ?? false) || ($this->connectionUsed['writer'] ?? false))) {
                     $this->discardUnconsumedResults();
                 }
 
                 // Only send GOODBYE if the connection was ever used
-                if ($this->connectionUsed['reader'] || $this->connectionUsed['writer']) {
+                if (($this->connectionUsed['reader'] ?? false) || ($this->connectionUsed['writer'] ?? false)) {
                     $message = $this->messageFactory->createGoodbyeMessage();
                     $message->send();
                 }
@@ -351,7 +351,6 @@ public function close(): void
         }
     }
 
-
     private function buildRunExtra(
         ?string $database,
         ?float $timeout,
@@ -462,16 +461,19 @@ public function discardUnconsumedResults(): void
 
         if (empty($this->subscribedResults)) {
             $this->logger?->log(LogLevel::DEBUG, 'No unconsumed results to discard');
+
             return;
         }
 
         $state = $this->getServerState();
         $this->logger?->log(LogLevel::DEBUG, "Server state before discard: {$state}");
 
         // Skip discard if this connection was never used
-        if (!$this->connectionUsed['reader'] && !$this->connectionUsed['writer']) {
+        // Skip discard if this connection was never used
+        if (!($this->connectionUsed['reader'] ?? false) && !($this->connectionUsed['writer'] ?? false)) {
             $this->logger?->log(LogLevel::DEBUG, 'Skipping discard - connection never used');
             $this->subscribedResults = [];
+
             return;
         }
 

src/Bolt/Session.php

@@ -58,7 +58,6 @@ public function __construct(
         private readonly SummarizedResultFormatter $formatter,
     ) {
         $this->bookmarkHolder = new BookmarkHolder(Bookmark::from($config->getBookmarks()));
-
     }
 
     /**

src/Contracts/DriverInterface.php

@@ -13,7 +13,6 @@
 
 namespace Laudis\Neo4j\Contracts;
 
-use Laudis\Neo4j\Databags\ServerInfo;
 use Laudis\Neo4j\Databags\SessionConfiguration;
 use Laudis\Neo4j\Types\CypherList;
 use Laudis\Neo4j\Types\CypherMap;

testkit-backend/src/Handlers/GetServerInfo.php

@@ -37,8 +37,9 @@
 final class GetServerInfo implements RequestHandlerInterface
 {
     public function __construct(
-        private MainRepository $repository
-    ) {}
+        private MainRepository $repository,
+    ) {
+    }
 
     /**
      * @param GetServerInfoRequest $request
@@ -53,7 +54,6 @@ public function handle($request): TestkitResponseInterface
             }
 
             return $this->getServerInfoFromSession($driver);
-
         } catch (Exception $e) {
             $uuid = Uuid::v4();
 
@@ -81,6 +81,7 @@ private function getServerInfoFromDriver($driver): ServerInfoResponse
         try {
             $pool = $this->getConnectionPool($driver);
             $connection = $this->acquireConnectionFromPool($pool, SessionConfiguration::default());
+
             return new ServerInfoResponse($this->extractServerInfo($connection));
         } finally {
             if ($connection !== null && $pool !== null) {
@@ -120,15 +121,7 @@ private function acquireConnectionFromPool($pool, SessionConfiguration $sessionC
         if (method_exists($pool, 'getRoutingTable')) {
             $routingTable = $pool->getRoutingTable();
             if ($routingTable !== null && empty($routingTable->getReaders())) {
-                throw new Neo4jException([
-                    new Neo4jError(
-                        'No readers available in routing table',
-                        'N/A',
-                        'ClientError',
-                        'Routing',
-                        'RoutingTable'
-                    )
-                ]);
+                throw new Neo4jException([new Neo4jError('No readers available in routing table', 'N/A', 'ClientError', 'Routing', 'RoutingTable')]);
             }
         }
 
@@ -153,8 +146,8 @@ private function extractServerInfo($connection): ServerInfo
             }
         }
 
-        $address  = $connection->getServerAddress();
-        $agent    = $connection->getServerAgent();
+        $address = $connection->getServerAddress();
+        $agent = $connection->getServerAgent();
         $protocol = $connection->getProtocol();
 
         if (empty($address) || empty($agent)) {
@@ -178,6 +171,7 @@ private function getServerInfoFromSession($driver): ServerInfoResponse
 
         try {
             $result = $session->run('RETURN 1');
+
             return new ServerInfoResponse($result->summary()->getServerInfo());
         } finally {
             $session->close();

testkit-backend/src/RequestFactory.php

@@ -13,7 +13,6 @@
 
 namespace Laudis\Neo4j\TestkitBackend;
 
-use Laudis\Neo4j\TestkitBackend\Requests\GetServerInfoRequest;
 use function is_string;
 
 use Laudis\Neo4j\TestkitBackend\Requests\AuthorizationTokenRequest;
@@ -23,6 +22,7 @@
 use Laudis\Neo4j\TestkitBackend\Requests\ForcedRoutingTableUpdateRequest;
 use Laudis\Neo4j\TestkitBackend\Requests\GetFeaturesRequest;
 use Laudis\Neo4j\TestkitBackend\Requests\GetRoutingTableRequest;
+use Laudis\Neo4j\TestkitBackend\Requests\GetServerInfoRequest;
 use Laudis\Neo4j\TestkitBackend\Requests\NewDriverRequest;
 use Laudis\Neo4j\TestkitBackend\Requests\NewSessionRequest;
 use Laudis\Neo4j\TestkitBackend\Requests\ResolverResolutionCompletedRequest;

testkit-backend/src/Responses/ServerInfoResponse.php

@@ -28,7 +28,7 @@ final class ServerInfoResponse implements TestkitResponseInterface
     public function __construct(ServerInfo $serverInfo)
     {
         $uri = $serverInfo->getAddress();
-        $this->address = $uri->getHost() . ':' . $uri->getPort();
+        $this->address = $uri->getHost().':'.$uri->getPort();
 
         $this->agent = $serverInfo->getAgent();
 

testkit-backend/testkit.sh

@@ -152,6 +152,5 @@ python3 -m unittest tests.stub.connectivity_check.test_get_server_info.TestGetSe
 python3 -m unittest tests.stub.connectivity_check.test_get_server_info.TestGetServerInfo.test_routing_no_server
 
 
-
 exit $EXIT_CODE