applied changes from php8

Author: stefanak-michal

.github/workflows/db-test-php-7.yml

@@ -8,7 +8,7 @@
     "license": "MIT",
     "minimum-stability": "stable",
     "require": {
-        "php": ">=7.4",
+        "php": ">=8",
         "ext-mbstring": "*"
     },
     "require-dev": {

.github/workflows/no-db-test-php-7.yml

@@ -21,26 +21,18 @@ final class Bolt
 {
     private IPacker $packer;
     private IUnpacker $unpacker;
-    private IConnection $connection;
     private array $versions = [];
     public static bool $debug = false;
     public ServerState $serverState;
 
-    /**
-     * Bolt constructor
-     * @param IConnection $connection
-     * @throws Exception
-     */
-    public function __construct(IConnection $connection)
+    public function __construct(private IConnection $connection)
     {
-        $this->connection = $connection;
         $this->setProtocolVersions(5, 4.4, 4.3);
         $this->setPackStreamVersion();
     }
 
     /**
      * Connect via Connection, execute handshake on it, create and return protocol version class
-     * @return AProtocol
      * @throws Exception
      */
     public function build(): AProtocol
@@ -68,23 +60,14 @@ public function build(): AProtocol
         return new $protocolClass($this->packer, $this->unpacker, $this->connection, $this->serverState);
     }
 
-    /**
-     * @param int|float|string ...$v
-     * @return Bolt
-     */
-    public function setProtocolVersions(...$v): Bolt
+    public function setProtocolVersions(int|float|string ...$v): Bolt
     {
         $this->versions = array_slice($v, 0, 4);
         while (count($this->versions) < 4)
             $this->versions[] = 0;
         return $this;
     }
 
-    /**
-     * @param int $version
-     * @return Bolt
-     * @throws Exception
-     */
     public function setPackStreamVersion(int $version = 1): Bolt
     {
         $packerClass = "\\Bolt\\packstream\\v" . $version . "\\Packer";
@@ -104,7 +87,6 @@ public function setPackStreamVersion(int $version = 1): Bolt
 
     /**
      * @link https://www.neo4j.com/docs/bolt/current/bolt/handshake/
-     * @return string
      * @throws Exception
      */
     private function handshake(): string
@@ -126,8 +108,6 @@ private function handshake(): string
 
     /**
      * Read and compose selected protocol version
-     * @param string $bytes
-     * @return string|null
      */
     private function unpackProtocolVersion(string $bytes): ?string
     {
@@ -147,7 +127,6 @@ private function unpackProtocolVersion(string $bytes): ?string
 
     /**
      * Pack requested protocol versions
-     * @return string
      */
     private function packProtocolVersions(): string
     {

composer.json

@@ -11,33 +11,26 @@
  */
 abstract class AConnection implements IConnection
 {
-    protected string $ip;
-    protected int $port;
-    protected float $timeout;
-
-    /**
-     * @inheritDoc
-     */
-    public function __construct(string $ip = '127.0.0.1', int $port = 7687, float $timeout = 15)
+    public function __construct(
+        protected string $ip = '127.0.0.1',
+        protected int    $port = 7687,
+        protected float  $timeout = 15
+    )
     {
-        if (filter_var($ip, FILTER_VALIDATE_URL)) {
-            $scheme = parse_url($ip, PHP_URL_SCHEME);
+        if (filter_var($this->ip, FILTER_VALIDATE_URL)) {
+            $scheme = parse_url($this->ip, PHP_URL_SCHEME);
             if (!empty($scheme)) {
-                $ip = str_replace($scheme . '://', '', $ip);
+                $this->ip = str_replace($scheme . '://', '', $this->ip);
             }
         }
-
-        $this->ip = $ip;
-        $this->port = $port;
-        $this->timeout = $timeout;
     }
 
     /**
      * Print buffer as HEX
      * @param string $str
      * @param string $prefix
      */
-    protected function printHex(string $str, string $prefix = 'C: ')
+    protected function printHex(string $str, string $prefix = 'C: '): void
     {
         $str = implode(unpack('H*', $str));
         echo '<pre>' . $prefix;
@@ -63,7 +56,7 @@ public function getTimeout(): float
         return $this->timeout;
     }
 
-    public function setTimeout(float $timeout)
+    public function setTimeout(float $timeout): void
     {
         $this->timeout = $timeout;
     }

src/Bolt.php

@@ -20,17 +20,17 @@ public function __construct(string $ip = '127.0.0.1', int $port = 7687, float $t
 
     public function connect(): bool;
 
-    public function write(string $buffer);
+    public function write(string $buffer): void;
 
     public function read(int $length = 2048): string;
 
-    public function disconnect();
+    public function disconnect(): void;
 
     public function getIp(): string;
 
     public function getPort(): int;
 
     public function getTimeout(): float;
 
-    public function setTimeout(float $timeout);
+    public function setTimeout(float $timeout): void;
 }

src/connection/AConnection.php

@@ -16,7 +16,7 @@
 class Socket extends AConnection
 {
     /**
-     * @var resource|object|bool
+     * @var resource|\Socket|bool
      */
     private $socket = false;
 
@@ -60,7 +60,7 @@ public function connect(): bool
      * @param string $buffer
      * @throws ConnectException
      */
-    public function write(string $buffer)
+    public function write(string $buffer): void
     {
         if ($this->socket === false) {
             throw new ConnectException('Not initialized socket');
@@ -107,21 +107,21 @@ public function read(int $length = 2048): string
     /**
      * Close socket connection
      */
-    public function disconnect()
+    public function disconnect(): void
     {
         if ($this->socket !== false) {
             @socket_shutdown($this->socket);
             @socket_close($this->socket);
         }
     }
 
-    public function setTimeout(float $timeout)
+    public function setTimeout(float $timeout): void
     {
         parent::setTimeout($timeout);
         $this->configureTimeout();
     }
 
-    private function configureTimeout()
+    private function configureTimeout(): void
     {
         if ($this->socket === false)
             return;

src/connection/IConnection.php

@@ -28,7 +28,7 @@ class StreamSocket extends AConnection
      * @link https://www.php.net/manual/en/context.ssl.php
      * @param array $options
      */
-    public function setSslContextOptions(array $options)
+    public function setSslContextOptions(array $options): void
     {
         $this->sslContextOptions = $options;
     }
@@ -73,7 +73,7 @@ public function connect(): bool
      * @param string $buffer
      * @throws ConnectException
      */
-    public function write(string $buffer)
+    public function write(string $buffer): void
     {
         if (Bolt::$debug)
             $this->printHex($buffer);
@@ -125,13 +125,13 @@ public function read(int $length = 2048): string
     /**
      * Close connection
      */
-    public function disconnect()
+    public function disconnect(): void
     {
         if (is_resource($this->stream))
             stream_socket_shutdown($this->stream, STREAM_SHUT_RDWR);
     }
 
-    public function setTimeout(float $timeout)
+    public function setTimeout(float $timeout): void
     {
         parent::setTimeout($timeout);
         $this->configureTimeout();

src/connection/Socket.php

@@ -14,11 +14,8 @@
  */
 class Bytes implements ArrayAccess, Countable
 {
-    private array $bytes = [];
-
-    public function __construct(array $bytes = [])
+    public function __construct(private array $bytes = [])
     {
-        $this->bytes = $bytes;
     }
 
     public function offsetExists($offset): bool
@@ -31,15 +28,15 @@ public function offsetGet($offset): ?string
         return $this->bytes[$offset] ?? null;
     }
 
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         if ($offset === null)
             $this->bytes[] = $value;
         else
             $this->bytes[$offset] = $value;
     }
 
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->bytes[$offset]);
     }

src/connection/StreamSocket.php

@@ -12,14 +12,14 @@
 interface IPacker
 {
     /**
-     * @param $signature
+     * @param int $signature
      * @param mixed ...$params
      * @return iterable
      */
-    public function pack($signature, ...$params): iterable;
+    public function pack(int $signature, mixed ...$params): iterable;
 
     /**
      * @param array $structures [signature => classFQN]
      */
-    public function setAvailableStructures(array $structures);
+    public function setAvailableStructures(array $structures): void;
 }