Merge pull request #3 from CloudBeds/jsonobject-implements-jsonserializable

JSONObjects implements JsonSerializable

Author: cb-vova

composer.json

@@ -15,7 +15,8 @@
     ],
     "require": {
         "php": ">=5.6",
-        "ext-curl": "*"
+        "ext-curl": "*",
+        "ext-json": "*"
     },
     "autoload" : {
         "files": ["source/paysafe.php"]

source/Paysafe/JSONObject.php

@@ -21,7 +21,9 @@
 
 namespace Paysafe;
 
-class JSONObject {
+use JsonSerializable;
+
+class JSONObject implements JsonSerializable{
 
     protected static $fieldTypes = array();
     private $properties = array();
@@ -37,7 +39,7 @@ public function setOptionalFields($fields) {
         if (!is_array($fields)) {
             throw new PaysafeException('Invalid optional fields. Array expected.');
         }
-        if (($diff = array_diff($fields, array_keys(static::$fieldTypes)))) {
+        if ($diff = array_diff($fields, array_keys(static::$fieldTypes))) {
             throw new PaysafeException('Invalid optional fields. Unknown fields: ' . join(', ', $diff));
         }
 
@@ -202,7 +204,8 @@ private function cast($name, $value, $type) {
 
     /**
      *
-     * @return json encoded copy of this object
+     * @return string|false encoded copy of this object
+     * @throws PaysafeException
      */
     public function toJson() {
         return json_encode($this->jsonSerialize());
@@ -225,7 +228,7 @@ final public function jsonSerialize() {
     }
 
     public function checkRequiredFields() {
-        if (($diff = array_diff($this->requiredFields, array_keys($this->properties)))) {
+        if ($diff = array_diff($this->requiredFields, array_keys($this->properties))) {
             throw new PaysafeException('Missing required properties: ' . join(', ', $diff), 500);
         }
     }

tests/paysafe/MerchantAccountServiceTest.php

@@ -101,7 +101,7 @@ public function testCreateMerchantAccountMissingRequiredFields()
 
         $this->expectException(PaysafeException::class);
         $this->expectExceptionCode(500);
-        $this->expectExceptionMessage('Missing required properties: name, currency, region, legalEntity, productCode, category, phone, yearlyVolumeRange, averageTransactionAmount, merchantDescriptor, caAccountDetails');
+        $this->expectExceptionMessage('Missing required properties: name, currency, region, legalEntity, productCode, category, phone, yearlyVolumeRange, averageTransactionAmount, merchantDescriptor');
 
         $mas->createMerchantAccount(new MerchantAccount());
     }