Extra checks before using response and added tests for new entity

picqer · Dec 15, 2015 · f2ddfae · f2ddfae
1 parent 45744ff
commit f2ddfae
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/Picqer/Financials/Moneybird/Model.php b/src/Picqer/Financials/Moneybird/Model.php
@@ -260,15 +260,19 @@ public function selfFromResponse($response)
 
         foreach ($this->getSingleNestedEntities() as $key => $value)
         {
-            $entityName = 'Picqer\Financials\Moneybird\Entities\\' . $value;
-            $this->$key = new $entityName($this->connection, $response[$key]);
+            if (isset($response[$key])) {
+                $entityName = 'Picqer\Financials\Moneybird\Entities\\' . $value;
+                $this->$key = new $entityName($this->connection, $response[$key]);
+            }
         }
 
         foreach ($this->getMultipleNestedEntities() as $key => $value)
         {
-            $entityName = 'Picqer\Financials\Moneybird\Entities\\' . $value['entity'];
-            $instaniatedEntity = new $entityName($this->connection);
-            $this->$key = $instaniatedEntity->collectionFromResult($response[$key]);
+            if (isset($response[$key])) {
+                $entityName = 'Picqer\Financials\Moneybird\Entities\\' . $value['entity'];
+                $instaniatedEntity = new $entityName($this->connection);
+                $this->$key = $instaniatedEntity->collectionFromResult($response[$key]);
+            }
         }
 
         return $this;

diff --git a/tests/EntityTest.php b/tests/EntityTest.php
@@ -19,6 +19,11 @@ public function testContactEntity()
         $this->performEntityTest('\Picqer\Financials\Moneybird\Entities\Contact');
     }
 
+    public function testContactCustomFieldEntity()
+    {
+        $this->performEntityTest('\Picqer\Financials\Moneybird\Entities\ContactCustomField');
+    }
+
     public function testCustomFieldEntity()
     {
         $this->performEntityTest('\Picqer\Financials\Moneybird\Entities\CustomField');