Merge branch 'release/v0.3.1'

Author: Marco Roßdeutscher

src/LooplineSystems/CloseIoApiWrapper/Api/LeadApi.php

@@ -1,20 +1,21 @@
 <?php
 /**
-* Close.io Api Wrapper - LLS Internet GmbH - Loopline Systems
-*
-* @link      https://github.com/loopline-systems/closeio-api-wrapper for the canonical source repository
-* @copyright Copyright (c) 2014 LLS Internet GmbH - Loopline Systems (http://www.loopline-systems.com)
-* @license   https://github.com/loopline-systems/closeio-api-wrapper/blob/master/LICENSE (MIT Licence)
-*/
+ * Close.io Api Wrapper - LLS Internet GmbH - Loopline Systems
+ *
+ * @link      https://github.com/loopline-systems/closeio-api-wrapper for the canonical source repository
+ * @copyright Copyright (c) 2014 LLS Internet GmbH - Loopline Systems (http://www.loopline-systems.com)
+ * @license   https://github.com/loopline-systems/closeio-api-wrapper/blob/master/LICENSE (MIT Licence)
+ */
 
 namespace LooplineSystems\CloseIoApiWrapper\Api;
 
 use LooplineSystems\CloseIoApiWrapper\CloseIoResponse;
 use LooplineSystems\CloseIoApiWrapper\Library\Api\AbstractApi;
+use LooplineSystems\CloseIoApiWrapper\Library\Curl\Curl;
 use LooplineSystems\CloseIoApiWrapper\Library\Exception\InvalidNewLeadPropertyException;
 use LooplineSystems\CloseIoApiWrapper\Library\Exception\InvalidParamException;
-use LooplineSystems\CloseIoApiWrapper\Model\Lead;
 use LooplineSystems\CloseIoApiWrapper\Library\Exception\ResourceNotFoundException;
+use LooplineSystems\CloseIoApiWrapper\Model\Lead;
 
 class LeadApi extends AbstractApi
 {
@@ -30,7 +31,7 @@ protected function initUrls()
             'add-lead' => '/lead/',
             'get-lead' => '/lead/[:id]/',
             'update-lead' => '/lead/[:id]/',
-            'delete-lead' => '/lead/[:id]/'
+            'delete-lead' => '/lead/[:id]/',
         ];
     }
 
@@ -40,7 +41,7 @@ protected function initUrls()
     public function getAllLeads()
     {
         /** @var Lead[] $leads */
-        $leads = array();
+        $leads = [];
 
         $apiRequest = $this->prepareRequest('get-leads');
 
@@ -54,6 +55,7 @@ public function getAllLeads()
                 $leads[] = new Lead($lead);
             }
         }
+
         return $leads;
     }
 
@@ -65,7 +67,7 @@ public function getAllLeads()
     public function findLeads(array $queryParams)
     {
         /** @var Lead[] $leads */
-        $leads = array();
+        $leads = [];
         if (count($queryParams) > 0) {
             $queryParams = ['query' => $this->buildQueryString($queryParams)];
         }
@@ -94,6 +96,7 @@ private function buildQueryString(array $params)
             $flattened[] = $key . '=' . $value;
         }
         $queryString = implode('&', $flattened);
+
         return $queryString;
     }
 
@@ -114,6 +117,7 @@ public function getLead($id)
         } else {
             throw new ResourceNotFoundException();
         }
+
         return $lead;
     }
 
@@ -127,6 +131,7 @@ public function addLead(Lead $lead)
 
         $lead = json_encode($lead);
         $apiRequest = $this->prepareRequest('add-lead', $lead);
+
         return $this->triggerPost($apiRequest);
     }
 
@@ -156,6 +161,7 @@ public function updateLead(Lead $lead)
         } else {
             throw new ResourceNotFoundException();
         }
+
         return $lead;
     }
 
@@ -164,7 +170,8 @@ public function updateLead(Lead $lead)
      * @return CloseIoResponse
      * @throws ResourceNotFoundException
      */
-    public function deleteLead($id){
+    public function deleteLead($id)
+    {
         $apiRequest = $this->prepareRequest('delete-lead', null, ['id' => $id]);
 
         /** @var CloseIoResponse $result */
@@ -193,9 +200,9 @@ public function setCurl($curl)
     public function validateLeadForPost(Lead $lead)
     {
         $invalidProperties = ['id', 'organization', 'tasks', 'opportunities'];
-        foreach ($invalidProperties as $invalidProperty){
+        foreach ($invalidProperties as $invalidProperty) {
             $getter = 'get' . ucfirst($invalidProperty);
-            if ($lead->$getter()){
+            if ($lead->$getter()) {
                 throw new InvalidNewLeadPropertyException('Cannot post ' . $invalidProperty . ' to new lead.');
             }
         }

src/LooplineSystems/CloseIoApiWrapper/Model/Task.php

@@ -17,6 +17,11 @@ class Task implements \JsonSerializable
     use ObjectHydrateHelperTrait;
     use JsonSerializableHelperTrait;
 
+    /**
+     * @var string
+     */
+    private $type;
+
     /**
      * @var string
      */
@@ -101,6 +106,25 @@ public function __construct($data = null)
         }
     }
 
+    /**
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param string $type
+     * @return $this
+     */
+    public function setType($type)
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
     /**
      * @return string
      */

tests/LooplineSystems/CloseIoApi/Api/LeadTest.php

@@ -13,6 +13,7 @@
 use LooplineSystems\CloseIoApiWrapper\Model\Lead;
 use LooplineSystems\CloseIoApiWrapper\Model\Opportunity;
 use LooplineSystems\CloseIoApiWrapper\Model\Phone;
+use LooplineSystems\CloseIoApiWrapper\Model\Task;
 
 class LeadTest extends \PHPUnit_Framework_TestCase
 {
@@ -45,6 +46,11 @@ public function testCreateDynamicLead($data)
         $hydratedLead = new Lead($data);
         $dynamicLead = new Lead();
 
+        $tasks = [];
+        foreach ($data['tasks'] as $task) {
+            $tasks[] = new Task($task);
+        }
+
         $dynamicLead->setId($data['id']);
         $dynamicLead->setStatusId($data['status_id']);
         $dynamicLead->setStatusLabel($data['status_label']);
@@ -54,7 +60,7 @@ public function testCreateDynamicLead($data)
         $dynamicLead->setOrganization($data['organization']);
         $dynamicLead->setCreatedBy($data['created_by']);
         $dynamicLead->setUrl($data['url']);
-        $dynamicLead->setTasks($data['tasks']);
+        $dynamicLead->setTasks($tasks);
         $dynamicLead->setName($data['name']);
         $dynamicLead->setContacts($data['contacts']);
         $dynamicLead->setDateCreated($data['date_created']);
@@ -137,6 +143,7 @@ public function fullLeadProvider()
                     'url' => 'http://www.test-url.com',
                     'tasks' => [
                         [
+                            '_type' => 'lead',
                             'due_date' => '01-01-2016',
                             'text' => 'Test Task Text',
                             'assigned_to' => 'dfaslk2324',