Fix lazy boolean evaluation

Author: ben221199

README.md

@@ -21,7 +21,7 @@ use YOCLIB\JSONRPC\Message;
 
 $message = Message::createRequestMessageV1(123,'getInfo',['payments']); // Create request (version 1.0)
 $message = Message::createNotificationMessageV1('notificationEvent',['payed']); // Create notification (version 1.0)
-$message = Message::createResponseMessageV1(123,['payments'=>[]]); // Create response (version 1.0)
+$message = Message::createResponseMessageV1(123,['payments'=>['$10.12','$23.45','$12.34']]); // Create response (version 1.0)
 
 $object = $message->toObject();
 

src/Message.php

@@ -194,7 +194,7 @@ private static function validateParamsPropertyV1($message){
         if(!property_exists($message,'params')){
             throw new JSONRPCException('[V1] Missing "params" property in request.');
         }
-        if(!is_array($message['params'])){
+        if(!is_array($message->params)){
             throw new JSONRPCException('[V1] The "params" property in request MUST be an array.');
         }
     }
@@ -235,7 +235,7 @@ private static function handleMessageV1($message,bool $strictId=true){
             self::validateMethodPropertyV1($message);
             self::validateParamsPropertyV1($message);
 
-            if(property_exists($message,'id') && $strictId?($message->id!==null):($message->id)){
+            if(property_exists($message,'id') && ($strictId?($message->id!==null):($message->id))){
                 return new RequestMessage($message);
             }else{
                 return new NotificationMessage($message);

tests/MessageTest.php

@@ -5,6 +5,8 @@
 
 use YOCLIB\JSONRPC\JSONRPCException;
 use YOCLIB\JSONRPC\Message;
+use YOCLIB\JSONRPC\NotificationMessage;
+use YOCLIB\JSONRPC\RequestMessage;
 use YOCLIB\JSONRPC\ResponseMessage;
 
 class MessageTest extends TestCase{
@@ -140,6 +142,17 @@ public function testParseRequestV1WithMethod(){
         Message::parseObject((object) ['method'=>null]);
     }
 
+    /**
+     * @return void
+     * @throws JSONRPCException
+     */
+    public function testParseRequestV1WithMethodString(){
+        $this->expectException(JSONRPCException::class);
+        $this->expectExceptionMessage('[V1] Missing "params" property in request.');
+
+        Message::parseObject((object) ['method'=>'abc']);
+    }
+
     /**
      * @return void
      * @throws JSONRPCException
@@ -151,6 +164,43 @@ public function testParseRequestV1WithParams(){
         Message::parseObject((object) ['params'=>null]);
     }
 
+    /**
+     * @return void
+     * @throws JSONRPCException
+     */
+    public function testParseRequestV1WithMethodStringAndParams(){
+        $this->expectException(JSONRPCException::class);
+        $this->expectExceptionMessage('[V1] The "params" property in request MUST be an array.');
+
+        Message::parseObject((object) ['method'=>'abc','params'=>null]);
+    }
+
+
+    /**
+     * @return void
+     * @throws JSONRPCException
+     */
+    public function testParseRequestV1WithMethodStringAndParamsArray(){
+        $this->assertInstanceOf(NotificationMessage::class,Message::parseObject((object) ['method'=>'abc','params'=>[]]));
+    }
+
+    /**
+     * @return void
+     * @throws JSONRPCException
+     */
+    public function testParseRequestV1WithIdNullAndMethodStringAndParamsArray(){
+        $this->assertInstanceOf(NotificationMessage::class,Message::parseObject((object) ['id'=>null,'method'=>'abc','params'=>[]]));
+    }
+
+    /**
+     * @return void
+     * @throws JSONRPCException
+     */
+    public function testParseRequestV1WithIdFalsyAndMethodStringAndParamsArray(){
+        $this->assertInstanceOf(RequestMessage::class,Message::parseObject((object) ['id'=>false,'method'=>'abc','params'=>[]]));
+        $this->assertInstanceOf(NotificationMessage::class,Message::parseObject((object) ['id'=>false,'method'=>'abc','params'=>[]],false));
+    }
+
     /**
      * @return void
      * @throws JSONRPCException
@@ -217,6 +267,7 @@ public function testParseResponseV1WithIdNullAndResultAndNullError(){
      */
     public function testParseResponseV1WithIdFalsyAndResultAndNullError(){
         $this->assertInstanceOf(ResponseMessage::class,Message::parseObject((object) ['id'=>false,'result'=>'abc','error'=>null]));
+        $this->assertInstanceOf(ResponseMessage::class,Message::parseObject((object) ['id'=>false,'result'=>'abc','error'=>null],false));
     }
 
     /**