[DRAFT]: streamlining of driver

.github/workflows/integration-test-aura.yml

@@ -25,15 +25,15 @@ jobs:
       - uses: php-actions/composer@v6
         with:
           progress: yes
-          php_version: 8.0
+          php_version: 8.1
           version: 2
       - name: clean database
         run: CONNECTION=$CONNECTION php tests/clean-database.php
       - uses: php-actions/phpunit@v3
         with:
           configuration: phpunit.xml.dist
-          php_version: 8.0
+          php_version: 8.1
           memory_limit: 1024M
-          version: 9
+          version: 10
           testsuite: Integration
           bootstrap: vendor/autoload.php

.github/workflows/integration-test-cluster-neo4j-4.yml

@@ -12,8 +12,8 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     env:
-      CONNECTION: neo4j://neo4j:testtest@localhost:7688
-    name: "Running on PHP 8.0 in a Neo4j 4.4 cluster"
+      CONNECTION: neo4j://neo4j:testtest@core1:7688
+    name: "Running on PHP 8.1 in a Neo4j 4.4 cluster"
 
     steps:
       - uses: actions/checkout@v2
@@ -25,14 +25,14 @@ jobs:
       - uses: php-actions/composer@v6
         with:
           progress: yes
-          php_version: 8.0
+          php_version: 8.1
           version: 2
       - uses: php-actions/phpunit@v3
         with:
           configuration: phpunit.xml.dist
-          php_version: 8.0
+          php_version: 8.1
           memory_limit: 1024M
-          version: 9
+          version: 10
           testsuite: Integration
           bootstrap: vendor/autoload.php
 

.github/workflows/integration-test-cluster-neo4j-5.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       CONNECTION: neo4j://neo4j:testtest@localhost:7687
-    name: "Running on PHP 8.0 with a Neo4j 5.10-enterprise cluster"
+    name: "Running on PHP 8.1 with a Neo4j 5.10-enterprise cluster"
 
     steps:
       - uses: actions/checkout@v2
@@ -25,14 +25,14 @@ jobs:
       - uses: php-actions/composer@v6
         with:
           progress: yes
-          php_version: 8.0
+          php_version: 8.1
           version: 2
       - uses: php-actions/phpunit@v3
         with:
           configuration: phpunit.xml.dist
-          php_version: 8.0
+          php_version: 8.1
           memory_limit: 1024M
-          version: 9
+          version: 10
           testsuite: Integration
           bootstrap: vendor/autoload.php
 

.github/workflows/unit-test.yml

@@ -23,13 +23,13 @@ jobs:
       - uses: php-actions/composer@v6
         with:
           progress: yes
-          php_version: 8.2
+          php_version: 8.1
           version: 2
       - uses: php-actions/phpunit@v3
         with:
           configuration: phpunit.xml.dist
-          php_version: 8.2
+          php_version: 8.1
           memory_limit: 1024M
-          version: 9
+          version: 10
           testsuite: Unit
           bootstrap: vendor/autoload.php

.gitignore

@@ -13,3 +13,4 @@ composer.lock
 .env
 /docs/_build
 cachegrind.out.*
+.phpunit.cache/

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.0-cli
+FROM php:8.1-cli
 RUN apt-get update \
     && apt-get install -y \
         libzip-dev \

composer.json

@@ -28,11 +28,12 @@
         "psr/http-factory": "^1.0",
         "psr/http-client": "^1.0",
         "php-http/message": "^1.0",
-        "stefanak-michal/bolt": "^6.0",
+        "stefanak-michal/bolt": "^7.0.1",
         "symfony/polyfill-php80": "^1.2",
         "psr/simple-cache": ">=2.0",
         "ext-json": "*",
-        "ext-mbstring": "*"
+        "ext-mbstring": "*",
+        "psr/event-dispatcher": "^1.0"
     },
     "provide": {
         "psr/simple-cache-implementation": "2.0|3.0"
@@ -43,7 +44,7 @@
         "composer-runtime-api": "Install composer 2 for auto detection of version in user agent"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0",
+        "phpunit/phpunit": "^10.0",
         "nyholm/psr7": "^1.3",
         "nyholm/psr7-server": "^1.0",
         "kriswallsmith/buzz": "^1.2",

phpunit.xml.dist

@@ -1,20 +1,17 @@
-<phpunit colors="true" verbose="true"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         convertDeprecationsToExceptions="true"
->
-    <testsuites>
-        <testsuite name="Integration">
-            <directory>./tests/Integration</directory>
-        </testsuite>
-        <testsuite name="Performance">
-            <directory>./tests/Performance</directory>
-        </testsuite>
-        <testsuite name="Unit">
-            <directory>./tests/Unit</directory>
-        </testsuite>
-    </testsuites>
-    <php>
-        <env name="CONNECTION" value="neo4j://neo4j:testtest@localhost" />
-    </php>
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <testsuites>
+    <testsuite name="Integration">
+      <directory>./tests/Integration</directory>
+    </testsuite>
+    <testsuite name="Performance">
+      <directory>./tests/Performance</directory>
+    </testsuite>
+    <testsuite name="Unit">
+      <directory>./tests/Unit</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="CONNECTION" value="neo4j://neo4j:testtest@localhost:11687"/>
+  </php>
 </phpunit>

psalm.xml

@@ -8,7 +8,8 @@
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     hoistConstants="true"
-    errorBaseline="psalm-baseline.xml"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="true"
 >
     <projectFiles>
         <directory name="src"/>

src/Authentication/Authenticate.php

@@ -15,7 +15,6 @@
 
 use function explode;
 
-use Laudis\Neo4j\Contracts\AuthenticateInterface;
 use Psr\Http\Message\UriInterface;
 
 use function substr_count;
@@ -72,7 +71,7 @@ public static function disabled(): NoAuth
      *
      * @pure
      */
-    public static function fromUrl(UriInterface $uri): AuthenticateInterface
+    public static function fromUrl(UriInterface $uri): BasicAuth|NoAuth
     {
         /**
          * @psalm-suppress ImpureMethodCall Uri is a pure object:
@@ -82,7 +81,9 @@ public static function fromUrl(UriInterface $uri): AuthenticateInterface
         $userInfo = $uri->getUserInfo();
 
         if (substr_count($userInfo, ':') === 1) {
-            [$user, $pass] = explode(':', $userInfo);
+            /** @var array{0: string, 1: string} $explode */
+            $explode = explode(':', $userInfo);
+            [$user, $pass] = $explode;
 
             return self::basic($user, $pass);
         }