Merge pull request #5 from stefanak-michal/4_bolt_v7

updated to newest version

Author: stefanak-michal

.github/workflows/tests.2204.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.1', '8.2', '8.3']
 
     services:
       memgraph:

README.md

@@ -9,7 +9,7 @@ This library contains wrapper class to cover basic functionality with [Bolt libr
 ## Usage
 
 ```php
-Memgraph::$auth = \Bolt\helpers\Auth::none();
+Memgraph::$auth = ['scheme' => 'none'];
 $rows = Memgraph::query('RETURN $n as num', ['n' => 123]);
 ```
 

composer.json

@@ -8,8 +8,8 @@
     "license": "MIT",
     "minimum-stability": "stable",
     "require": {
-        "php": "^8",
-        "stefanak-michal/bolt": "^6"
+        "php": "^8.1",
+        "stefanak-michal/bolt": "^7"
     },
     "require-dev": {
         "phpunit/phpunit": "^9"

src/Memgraph.php

@@ -2,7 +2,7 @@
 
 use Bolt\Bolt;
 use Bolt\connection\{Socket, StreamSocket};
-use Bolt\protocol\{AProtocol, Response, V4_3, V4_1, V4, V3};
+use Bolt\protocol\{AProtocol, Response, V5_2, V4_3, V4_1, V4};
 
 /**
  * Class Memgraph - adapter for Bolt library
@@ -25,21 +25,21 @@ class Memgraph
 
     /**
      * Set your authentification
-     * @see \Bolt\helpers\Auth
+     * @link https://github.com/neo4j-php/Bolt?tab=readme-ov-file#authentification
      */
     public static array $auth;
 
     public static string $host = '127.0.0.1';
     public static int $port = 7687;
     public static float $timeout = 15;
 
-    private static AProtocol|V4_3|V4_1|V4|V3|null $protocol = null;
+    private static AProtocol|V5_2|V4_3|V4_1|V4|null $protocol = null;
     private static array $statistics;
 
     /**
      * Get connection protocol for bolt communication
      */
-    protected static function getProtocol(): AProtocol|V4_3|V4_1|V4|V3
+    protected static function getProtocol(): AProtocol|V5_2|V4_3|V4_1|V4
     {
         if (is_null(self::$protocol)) {
             try {
@@ -57,10 +57,10 @@ protected static function getProtocol(): AProtocol|V4_3|V4_1|V4|V3
                 self::$protocol = $bolt->setProtocolVersions(5.2, 4.3, 4.1, 4.0)->build();
 
                 if (version_compare(self::$protocol->getVersion(), '5.2', '>=')) {
-                    self::$protocol->hello();
-                    self::$protocol->logon(self::$auth);
+                    self::$protocol->hello()->getResponse();
+                    self::$protocol->logon(self::$auth)->getResponse();
                 } else {
-                    self::$protocol->hello(self::$auth);
+                    self::$protocol->hello(self::$auth)->getResponse();
                 }
 
                 register_shutdown_function(function () {
@@ -91,19 +91,19 @@ public static function query(string $query, array $params = [], array $extra = [
         $run = $all = null;
         try {
             $runResponse = self::getProtocol()->run($query, $params, $extra)->getResponse();
-            if ($runResponse->getSignature() != Response::SIGNATURE_SUCCESS) {
-                throw new Exception(implode(' ', $runResponse->getContent()));
+            if ($runResponse->signature != \Bolt\enum\Signature::SUCCESS) {
+                throw new Exception(implode(' ', $runResponse->content));
             }
-            $run = $runResponse->getContent();
+            $run = $runResponse->content;
 
             foreach (self::getProtocol()->pull()->getResponses() as $response) {
-                if ($response->getSignature() == Response::SIGNATURE_IGNORED || $response->getSignature() == Response::SIGNATURE_FAILURE) {
-                    throw new Exception(implode(' ', $runResponse->getContent()));
+                if ($response->signature == \Bolt\enum\Signature::IGNORED || $response->signature == \Bolt\enum\Signature::FAILURE) {
+                    throw new Exception(implode(' ', $runResponse->content));
                 }
-                $all[] = $response->getContent();
+                $all[] = $response->content;
             }
         } catch (Exception $e) {
-            self::getProtocol()->reset();
+            self::getProtocol()->reset()->getResponse();
             self::handleException($e);
             return [];
         }
@@ -116,7 +116,7 @@ public static function query(string $query, array $params = [], array $extra = [
         if (is_callable(self::$logHandler)) {
             $time = 0;
             foreach ($last as $key => $value) {
-                if (substr($key, -5) == '_time') {
+                if (str_ends_with($key, '_time')) {
                     $time += $value;
                 }
             }
@@ -173,15 +173,15 @@ public static function begin(array $extra = []): bool
     {
         try {
             $response = self::getProtocol()->begin($extra)->getResponse();
-            if ($response->getSignature() != Response::SIGNATURE_SUCCESS) {
-                throw new Exception(implode(' ', $response->getContent()));
+            if ($response->signature != \Bolt\enum\Signature::SUCCESS) {
+                throw new Exception(implode(' ', $response->content));
             }
             if (is_callable(self::$logHandler)) {
                 call_user_func(self::$logHandler, 'BEGIN TRANSACTION');
             }
             return true;
         } catch (Exception $e) {
-            self::getProtocol()->reset();
+            self::getProtocol()->reset()->getResponse();
             self::handleException($e);
         }
         return false;
@@ -196,15 +196,15 @@ public static function commit(): bool
     {
         try {
             $response = self::getProtocol()->commit()->getResponse();
-            if ($response->getSignature() != Response::SIGNATURE_SUCCESS) {
-                throw new Exception(implode(' ', $response->getContent()));
+            if ($response->signature != \Bolt\enum\Signature::SUCCESS) {
+                throw new Exception(implode(' ', $response->content));
             }
             if (is_callable(self::$logHandler)) {
                 call_user_func(self::$logHandler, 'COMMIT TRANSACTION');
             }
             return true;
         } catch (Exception $e) {
-            self::getProtocol()->reset();
+            self::getProtocol()->reset()->getResponse();
             self::handleException($e);
         }
         return false;
@@ -219,15 +219,15 @@ public static function rollback(): bool
     {
         try {
             $response = self::getProtocol()->rollback()->getResponse();
-            if ($response->getSignature() != Response::SIGNATURE_SUCCESS) {
-                throw new Exception(implode(' ', $response->getContent()));
+            if ($response->signature != \Bolt\enum\Signature::SUCCESS) {
+                throw new Exception(implode(' ', $response->content));
             }
             if (is_callable(self::$logHandler)) {
                 call_user_func(self::$logHandler, 'ROLLBACK TRANSACTION');
             }
             return true;
         } catch (Exception $e) {
-            self::getProtocol()->reset();
+            self::getProtocol()->reset()->getResponse();
             self::handleException($e);
         }
         return false;

tests/MemgraphTest.php

@@ -3,7 +3,6 @@
 namespace Memgraph\tests;
 
 use Memgraph;
-use Bolt\helpers\Auth;
 use Bolt\protocol\IStructure;
 use Bolt\protocol\v1\structures\{
     Date,
@@ -23,7 +22,7 @@ class MemgraphTest extends TestCase
     public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
-        Memgraph::$auth = Auth::none();
+        Memgraph::$auth = ['scheme' => 'none'];
     }
 
     /**