Deprecated loadFromArray for loadFromStdClass and fixed parsing of contacts in Groups::getContacts

src/MessageBird/Objects/Base.php

@@ -2,6 +2,8 @@
 
 namespace MessageBird\Objects;
 
+use stdClass;
+
 /**
  * Class Base
  *
@@ -10,9 +12,11 @@
 class Base
 {
     /**
+     * @deprecated 2.2.0 No longer used by internal code, please switch to {@see self::loadFromStdclass()}
+     * 
      * @param mixed $object
      *
-     * @return $this
+     * @return self
      */
     public function loadFromArray($object)
     {
@@ -25,4 +29,18 @@ public function loadFromArray($object)
         }
         return $this;
     }
+
+    /**
+     * @param stdClass $object
+     * @return self
+     */
+    public function loadFromStdclass(stdClass $object)
+    {
+        foreach ($object as $key => $value) {
+            if (property_exists($this, $key)) {
+                $this->$key = $value;
+            }
+        }
+        return $this;
+    }
 }

src/MessageBird/Objects/Contact.php

@@ -2,6 +2,8 @@
 
 namespace MessageBird\Objects;
 
+use stdClass;
+
 /**
  * Class Contact
  *
@@ -65,16 +67,16 @@ class Contact extends Base
     /**
      * The hash of the group this contact belongs to.
      *
-     * @var array
+     * @var ?stdClass
      */
-    protected $groups = [];
+    protected $groups = null;
 
     /**
      * The hash with messages sent to contact.
      *
-     * @var array
+     * @var ?stdClass
      */
-    protected $messages = [];
+    protected $messages = null;
 
     /**
      * The date and time of the creation of the contact in RFC3339 format (Y-m-d\TH:i:sP)
@@ -100,12 +102,12 @@ public function getHref(): string
         return $this->href;
     }
 
-    public function getGroups(): array
+    public function getGroups(): stdClass
     {
         return $this->groups;
     }
 
-    public function getMessages(): array
+    public function getMessages(): stdClass
     {
         return $this->messages;
     }
@@ -115,7 +117,7 @@ public function getCreatedDatetime(): string
         return $this->createdDatetime;
     }
 
-    public function getUpdatedDatetime(): string
+    public function getUpdatedDatetime(): ?string
     {
         return $this->updatedDatetime;
     }
@@ -126,16 +128,27 @@ public function getCustomDetails(): array
     }
 
     /**
+     * @deprecated 2.2.0 No longer used by internal code, please switch to {@see self::loadFromStdclass()}
+     * 
      * @param mixed $object
      */
-    public function loadFromArray($object): Contact
+    public function loadFromArray($object): self
     {
         unset($this->custom1, $this->custom2, $this->custom3, $this->custom4);
-
+        
         return parent::loadFromArray($object);
     }
 
+    public function loadFromStdclass(stdClass $object): self
+    {
+        unset($this->custom1, $this->custom2, $this->custom3, $this->custom4);
+
+        return parent::loadFromStdclass($object);
+    }
+
     /**
+     * @deprecated 2.2.0 No longer used by internal code, please switch to {@see self::loadFromStdclassForGroups()}
+     * 
      * @param mixed $object
      *
      * @return $this ->object
@@ -154,4 +167,19 @@ public function loadFromArrayForGroups($object)
         }
         return $object;
     }
+
+    public function loadFromStdclassForGroups(stdClass $object)
+    {
+        parent::loadFromStdclass($object);
+
+        if (!empty($object->items)) {
+            foreach ($object->items as &$item) {
+                $group = new Group();
+                $group->loadFromStdclass($item);
+
+                $item = $group;
+            }
+        }
+        return $object;
+    }
 }

src/MessageBird/Objects/Conversation/Contact.php

@@ -3,6 +3,7 @@
 namespace MessageBird\Objects\Conversation;
 
 use MessageBird\Objects\Base;
+use stdClass;
 
 /**
  * Represents a counterparty with who messages can be exchanged.
@@ -65,6 +66,8 @@ class Contact extends Base
     public $updatedDatetime;
 
     /**
+     * @deprecated 2.2.0 No longer used by internal code, please switch to {@see self::loadFromStdclass()}
+     * 
      * @param mixed $object
      */
     public function loadFromArray($object): Contact
@@ -77,4 +80,15 @@ public function loadFromArray($object): Contact
 
         return $this;
     }
+
+    public function loadFromStdclass(stdClass $object): self
+    {
+        parent::loadFromStdclass($object);
+
+        if (!empty($this->customDetails)) {
+            $this->customDetails = (array)$this->customDetails;
+        }
+
+        return $this;
+    }
 }

src/MessageBird/Objects/Conversation/Content.php

@@ -5,6 +5,7 @@
 use JsonSerializable;
 use MessageBird\Objects\Base;
 use MessageBird\Objects\Conversation\HSM\Message as HSMMessage;
+use stdClass;
 
 /**
  * Represents a Message object's actual content. Formatted depending on type.
@@ -55,11 +56,13 @@ class Content extends Base implements JsonSerializable
     public $hsm;
 
     /**
+     * @deprecated 2.2.0 No longer used by internal code, please switch to {@see self::loadFromStdclass()}
+     * 
      * @param mixed $object
      *
      * @return $this
      */
-    public function loadFromArray($object)
+    public function loadFromArray($object): self
     {
         // Text is already properly set if available due to the response's structure.
         parent::loadFromArray($object);
@@ -70,6 +73,17 @@ public function loadFromArray($object)
         return $this;
     }
 
+    public function loadFromStdclass(stdClass $object): self
+    {
+        // Text is already properly set if available due to the response's structure.
+        parent::loadFromStdclass($object);
+
+        $this->loadLocationIfNeeded();
+        $this->loadMediaIfNeeded();
+
+        return $this;
+    }
+
     /**
      * Sets the location on this object if available.
      */

src/MessageBird/Objects/Conversation/Conversation.php

@@ -3,6 +3,7 @@
 namespace MessageBird\Objects\Conversation;
 
 use MessageBird\Objects\Base;
+use stdClass;
 
 /**
  * A conversation is the view of all messages between you and a customer across
@@ -96,6 +97,8 @@ class Conversation extends Base
     public $updatedDatetime;
 
     /**
+     * @deprecated 2.2.0 No longer used by internal code, please switch to {@see self::loadFromStdclass()}
+     * 
      * @param mixed $object
      */
     public function loadFromArray($object): Conversation
@@ -131,4 +134,38 @@ public function loadFromArray($object): Conversation
 
         return $this;
     }
+
+    public function loadFromStdclass(stdClass $object): self
+    {
+        parent::loadFromStdclass($object);
+
+        if (!empty($object->contact)) {
+            $newContact = new Contact();
+            $newContact->loadFromStdclass($object->contact);
+
+            $this->contact = $newContact;
+        }
+
+        if (!empty($object->channels)) {
+            $channels = [];
+
+            foreach ($object->channels as $channel) {
+                $newChannel = new Channel();
+                $newChannel->loadFromStdclass($channel);
+
+                $channels[] = $newChannel;
+            }
+
+            $this->channels = $channels;
+        }
+
+        if (!empty($object->messages)) {
+            $messages = new MessageReference();
+            $messages->loadFromStdclass($object->messages);
+
+            $this->messages = $messages;
+        }
+
+        return $this;
+    }
 }

src/MessageBird/Objects/Conversation/Message.php

@@ -4,6 +4,7 @@
 
 use JsonSerializable;
 use MessageBird\Objects\Base;
+use stdClass;
 
 /**
  * Messages that have been sent by, or received from, a customer are
@@ -95,6 +96,8 @@ class Message extends Base implements JsonSerializable
     public $updatedDatetime;
 
     /**
+     * @deprecated 2.2.0 No longer used by internal code, please switch to {@see self::loadFromStdclass()}
+     * 
      * @param mixed $object
      */
     public function loadFromArray($object): Message
@@ -109,6 +112,19 @@ public function loadFromArray($object): Message
         return $this;
     }
 
+    public function loadFromStdclass(stdClass $object): self
+    {
+        parent::loadFromStdclass($object);
+
+        if (property_exists($object, 'content')) {
+            $content = new Content();
+            $content->loadFromStdclass($object->content);
+            $this->content = $content;
+        }
+
+        return $this;
+    }
+
     /**
      * Serialize only non empty fields.
      */

src/MessageBird/Objects/Group.php

@@ -2,6 +2,8 @@
 
 namespace MessageBird\Objects;
 
+use stdClass;
+
 /**
  * Class Group
  *
@@ -15,25 +17,28 @@ class Group extends Base
      * @var int
      */
     public $name;
+
     /**
      * An unique random ID which is created on the MessageBird
      * platform and is returned upon creation of the object.
      *
      * @var string
      */
     protected $id;
+
     /**
      * The URL of the created object.
      *
      * @var string
      */
     protected $href;
+
     /**
      * The hash with the contacts in group.
      *
-     * @var array
+     * @var ?stdClass
      */
-    protected $contacts = [];
+    protected $contacts = null;
 
     /**
      * The date and time of the creation of the group in RFC3339 format (Y-m-d\TH:i:sP)
@@ -76,29 +81,30 @@ public function getCreatedDatetime(): string
     /**
      * Get the $updatedDatetime value
      */
-    public function getUpdatedDatetime(): string
+    public function getUpdatedDatetime(): ?string
     {
         return $this->createdDatetime;
     }
 
+    public function getContacts(): stdClass
+    {
+        return $this->contacts;
+    }
+
     /**
+     * @deprecated 2.2.0 No longer used by internal code, please switch to {@see self::loadFromStdclass()}
+     * 
      * @param mixed $object
      *
      * @return $this|void
      */
-    public function loadFromArray($object)
+    public function loadFromArray($object): self
     {
-        parent::loadFromArray($object);
-
-        if (!empty($object->items)) {
-            foreach ($object->items as &$item) {
-                $contact = new Contact();
-                $contact->loadFromArray($item);
-
-                $item = $contact;
-            }
-        }
+        return parent::loadFromArray($object);
+    }
 
-        return $object;
+    public function loadFromStdclass(stdClass $object): self
+    {
+        return parent::loadFromStdclass($object);
     }
 }