Merge remote-tracking branch 'origin/feat/remove-http' into feat/remove-formatter

Author: exaby73

Diff for: .github/workflows/integration-test-single-server.yml

@@ -42,12 +42,6 @@ jobs:
             -e PHP_VERSION=${{ matrix.php }} \
             -e CONNECTION=bolt://neo4j:testtest@neo4j \
             client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
-      - name: Test http://
-        run: |
-          docker compose run \
-            -e PHP_VERSION=${{ matrix.php }} \
-            -e CONNECTION=http://neo4j:testtest@neo4j \
-            client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
   tests-v5:
     runs-on: ubuntu-latest
     strategy:
@@ -81,9 +75,3 @@ jobs:
             -e PHP_VERSION=${{ matrix.php }} \
             -e CONNECTION=bolt://neo4j:testtest@neo4j \
             client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
-      - name: Test http://
-        run: |
-          docker compose run \
-            -e PHP_VERSION=${{ matrix.php }} \
-            -e CONNECTION=http://neo4j:testtest@neo4j \
-            client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration

Diff for: src/Authentication/BasicAuth.php

@@ -13,8 +13,6 @@
 
 namespace Laudis\Neo4j\Authentication;
 
-use function base64_encode;
-
 use Bolt\protocol\V4_4;
 use Bolt\protocol\V5;
 use Bolt\protocol\V5_1;
@@ -25,7 +23,6 @@
 use Laudis\Neo4j\Common\Neo4jLogger;
 use Laudis\Neo4j\Common\ResponseHelper;
 use Laudis\Neo4j\Contracts\AuthenticateInterface;
-use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\UriInterface;
 use Psr\Log\LogLevel;
 
@@ -43,20 +40,6 @@ public function __construct(
         private readonly ?Neo4jLogger $logger,
     ) {}
 
-    public function authenticateHttp(RequestInterface $request, UriInterface $uri, string $userAgent): RequestInterface
-    {
-        $this->logger?->log(LogLevel::DEBUG, 'Authenticating using BasicAuth');
-        $combo = base64_encode($this->username.':'.$this->password);
-
-        /**
-         * @psalm-suppress ImpureMethodCall Request is a pure object:
-         *
-         * @see https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-7-http-message-meta.md#why-value-objects
-         */
-        return $request->withHeader('Authorization', 'Basic '.$combo)
-            ->withHeader('User-Agent', $userAgent);
-    }
-
     /**
      * @throws Exception
      *

Diff for: src/ClientBuilder.php

@@ -41,7 +41,7 @@
  */
 final class ClientBuilder
 {
-    public const SUPPORTED_SCHEMES = ['', 'bolt', 'bolt+s', 'bolt+ssc', 'neo4j', 'neo4j+s', 'neo4j+ssc', 'http', 'https'];
+    public const SUPPORTED_SCHEMES = ['', 'bolt', 'bolt+s', 'bolt+ssc', 'neo4j', 'neo4j+s', 'neo4j+ssc'];
 
     /**
      * @psalm-mutation-free

Diff for: src/Contracts/AuthenticateInterface.php

@@ -19,16 +19,10 @@
 use Bolt\protocol\V5_2;
 use Bolt\protocol\V5_3;
 use Bolt\protocol\V5_4;
-use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\UriInterface;
 
 interface AuthenticateInterface
 {
-    /**
-     * Authenticates a RequestInterface with the provided configuration Uri and userAgent.
-     */
-    public function authenticateHttp(RequestInterface $request, UriInterface $uri, string $userAgent): RequestInterface;
-
     /**
      * Authenticates a Bolt connection with the provided configuration Uri and userAgent.
      *

Diff for: src/Databags/DriverConfiguration.php

@@ -39,16 +39,13 @@ final class DriverConfiguration
     public const DEFAULT_POOL_SIZE = 0x2F;
     public const DEFAULT_CACHE_IMPLEMENTATION = Cache::class;
     public const DEFAULT_ACQUIRE_CONNECTION_TIMEOUT = 2.0;
-    /** @var callable():(HttpPsrBindings|null)|HttpPsrBindings|null */
-    private $httpPsrBindings;
     /** @var callable():(CacheInterface|null)|CacheInterface|null */
     private $cache;
     /** @var callable():(SemaphoreFactoryInterface|null)|SemaphoreFactoryInterface|null */
     private $semaphoreFactory;
     private ?Neo4jLogger $logger;
 
     /**
-     * @param callable():(HttpPsrBindings|null)|HttpPsrBindings|null $httpPsrBindings
      * @param callable():(CacheInterface|null)|CacheInterface|null $cache
      * @param callable():(SemaphoreFactoryInterface|null)|SemaphoreFactoryInterface|null $semaphore
      * @param string|null $logLevel The log level to use. If null, LogLevel::INFO is used.
@@ -57,7 +54,6 @@ final class DriverConfiguration
      */
     public function __construct(
         private string|null $userAgent,
-        callable|HttpPsrBindings|null $httpPsrBindings,
         private SslConfiguration $sslConfig,
         private int|null $maxPoolSize,
         CacheInterface|callable|null $cache,
@@ -66,7 +62,6 @@ public function __construct(
         ?string $logLevel,
         ?LoggerInterface $logger
     ) {
-        $this->httpPsrBindings = $httpPsrBindings;
         $this->cache = $cache;
         $this->semaphoreFactory = $semaphore;
         if ($logger !== null) {
@@ -77,13 +72,10 @@ public function __construct(
     }
 
     /**
-     * @param callable():(HttpPsrBindings|null)|HttpPsrBindings|null $httpPsrBindings
-     *
      * @pure
      */
     public static function create(
         ?string $userAgent,
-        callable|HttpPsrBindings|null $httpPsrBindings,
         SslConfiguration $sslConfig,
         int $maxPoolSize,
         CacheInterface $cache,
@@ -94,7 +86,6 @@ public static function create(
     ): self {
         return new self(
             $userAgent,
-            $httpPsrBindings,
             $sslConfig,
             $maxPoolSize,
             $cache,
@@ -107,15 +98,14 @@ public static function create(
 
     /**
      * Creates a default configuration with a user agent based on the driver version
-     * and HTTP PSR implementation auto-detected from the environment.
+     * auto-detected from the environment.
      *
      * @pure
      */
     public static function default(): self
     {
         return new self(
             null,
-            HttpPsrBindings::default(),
             SslConfiguration::default(),
             null,
             null,
@@ -160,21 +150,6 @@ public function withUserAgent($userAgent): self
         return $tbr;
     }
 
-    /**
-     * Creates a new configuration with the provided bindings.
-     *
-     * @param callable():(HttpPsrBindings|null)|HttpPsrBindings|null $bindings
-     *
-     * @psalm-immutable
-     */
-    public function withHttpPsrBindings($bindings): self
-    {
-        $tbr = clone $this;
-        $tbr->httpPsrBindings = $bindings;
-
-        return $tbr;
-    }
-
     /**
      * @psalm-immutable
      */
@@ -194,15 +169,6 @@ public function getSslConfiguration(): SslConfiguration
         return $this->sslConfig;
     }
 
-    public function getHttpPsrBindings(): HttpPsrBindings
-    {
-        $this->httpPsrBindings = (is_callable($this->httpPsrBindings)) ? call_user_func(
-            $this->httpPsrBindings
-        ) : $this->httpPsrBindings;
-
-        return $this->httpPsrBindings ??= HttpPsrBindings::default();
-    }
-
     public function getMaxPoolSize(): int
     {
         return $this->maxPoolSize ?? self::DEFAULT_POOL_SIZE;

Diff for: src/Databags/HttpPsrBindings.php

@@ -39,6 +39,8 @@ final class DriverFactory
      *
      * @param FormatterInterface<U> $formatter
      *
+     * @throws UnsupportedScheme
+     *
      * @return (
      *           func_num_args() is 4
      *           ? DriverInterface<U>
@@ -62,7 +64,7 @@ public static function create(string|UriInterface $uri, ?DriverConfiguration $co
             return self::createNeo4jDriver($uri, $configuration, $authenticate, $formatter);
         }
 
-        return self::createHttpDriver($uri, $configuration, $authenticate, $formatter);
+        throw UnsupportedScheme::make($scheme, ['bolt', 'bolt+s', 'bolt+ssc', 'neo4j', 'neo4j+s', 'neo4j+ssc']);
     }
 
     /**
@@ -104,26 +106,4 @@ private static function createNeo4jDriver(string|UriInterface $uri, ?DriverConfi
 
         return Neo4jDriver::create($uri, $configuration, $authenticate);
     }
-
-    /**
-     * @template U
-     *
-     * @param FormatterInterface<U> $formatter
-     *
-     * @return (
-     *           func_num_args() is 4
-     *           ? DriverInterface<U>
-     *           : DriverInterface<OGMResults>
-     *           )
-     *
-     * @pure
-     */
-    private static function createHttpDriver(string|UriInterface $uri, ?DriverConfiguration $configuration, ?AuthenticateInterface $authenticate, ?FormatterInterface $formatter = null): DriverInterface
-    {
-        if ($formatter !== null) {
-            return HttpDriver::create($uri, $configuration, $authenticate, $formatter);
-        }
-
-        return HttpDriver::create($uri, $configuration, $authenticate);
-    }
 }

Diff for: src/DriverFactory.php

@@ -41,7 +41,6 @@
  * @method static ConnectionProtocol BOLT_V5_2()
  * @method static ConnectionProtocol BOLT_V5_3()
  * @method static ConnectionProtocol BOLT_V5_4()
- * @method static ConnectionProtocol HTTP()
  *
  * @extends TypedEnum<string>
  *
@@ -62,13 +61,6 @@ final class ConnectionProtocol extends TypedEnum implements JsonSerializable
     private const BOLT_V5_2 = '5.2';
     private const BOLT_V5_3 = '5.3';
     private const BOLT_V5_4 = '5.4';
-    private const HTTP = 'http';
-
-    public function isBolt(): bool
-    {
-        /** @psalm-suppress ImpureMethodCall */
-        return $this !== self::HTTP();
-    }
 
     /**
      * @pure