feat: PHP 8.4 support

Author: darkdarin

composer.json

@@ -10,15 +10,15 @@
         }
     ],
     "require": {
-        "php": "8.1.*|8.2.*|8.3.*",
+        "php": "8.1.*|8.2.*|8.3.*|8.4.*",
         "illuminate/container": "^10.0|^11.0"
     },
     "require-dev": {
-        "laravel/pint": "^1.4",
+        "laravel/pint": "^1.19",
         "mockery/mockery": "^1.5",
         "phpunit/phpunit": "^9.6",
         "roave/security-advisories": "dev-latest",
-        "vimeo/psalm": "^5.6"
+        "vimeo/psalm": "^5.26"
     },
     "autoload": {
         "psr-4": {
@@ -33,6 +33,8 @@
     "scripts": {
         "lint": "pint --test",
         "lint-fix": "pint",
-        "analyze": "psalm --no-cache"
+        "analyze": "psalm --no-cache",
+        "pint": "vendor/bin/pint",
+        "psalm": "vendor/bin/psalm --output-format=phpstorm --no-cache"
     }
 }

pint.json

@@ -1,3 +1,3 @@
 {
-    "preset": "psr12"
+    "preset": "per"
 }

src/Contracts/MiddlewareInterface.php

@@ -2,6 +2,4 @@
 
 namespace Tochka\JsonRpc\Standard\Contracts;
 
-interface MiddlewareInterface
-{
-}
+interface MiddlewareInterface {}

src/Contracts/MiddlewareRegistryInterface.php

@@ -30,7 +30,7 @@ public function appendMiddleware(MiddlewareInterface $middleware, ?string $group
     public function addMiddlewareAfter(
         MiddlewareInterface $middleware,
         string $afterMiddleware,
-        ?string $groupName = null
+        ?string $groupName = null,
     ): void;
 
     /**
@@ -42,6 +42,6 @@ public function addMiddlewareAfter(
     public function addMiddlewareBefore(
         MiddlewareInterface $middleware,
         string $beforeMiddleware,
-        ?string $groupName = null
+        ?string $groupName = null,
     ): void;
 }

src/DTO/JsonRpcError.php

@@ -34,7 +34,7 @@ public function __construct(int $code, string $message, array|object|null $data
     public static function from(object|array $value): self
     {
         if (is_array($value)) {
-            $value = (object)$value;
+            $value = (object) $value;
         }
 
         $code = isset($value->code) && is_int($value->code)
@@ -59,7 +59,7 @@ public function toArray(): array
     {
         $result = [
             'code' => $this->code,
-            'message' => $this->message
+            'message' => $this->message,
         ];
 
         if ($this->data !== null) {
@@ -76,7 +76,7 @@ public function jsonSerialize(): array
     {
         $result = [
             'code' => $this->code,
-            'message' => $this->message
+            'message' => $this->message,
         ];
 
         if ($this->data !== null) {

src/DTO/JsonRpcRequest.php

@@ -37,7 +37,7 @@ public function __construct(string $method, array|object|null $params = null, st
     public static function from(object|array $value): self
     {
         if (is_array($value)) {
-            $value = (object)$value;
+            $value = (object) $value;
         }
 
         if (empty($value->jsonrpc) || $value->jsonrpc !== self::VERSION) {
@@ -63,7 +63,7 @@ public static function from(object|array $value): self
         return new self(
             $value->method,
             $value->params ?? null,
-            $value->id ?? null
+            $value->id ?? null,
         );
     }
 
@@ -74,7 +74,7 @@ public function toArray(): array
     {
         $result = [
             'jsonrpc' => $this->jsonrpc,
-            'method' => $this->method
+            'method' => $this->method,
         ];
 
         if ($this->params !== null) {
@@ -95,7 +95,7 @@ public function jsonSerialize(): array
     {
         $result = [
             'jsonrpc' => $this->jsonrpc,
-            'method' => $this->method
+            'method' => $this->method,
         ];
 
         if ($this->params !== null) {

src/DTO/JsonRpcResponse.php

@@ -5,7 +5,6 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Jsonable;
 use Tochka\JsonRpc\Standard\Contracts\JsonRpcInterface;
-use Tochka\JsonRpc\Standard\Exceptions\InvalidRequestException;
 use Tochka\JsonRpc\Standard\Exceptions\InvalidResponseException;
 use Tochka\JsonRpc\Standard\Helpers\PrepareValue;
 
@@ -40,24 +39,24 @@ public function __construct(string|int|null $id = null, mixed $result = null, Js
     public static function from(object|array $value): self
     {
         if (is_array($value)) {
-            $value = (object)$value;
+            $value = (object) $value;
         }
 
         if (empty($value->jsonrpc) || $value->jsonrpc !== self::VERSION) {
             throw InvalidResponseException::from('jsonrpc', 'Field must be [2.0]');
         }
 
         if (empty($value->id)) {
-            throw InvalidRequestException::from('id', 'Field must be present');
+            throw InvalidResponseException::from('id', 'Field must be present');
         }
 
         if (!is_string($value->id) && !is_int($value->id)) {
-            throw InvalidRequestException::from('id', 'Field must be of type [string|int]');
+            throw InvalidResponseException::from('id', 'Field must be of type [string|int]');
         }
 
         if (isset($value->error)) {
             if (!is_array($value->error) && !is_object($value->error)) {
-                throw InvalidRequestException::from('error', 'Field must be of type [array|object]');
+                throw InvalidResponseException::from('error', 'Field must be of type [array|object]');
             }
 
             $error = JsonRpcError::from($value->error);
@@ -68,7 +67,7 @@ public static function from(object|array $value): self
         return new self(
             $value->id,
             $value->result ?? null,
-            $error
+            $error,
         );
     }
 
@@ -79,7 +78,7 @@ public function toArray(): array
     {
         $result = [
             'jsonrpc' => $this->jsonrpc,
-            'id' => $this->id
+            'id' => $this->id,
         ];
 
         if ($this->result !== null) {
@@ -101,7 +100,7 @@ public function jsonSerialize(): array
     {
         $result = [
             'jsonrpc' => $this->jsonrpc,
-            'id' => $this->id
+            'id' => $this->id,
         ];
 
         if ($this->result !== null) {

src/Exceptions/Additional/InvalidParameterException.php

@@ -24,7 +24,7 @@ public static function from(
         string $code,
         ?string $message = null,
         array|object|null $meta = null,
-        ?\Throwable $previous = null
+        ?\Throwable $previous = null,
     ): self {
         return new self(new InvalidParameterError($parameterName, $code, $message, $meta), $previous);
     }

src/Exceptions/Errors/InternalError.php

@@ -24,7 +24,7 @@ public function toArray(): array
                 'name' => $this->exception::class,
                 'code' => $this->exception->getCode(),
                 'message' => $this->exception->getMessage(),
-            ]
+            ],
         ];
     }
 }

src/Exceptions/Errors/InvalidDataError.php

@@ -23,7 +23,7 @@ public function toArray(): array
     {
         return [
             'field' => $this->field,
-            'message' => $this->message
+            'message' => $this->message,
         ];
     }
 }