php8.4 compatibility

Author: dax

src/Client.php

@@ -118,7 +118,7 @@ private function config(string $parameter)
      * @throws \RouterOS\Exceptions\ConfigException
      * @since 1.0.0
      */
-    public function query($endpoint, array $where = null, string $operations = null, string $tag = null): ClientInterface
+    public function query($endpoint, ?array $where = null, ?string $operations = null, ?string $tag = null): ClientInterface
     {
         // If endpoint is string then build Query object
         $query = ($endpoint instanceof Query)
@@ -580,7 +580,7 @@ private function isCustomOutput(): bool
      * @throws \RouterOS\Exceptions\ClientException
      * @since 1.3.0
      */
-    public function export(string $arguments = null): string
+    public function export(?string $arguments = null): string
     {
         // Set params
         $sshHost       = $this->config('host');

src/Interfaces/ClientInterface.php

@@ -55,7 +55,7 @@ public function readAsIterator(array $options = []): ResponseIterator;
      *
      * @since 1.0.0
      */
-    public function query($endpoint, array $where = null, string $operations = null, string $tag = null): ClientInterface;
+    public function query($endpoint, ?array $where = null, ?string $operations = null, ?string $tag = null): ClientInterface;
 
     /**
      * Execute export command on remote host, it also will be used
@@ -66,5 +66,5 @@ public function query($endpoint, array $where = null, string $operations = null,
      * @return string
      * @since  1.3.0
      */
-    public function export(string $arguments = null): string;
+    public function export(?string $arguments = null): string;
 }

src/Query.php

@@ -228,7 +228,7 @@ public function getEndpoint(): ?string
      * @return \RouterOS\Interfaces\QueryInterface
      * @since 0.7
      */
-    public function setEndpoint(string $endpoint = null): QueryInterface
+    public function setEndpoint(?string $endpoint = null): QueryInterface
     {
         $this->_endpoint = $endpoint;
         return $this;

src/ResponseIterator.php

@@ -78,10 +78,10 @@ public function __construct(Client $client, array $options = [])
         $count     = count($raw);
         $result    = [];
 
-        if (isset($positions[1])) {
-
-            foreach ($positions as $key => $position) {
-
+        if (isset($positions[1]))
+        {
+            foreach ($positions as $key => $position)
+            {
                 // Get length of future block
                 $length = isset($positions[$key + 1])
                     ? $positions[$key + 1] - $position + 1
@@ -90,8 +90,9 @@ public function __construct(Client $client, array $options = [])
                 // Convert array to simple items, save as result
                 $result[] = array_slice($raw, $position, $length);
             }
-
-        } else {
+        }
+        else
+        {
             $result = [$raw];
         }
 
@@ -119,15 +120,18 @@ public function prev(): void
      *
      * @return mixed
      */
-    public function current()
+    public function current(): mixed
     {
-        if (isset($this->parsed[$this->current])) {
+        if (isset($this->parsed[$this->current]))
+        {
             return $this->parsed[$this->current];
         }
 
-        if ($this->valid()) {
+        if ($this->valid())
+        {
 
-            if (!isset($this->parsed[$this->current])) {
+            if (!isset($this->parsed[$this->current]))
+            {
                 $value = $this->client->parseResponse($this->raw[$this->current])[0];
                 $this->offsetSet($this->current, $value);
             }
@@ -143,7 +147,7 @@ public function current()
      *
      * @return mixed
      */
-    public function key()
+    public function key(): mixed
     {
         return $this->current;
     }
@@ -184,9 +188,12 @@ public function rewind(): void
      */
     public function offsetSet($offset, $value): void
     {
-        if (null === $offset) {
+        if (null === $offset)
+        {
             $this->parsed[] = $value;
-        } else {
+        }
+        else
+        {
             $this->parsed[$offset] = $value;
         }
     }
@@ -220,15 +227,18 @@ public function offsetUnset($offset): void
      *
      * @return bool|mixed
      */
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
-        if (isset($this->parsed[$offset])) {
+        if (isset($this->parsed[$offset]))
+        {
             return $this->parsed[$offset];
         }
 
-        if (isset($this->raw[$offset]) && $this->raw[$offset] !== null) {
+        if (isset($this->raw[$offset]) && $this->raw[$offset] !== null)
+        {
             $f = $this->client->parseResponse($this->raw[$offset]);
-            if ($f !== []) {
+            if ($f !== [])
+            {
                 return $this->parsed[$offset] = $f[0];
             }
         }
@@ -253,6 +263,6 @@ public function serialize(): string
      */
     public function unserialize($serialized): void
     {
-        $this->raw = unserialize($serialized, null);
+        $this->raw = unserialize($serialized);
     }
 }

src/ShortsTrait.php

@@ -24,7 +24,7 @@ trait ShortsTrait
      * @return \RouterOS\Client
      * @since 1.0.0
      */
-    public function q($endpoint, array $where = null, string $operations = null, string $tag = null): Client
+    public function q($endpoint, ?array $where = null, ?string $operations = null, ?string $tag = null): Client
     {
         return $this->query($endpoint, $where, $operations, $tag);
     }
@@ -69,7 +69,7 @@ public function ri(array $options = []): ResponseIterator
      * @return array
      * @since 1.0.0
      */
-    public function qr($endpoint, array $where = null, string $operations = null, string $tag = null, bool $parse = true, array $options = []): array
+    public function qr($endpoint, ?array $where = null, ?string $operations = null, ?string $tag = null, bool $parse = true, array $options = []): array
     {
         return $this->query($endpoint, $where, $operations, $tag)->read($parse, $options);
     }
@@ -86,7 +86,7 @@ public function qr($endpoint, array $where = null, string $operations = null, st
      * @return \RouterOS\ResponseIterator
      * @since 1.0.0
      */
-    public function qri($endpoint, array $where = null, string $operations = null, string $tag = null, array $options = []): ResponseIterator
+    public function qri($endpoint, ?array $where = null, ?string $operations = null, ?string $tag = null, array $options = []): ResponseIterator
     {
         return $this->query($endpoint, $where, $operations, $tag)->readAsIterator($options);
     }

src/Streams/ResourceStream.php

@@ -67,7 +67,7 @@ public function read(int $length): string
      *
      * @throws \RouterOS\Exceptions\StreamException when not possible to write bytes
      */
-    public function write(string $string, int $length = null): int
+    public function write(string $string, ?int $length = null): int
     {
         if (null === $length) {
             $length = strlen($string);

src/Streams/StringStream.php

@@ -70,7 +70,7 @@ public function read(int $length): string
      *
      * @throws \InvalidArgumentException on invalid length
      */
-    public function write(string $string, int $length = null): int
+    public function write(string $string, ?int $length = null): int
     {
         if (null === $length) {
             $length = strlen($string);