Fixed test_tx_func_run

Author: p123-stack

src/Authentication/NoAuth.php

@@ -18,6 +18,7 @@
 use Laudis\Neo4j\Bolt\BoltMessageFactory;
 use Laudis\Neo4j\Common\Neo4jLogger;
 use Laudis\Neo4j\Contracts\AuthenticateInterface;
+use Laudis\Neo4j\Enum\ConnectionProtocol;
 use Psr\Http\Message\UriInterface;
 
 use function sprintf;
@@ -38,7 +39,7 @@ public function authenticateBolt(BoltConnection $connection, string $userAgent):
     {
         $factory = $this->createMessageFactory($connection);
 
-        if (method_exists($connection, 'logon')) {
+        if ($connection->getProtocol()->compare(ConnectionProtocol::BOLT_V5_1()) >= 0) {
             $helloMetadata = ['user_agent' => $userAgent];
 
             $factory->createHelloMessage($helloMetadata)->send()->getResponse();

src/Bolt/BoltConnection.php

@@ -29,7 +29,6 @@
 use Laudis\Neo4j\Contracts\ConnectionInterface;
 use Laudis\Neo4j\Databags\BookmarkHolder;
 use Laudis\Neo4j\Databags\DatabaseInfo;
-use Laudis\Neo4j\Databags\Neo4jError;
 use Laudis\Neo4j\Enum\AccessMode;
 use Laudis\Neo4j\Enum\ConnectionProtocol;
 use Laudis\Neo4j\Exception\Neo4jException;

src/Bolt/BoltUnmanagedTransaction.php

@@ -58,9 +58,9 @@ public function __construct(
     /**
      * @param iterable<Statement> $statements
      *
-     * @return CypherList<SummarizedResult>
-     *@throws TransactionException|Throwable
+     * @throws TransactionException|Throwable
      *
+     * @return CypherList<SummarizedResult>
      */
     public function commit(iterable $statements = []): CypherList
     {

src/Bolt/Messages/BoltCommitMessage.php

@@ -15,12 +15,6 @@
 
 use Bolt\enum\ServerState;
 use Bolt\protocol\Response;
-use Bolt\protocol\V4_4;
-use Bolt\protocol\V5;
-use Bolt\protocol\V5_1;
-use Bolt\protocol\V5_2;
-use Bolt\protocol\V5_3;
-use Bolt\protocol\V5_4;
 use Laudis\Neo4j\Bolt\BoltConnection;
 use Laudis\Neo4j\Common\Neo4jLogger;
 use Laudis\Neo4j\Contracts\BoltMessage;

src/Bolt/Session.php

@@ -202,7 +202,7 @@ private function startTransaction(TransactionConfiguration $config, SessionConfi
             $this->config,
             $config,
             $this->bookmarkHolder,
-            new BoltMessageFactory($connection, $this->getLogger()) ,
+            new BoltMessageFactory($connection, $this->getLogger()),
         );
     }
 

src/Databags/Notification.php

@@ -14,16 +14,22 @@
 namespace Laudis\Neo4j\Databags;
 
 use InvalidArgumentException;
+use Laudis\Neo4j\Types\AbstractCypherObject;
 
-final class Notification
+/**
+ * @psalm-immutable
+ *
+ * @template-extends AbstractCypherObject<string, string|Position>
+ */
+final class Notification extends AbstractCypherObject
 {
     public function __construct(
-        private string $severity,
-        private string $description,
-        private string $code,
-        private Position $position,
-        private string $title,
-        private string $category,
+        private readonly string $severity,
+        private readonly string $description,
+        private readonly string $code,
+        private readonly Position $position,
+        private readonly string $title,
+        private readonly string $category,
     ) {
     }
 
@@ -92,9 +98,38 @@ public function getCategory(): string
     }
 
     /**
+     * Matches inherited return type: array<string, string|Position>.
+     *
      * @psalm-external-mutation-free
+     *
+     * @return array<string, string|Position>
      */
     public function toArray(): array
+    {
+        return [
+            'severity' => $this->severity,
+            'description' => $this->description,
+            'code' => $this->code,
+            'position' => $this->position,
+            'title' => $this->title,
+            'category' => $this->category,
+        ];
+    }
+
+    /**
+     * If you still want a version with the position converted to array,
+     * use this custom method instead of overriding toArray().
+     *
+     * @return array{
+     *     severity: string,
+     *     description: string,
+     *     code: string,
+     *     position: array<string, float|int|null|string>,
+     *     title: string,
+     *     category: string
+     * }
+     */
+    public function toSerializedArray(): array
     {
         return [
             'severity' => $this->severity,

src/Databags/PlanArguments.php

@@ -13,7 +13,14 @@
 
 namespace Laudis\Neo4j\Databags;
 
-final class PlanArguments
+use Laudis\Neo4j\Types\AbstractCypherObject;
+
+/**
+ * @psalm-immutable
+ *
+ * @template-extends AbstractCypherObject<string, int|float|string|null>
+ */
+final class PlanArguments extends AbstractCypherObject
 {
     public function __construct(
         public readonly ?int $globalMemory = null,

src/Databags/Position.php

@@ -13,15 +13,19 @@
 
 namespace Laudis\Neo4j\Databags;
 
+use Laudis\Neo4j\Types\AbstractCypherObject;
+
 /**
  * @psalm-immutable
+ *
+ *@template-extends AbstractCypherObject<string, int|float|string|null>
  */
-final class Position
+final class Position extends AbstractCypherObject
 {
     public function __construct(
-        private int $column,
-        private int $offset,
-        private int $line,
+        private readonly int $column,
+        private readonly int $offset,
+        private readonly int $line,
     ) {
     }
 

src/Databags/ProfiledQueryPlan.php

@@ -18,6 +18,8 @@ final class ProfiledQueryPlan
     /**
      * @param list<ProfiledQueryPlan> $children
      * @param list<string>            $identifiers
+     *
+     * @psalm-immutable
      */
     public function __construct(
         public readonly PlanArguments $arguments,

src/Databags/SummarizedResult.php

@@ -34,18 +34,16 @@ final class SummarizedResult extends CypherList
     private array $keys;
 
     /**
-     * @param iterable<mixed, CypherMap<OGMTypes>>|callable():Generator<mixed, CypherMap<OGMTypes>> $iterable
-     * @param list<string> $iterable
-     *
      * @psalm-mutation-free
-     * @param list<string> $keys
-
+     *
+     * @param iterable<mixed, CypherMap<OGMTypes>>|callable():Generator<mixed, CypherMap<OGMTypes>> $iterable
+     * @param list<string>                                                                          $keys
      */
     public function __construct(?ResultSummary &$summary, iterable|callable $iterable = [], array $keys)
     {
         parent::__construct($iterable);
         $this->summary = &$summary;
-        $this->keys = array_values($keys);
+        $this->keys = $keys;
     }
 
     /**