Add create functions of version 2.0

Author: ben221199

src/Message.php

@@ -14,6 +14,14 @@ private function __construct(object $value){
         $this->value = $value;
     }
 
+
+    /**
+     * @return string|null
+     */
+    public function getJSONRPC(): ?string{
+        return $this->hasJSONRPC()?$this->value->jsonrpc:null;
+    }
+
     /**
      * @param bool $strictId
      * @return mixed|null
@@ -71,6 +79,13 @@ public function getErrorData(){
         return $this->getError()->data ?? null;
     }
 
+    /**
+     * @return bool
+     */
+    public function hasJSONRPC(): bool{
+        return property_exists($this->value,'jsonrpc') && $this->value->jsonrpc!==null;
+    }
+
     /**
      * @param bool $strictId
      * @return bool
@@ -129,6 +144,10 @@ public function isResponse(): bool{
         return property_exists($this->value,'result') || property_exists($this->value,'error');
     }
 
+    public function isVersion2(): bool{
+        return $this->getJSONRPC()==='2.0';
+    }
+
     /**
      * @return object
      */
@@ -150,6 +169,28 @@ public static function createRequestMessageV1($id,string $method,array $params=[
         ]);
     }
 
+    /**
+     * @param $id
+     * @param string $method
+     * @param object|array|null $params
+     * @return RequestMessage
+     * @throws JSONRPCException
+     */
+    public static function createRequestMessageV2($id,string $method,$params=null): RequestMessage{
+        $arr = [
+            'jsonrpc' => '2.0',
+            'id' => $id,
+            'method' => $method,
+        ];
+
+        if(is_object($params) || is_array($params)){
+            $arr['params'] = $params;
+        }elseif(!is_null($params)){
+            throw new JSONRPCException('[V2] The "params" property in request MUST be an object, array or null.');
+        }
+        return new RequestMessage((object) $arr);
+    }
+
     /**
      * @param string $method
      * @param array $params
@@ -163,6 +204,26 @@ public static function createNotificationMessageV1(string $method,array $params=
         ]);
     }
 
+    /**
+     * @param string $method
+     * @param object|array|null $params
+     * @return NotificationMessage
+     * @throws JSONRPCException
+     */
+    public static function createNotificationMessageV2(string $method,$params=null): NotificationMessage{
+        $arr = [
+            'jsonrpc' => '2.0',
+            'method' => $method,
+        ];
+
+        if(is_object($params) || is_array($params)){
+            $arr['params'] = $params;
+        }elseif(!is_null($params)){
+            throw new JSONRPCException('[V2] The "params" property in request MUST be an object, array or null.');
+        }
+        return new NotificationMessage((object) $arr);
+    }
+
     /**
      * @param $id
      * @param $result
@@ -184,6 +245,32 @@ public static function createResponseMessageV1($id,$result=null,$error=null): Re
         ]);
     }
 
+    /**
+     * @param $id
+     * @param $result
+     * @param object|string|null $error
+     * @return RequestMessage
+     * @throws JSONRPCException
+     */
+    public static function createResponseMessageV2($id,$result=null,$error=null): RequestMessage{
+        if(!is_null($result) && !is_null($error)){
+            throw new JSONRPCException('[V2] Only one property "result" or "error" can be non null.');
+        }
+        if(!is_object($error) && !is_null($error)){
+            throw new JSONRPCException('[V1] The "error" property in request MUST be an object or null.');
+        }
+        $arr = [
+            'jsonrpc' => '2.0',
+            'id' => $id,
+        ];
+        if(!is_null($error)){
+            $arr['error'] = $error;
+        }else{
+            $arr['result'] = $result;
+        }
+        return new RequestMessage((object) $arr);
+    }
+
     /**
      * @param $object
      * @return bool

tests/MessageTest.php

@@ -394,6 +394,21 @@ public function testIsResponse(){
         $this->assertTrue(Message::createResponseMessageV1(123,'myResult')->isResponse());
     }
 
+    /**
+     * @return void
+     * @throws JSONRPCException
+     */
+    public function testIsVersion2(){
+        $this->assertFalse(Message::createRequestMessageV1(123,'myMethod')->isVersion2());
+        $this->assertTrue(Message::createRequestMessageV2(123,'myMethod')->isVersion2());
+
+        $this->assertFalse(Message::createNotificationMessageV1('myMethod')->isVersion2());
+        $this->assertTrue(Message::createNotificationMessageV2('myMethod')->isVersion2());
+
+        $this->assertFalse(Message::createResponseMessageV1(123,'myMethod')->isVersion2());
+        $this->assertTrue(Message::createResponseMessageV2(123,'myMethod')->isVersion2());
+    }
+
     /**
      * @return void
      * @throws JSONRPCException