correctly handle commit url

Author: transistive

src/Http/HttpSession.php

@@ -26,12 +26,14 @@
 use Laudis\Neo4j\Databags\TransactionConfiguration;
 use Laudis\Neo4j\Enum\AccessMode;
 use Laudis\Neo4j\Types\CypherList;
-use function microtime;
-use function parse_url;
-use const PHP_URL_PATH;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
+use stdClass;
+use function is_object;
+use function microtime;
+use function parse_url;
+use const PHP_URL_PATH;
 
 /**
  * @template T
@@ -76,21 +78,22 @@ final class HttpSession implements SessionInterface
     /**
      * @psalm-mutation-free
      *
-     * @param FormatterInterface<T>              $formatter
+     * @param FormatterInterface<T> $formatter
      * @param Resolvable<StreamFactoryInterface> $factory
-     * @param Resolvable<string>                 $uri
-     * @param Resolvable<RequestFactory>         $requestFactory
+     * @param Resolvable<string> $uri
+     * @param Resolvable<RequestFactory> $requestFactory
      */
     public function __construct(
-        Resolvable $factory,
-        HttpConnectionPool $manager,
-        SessionConfiguration $config,
-        FormatterInterface $formatter,
-        Resolvable $requestFactory,
-        Resolvable $uri,
+        Resolvable            $factory,
+        HttpConnectionPool    $manager,
+        SessionConfiguration  $config,
+        FormatterInterface    $formatter,
+        Resolvable            $requestFactory,
+        Resolvable            $uri,
         AuthenticateInterface $auth,
-        string $userAgent
-    ) {
+        string                $userAgent
+    )
+    {
         $this->streamFactory = $factory;
         $this->config = $config;
         $this->pool = $manager;
@@ -131,7 +134,7 @@ public function openTransaction(iterable $statements = null, ?TransactionConfigu
 
     public function writeTransaction(callable $tsxHandler, ?TransactionConfiguration $config = null)
     {
-        return TransactionHelper::retry(fn () => $this->openTransaction(), $tsxHandler);
+        return TransactionHelper::retry(fn() => $this->openTransaction(), $tsxHandler);
     }
 
     public function readTransaction(callable $tsxHandler, ?TransactionConfiguration $config = null)
@@ -171,11 +174,21 @@ public function beginTransaction(?iterable $statements = null, ?TransactionConfi
     {
         $request = $this->requestFactory->resolve()->createRequest('POST', $this->uri->resolve());
         $connection = $this->pool->acquire($request->getUri(), $this->auth, $this->config);
+
+        $request = $this->formatter->decorateRequest($request, $connection);
         $request->getBody()->write(HttpHelper::statementsToJson($connection, $this->formatter, $statements ?? []));
         $response = $connection->getImplementation()->sendRequest($request);
 
-        /** @var string */
-        $url = HttpHelper::interpretResponse($response)->commit;
+        $response = HttpHelper::interpretResponse($response);
+        /** @var stdClass|null $info */
+        $info = $response->info;
+        if (is_object($info)) {
+            /** @var string */
+            $url = $info->commit;
+        } else {
+            /** @var string */
+            $url = $response->commit;
+        }
         $path = str_replace('/commit', '', parse_url($url, PHP_URL_PATH));
         $uri = $request->getUri()->withPath($path);
         $request = $request->withUri($uri);
@@ -200,7 +213,7 @@ private function makeTransaction(ConnectionInterface $connection, RequestInterfa
 
     private function instantCommitRequest(RequestInterface $request): RequestInterface
     {
-        $path = $request->getUri()->getPath().'/commit';
+        $path = $request->getUri()->getPath() . '/commit';
         $uri = $request->getUri()->withPath($path);
 
         return $request->withUri($uri);