Now using collection's extraction

helpscout · May 7, 2019 · 64bbb6f · 64bbb6f
1 parent 593c24d
commit 64bbb6f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/Conversations/Conversation.php b/src/Conversations/Conversation.php
@@ -374,19 +374,11 @@ public function extract(): array
         }
 
         if (count($this->getCustomFields()) > 0) {
-            $customFields = [];
-            foreach ($this->getCustomFields() as $customField) {
-                $customFields[] = $customField->extract();
-            }
-            $data['fields'] = $customFields;
+            $data['fields'] = $this->getCustomFields()->extract();
         }
 
         if (count($this->getThreads()) > 0) {
-            $threads = [];
-            foreach ($this->getThreads() as $thread) {
-                $threads[] = $thread->extract();
-            }
-            $data['threads'] = $threads;
+            $data['threads'] = $this->getThreads()->extract();
         }
 
         return $data;

diff --git a/tests/Conversations/ConversationTest.php b/tests/Conversations/ConversationTest.php
@@ -234,7 +234,7 @@ public function testExtract()
         $customerWaitingSince->setLatestReplyFrom('customer');
         $conversation->setCustomerWaitingSince($customerWaitingSince);
 
-        $this->assertEquals([
+        $this->assertArraySubset([
             'id' => 12,
             'number' => 3526,
             'threadCount' => 2,