Mergin changes from kba-team/json-rpc

.gitattributes

@@ -1,8 +1,8 @@
-tests/ export-ignore
-vendor/ export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.yml export-ignore
-composer.* export-ignore
-phpunit.xml export-ignore
-README.* export-ignore
+tests/          export-ignore
+vendor/         export-ignore
+.gitattributes  export-ignore
+.gitignore      export-ignore
+.phpcs.xml      export-ignore
+composer.*      export-ignore
+phpunit.xml     export-ignore
+README.*        export-ignore

.github/workflows/main.yml

@@ -0,0 +1,51 @@
+name: "CI workflow"
+on:
+  # Triggers the workflow on push or pull request events
+  push:
+  pull_request:
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+permissions:
+  contents: "read"
+jobs:
+  # Composer config validation
+  composer:
+    name: Composer config validation
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Validate composer.json
+        run: composer validate --strict
+  # PHP syntax validation
+  php:
+    name: PHP syntax validation
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Check PHP syntax
+        run: php -l src/ tests/
+  # PHP coding standard validation
+  phpcs:
+    name: PHP coding standard
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: php-actions/composer@v6
+        with:
+          php_version: 8.2
+      - name: Check PHP coding standard
+        run: vendor/bin/phpcs
+  # run PHP unit tests
+  phpunit:
+    name: PHPUnit tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php_version: [7.4, 8.0, 8.1, 8.2]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: php-actions/composer@v6
+        with:
+          php_version: ${{ matrix.php_version }}
+      - run: vendor/bin/phpunit

.gitignore

@@ -2,3 +2,4 @@
 .DS_Store
 vendor/
 composer.lock
+/.phpunit.result.cache

.phpcs.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<ruleset name="PSR12-src">
+    <description>PSR12 programming standard</description>
+    <!-- display progress -->
+    <arg value="p"/>
+    <arg value="n"/>
+    <arg value="s"/>
+    <!-- directories and files to check -->
+    <file>./src</file>
+    <file>./tests</file>
+    <!-- Use PSR12 as a standard -->
+    <rule ref="PSR12">
+        <exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace"/>
+        <exclude name="PSR1.Classes.ClassDeclaration.MultipleClasses"/>
+        <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
+        <exclude-pattern>src/*</exclude-pattern>
+    </rule>
+    <rule ref="PSR12">
+        <exclude-pattern>tests/*</exclude-pattern>
+    </rule>
+</ruleset>

README.md

@@ -1,9 +1,9 @@
-JsonRPC PHP Client and Server
+JSON-RPC PHP Client and Server
 =============================
 
-A simple Json-RPC client/server that just works.
+![CI workflow](https://github.com/matasarei/json-rpc/actions/workflows/main.yml/badge.svg)
 
-Complete fork of `fguillot/JsonRPC` with latest changes.
+A simple JSON-RPC client/server that just works.
 
 Features
 --------
@@ -13,7 +13,6 @@ Features
 - Authentication and IP based client restrictions
 - Custom Middleware
 - Fully unit tested
-- Requirements: PHP >= 5.4
 - License: MIT
 
 Author
@@ -23,26 +22,15 @@ Frédéric Guillot
 
 Installation with Composer
 --------------------------
-
-For PHP >= 5.4
 ```bash
 composer require fguillot/json-rpc
 ```
 
-For PHP 5.3 (last supported version):
-```bash
-composer require fguillot/json-rpc 1.2.5
-```
-
-Running Test Cases
---------
-1. Clone the repo
-2. `cd JsonRPC`
-3. Run composer: `composer install`
-4. Run tests: `vendor/bin/phpunit`
-
 Examples
 --------
+### Symfony
+* https://github.com/matasarei/json-rpc-demo
+
 
 ### Server
 
@@ -73,11 +61,11 @@ Callback binding from array:
 
 use JsonRPC\Server;
 
-$callbacks = array(
+$callbacks = [
     'getA' => function() { return 'A'; },
     'getB' => function() { return 'B'; },
     'getC' => function() { return 'C'; }
-);
+];
 
 $server = new Server();
 $server->getProcedureHandler()->withCallbackArray($callbacks);
@@ -148,12 +136,12 @@ class MathApi
     }
 }
 
-$callbacks = array(
-    'addition'       => array( 'MathApi', addition ),
-    'subtraction'    => array( 'MathApi', subtraction ),
-    'multiplication' => array( 'MathApi', multiplication ),
-    'division'       => array( 'MathApi', division )
-);
+$callbacks = [
+    'addition'       => [ 'MathApi', addition ],
+    'subtraction'    => [ 'MathApi', subtraction ],
+    'multiplication' => [ 'MathApi', multiplication ,
+    'division'       => [ 'MathApi', division ],
+];
 
 $server = new Server();
 $server->getProcedureHandler()->withClassAndMethodArray($callbacks);
@@ -295,7 +283,7 @@ You can configure the log destination in your `php.ini`.
 
 Output example:
 
-```json
+```
 ==> Request:
 {
     "jsonrpc": "2.0",
@@ -327,7 +315,7 @@ $server = new Server;
 // IP client restrictions
 $server->allowHosts(['192.168.0.1', '127.0.0.1']);
 
-[...]
+...
 
 // Return the response to the client
 echo $server->execute();
@@ -349,7 +337,7 @@ $server = new Server;
 // List of users to allow
 $server->authentication(['user1' => 'password1', 'user2' => 'password2']);
 
-[...]
+...
 
 // Return the response to the client
 echo $server->execute();
@@ -404,7 +392,7 @@ $server
     ->withLocalException('MyException2')
 ;
 
-[...]
+...
 
 echo $server->execute();
 ```
@@ -420,7 +408,7 @@ Example:
 
 $client = new Client();
 $client->getHttpClient()->withBeforeRequestCallback(function(HttpClient $client, $payload) {
-    $client->withHeaders(array('Content-Length: '.strlen($payload)));
+    $client->withHeaders(['Content-Length: '.strlen($payload)]);
 });
 
 $client->myProcedure(123);

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "fguillot/json-rpc",
-  "description": "Simple Json-RPC client/server library that just works",
+  "description": "Simple JSON-RPC client/server library that just works",
   "homepage": "https://github.com/matasarei/JsonRPC",
   "type": "library",
   "license": "MIT",
@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "php": ">=5.4",
+    "php": ">=7.4",
     "ext-json": "*"
   },
   "autoload": {
@@ -19,6 +19,7 @@
     }
   },
   "require-dev": {
-    "phpunit/phpunit": "4.8.*"
+    "phpunit/phpunit": "^9.6",
+    "squizlabs/php_codesniffer": "^3.9"
   }
 }

src/JsonRPC/Client.php

@@ -143,7 +143,7 @@ public function send()
     {
         $this->isBatch = false;
 
-        return $this->sendPayload('['.implode(', ', $this->batch).']');
+        return $this->sendPayload('[' . implode(', ', $this->batch) . ']');
     }
 
     /**

src/JsonRPC/HttpClient.php

@@ -453,7 +453,7 @@ public function handleExceptions(array $headers, $isJsonResponse = false)
             return;
         }
 
-        $errors = array_filter($headers, function($value) {
+        $errors = array_filter($headers, function ($value) {
             return preg_match('/HTTP.*[4-5]\d{2}\s\w/', $value);
         });
 

src/JsonRPC/ProcedureHandler.php

@@ -206,7 +206,7 @@ public function executeCallback(Closure $callback, $params)
      */
     public function executeMethod($class, $method, $params)
     {
-        $instance = is_string($class) ? new $class : $class;
+        $instance = is_string($class) ? new $class() : $class;
         $reflection = new ReflectionMethod($class, $method);
 
         $this->executeBeforeMethod($instance, $method);
@@ -295,13 +295,13 @@ public function getNamedArguments(array $requestParams, array $methodParams)
             } elseif ($p->isDefaultValueAvailable()) {
                 $params[$name] = $p->getDefaultValue();
             } else {
-                throw new InvalidArgumentException('Missing argument: '.$name);
+                throw new InvalidArgumentException('Missing argument: ' . $name);
             }
         }
 
         if ($undefinedRequestParams = array_diff_key($requestParams, $params)) {
             throw new InvalidArgumentException(
-                'Undefined arguments: '.implode(', ', array_keys($undefinedRequestParams))
+                'Undefined arguments: ' . implode(', ', array_keys($undefinedRequestParams))
             );
         }
 

src/JsonRPC/Request/BatchRequestParser.php

@@ -31,7 +31,7 @@ public function parse()
         }
 
         $responses = array_filter($responses);
-        return empty($responses) ? '' : '['.implode(',', $responses).']';
+        return empty($responses) ? '' : '[' . implode(',', $responses) . ']';
     }
 
     /**

src/JsonRPC/Request/RequestParser.php

@@ -86,7 +86,7 @@ public function withLocalException($exception)
         } else {
             $this->localExceptions[] = $exception;
         }
-        
+
         return $this;
     }
 
@@ -126,7 +126,6 @@ public function withMiddlewareHandler(MiddlewareHandler $middlewareHandler)
     public function parse()
     {
         try {
-
             JsonFormatValidator::validate($this->payload);
             RpcFormatValidator::validate($this->payload);
 

src/JsonRPC/Response/ResponseBuilder.php

@@ -226,7 +226,7 @@ public function sendHeaders()
         }
 
         foreach ($this->headers as $name => $value) {
-            header($name.': '.$value);
+            header($name . ': ' . $value);
         }
 
         return $this;

src/JsonRPC/Response/ResponseParser.php

@@ -122,13 +122,13 @@ private function handleExceptions()
     {
         switch ($this->payload['error']['code']) {
             case -32700:
-                throw new InvalidJsonFormatException('Parse error: '.$this->payload['error']['message']);
+                throw new InvalidJsonFormatException('Parse error: ' . $this->payload['error']['message']);
             case -32600:
-                throw new InvalidJsonRpcFormatException('Invalid Request: '.$this->payload['error']['message']);
+                throw new InvalidJsonRpcFormatException('Invalid Request: ' . $this->payload['error']['message']);
             case -32601:
-                throw new BadFunctionCallException('Procedure not found: '.$this->payload['error']['message']);
+                throw new BadFunctionCallException('Procedure not found: ' . $this->payload['error']['message']);
             case -32602:
-                throw new InvalidArgumentException('Invalid arguments: '.$this->payload['error']['message']);
+                throw new InvalidArgumentException('Invalid arguments: ' . $this->payload['error']['message']);
             default:
                 throw new ResponseException(
                     $this->payload['error']['message'],

src/JsonRPC/Server.php

@@ -145,7 +145,7 @@ public function __construct(
     public function setAuthenticationHeader($header)
     {
         if (! empty($header)) {
-            $header = 'HTTP_'.str_replace('-', '_', strtoupper($header));
+            $header = 'HTTP_' . str_replace('-', '_', strtoupper($header));
             $value = $this->getServerVariable($header);
 
             if (! empty($value)) {
@@ -309,7 +309,6 @@ public function execute()
             ;
 
             $response = $this->parseRequest();
-
         } catch (Exception $e) {
             $response = $this->handleExceptions($e);
         }

src/JsonRPC/Validator/HostValidator.php

@@ -31,7 +31,7 @@ public static function validate(array $hosts, $remoteAddress)
             throw new AccessDeniedException('Access Forbidden');
         }
     }
-    
+
     /**
      * Validate remoteAddress match host
      *

src/JsonRPC/Validator/JsonFormatValidator.php

@@ -26,4 +26,3 @@ public static function validate($payload)
         }
     }
 }
-