added file response object, simplified custom fields

Author: Desmond

HelloSign.php

@@ -12,6 +12,7 @@
 require_once 'library/HelloSign/EmbeddedSignatureRequest.php';
 require_once 'library/HelloSign/Error.php';
 require_once 'library/HelloSign/Event.php';
+require_once 'library/HelloSign/FileResponse.php';
 require_once 'library/HelloSign/OAuthToken.php';
 require_once 'library/HelloSign/OAuthTokenRequest.php';
 require_once 'library/HelloSign/Signature.php';

library/HelloSign/AbstractObject.php

@@ -78,8 +78,7 @@ public function toArray($options = array())
         foreach ($array as $key => $value) {
             if (!$options['include_null'] && $value === null) {
                 unset($array[$key]);
-            } elseif ($value instanceof AbstractObject
-                || $value instanceof AbstractList) {
+            } elseif ($value instanceof AbstractObject || $value instanceof AbstractList) {
                 $array[$key] = $value->toArray();
             }
         }

library/HelloSign/Client.php

@@ -235,6 +235,8 @@ public function getFiles($request_id, $dest_path = null, $type = null)
                 static::SIGNATURE_REQUEST_FILES_PATH . '/' . $request_id,
                 array('get_url' => true)
             );
+
+            return new FileResponse($response);
         }
 
         return $response;

library/HelloSign/EmbeddedResponse.php

@@ -39,14 +39,14 @@ class EmbeddedResponse extends AbstractResource
      * @ignore
      */
     protected $resource_type = 'embedded';
-
+    
     /**
      * URL of the signature page to display in the embedded iFrame
      *
      * @var string
      */
     protected $sign_url = null;
-
+    
     /**
      * When the link expires
      *

library/HelloSign/FileResponse.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * HelloSign PHP SDK (https://github.com/HelloFax/hellosign-php-sdk/)
+ */
+
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (C) 2014 hellosign.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace HelloSign;
+
+/**
+ * Class to hold a file url response
+ */
+class FileResponse extends AbstractObject
+{
+    /**
+     * @var string
+     * @ignore
+     */
+    protected $resource_type = 'file_url';
+    
+    /**
+     * URL where the file can be downloaded from
+     *
+     * @var string
+     */
+    protected $file_url = null;
+    
+    /**
+     * When the link expires
+     *
+     * @var integer
+     */
+    protected $expires_at = null;
+
+    /**
+     * @return string
+     * @ignore
+     */
+    public function getFileUrl()
+    {
+        return $this->file_url;
+    }
+
+    /**
+     * @return integer
+     * @ignore
+     */
+    public function getExpiresAt()
+    {
+        return $this->expires_at;
+    }
+}

library/HelloSign/SignatureRequest.php

@@ -105,9 +105,9 @@ class SignatureRequest extends AbstractSignatureRequest
     /**
      * A JSON array of Custom Field objects
      *
-     * @var array
+     * @var string
      */
-    protected $custom_fields = '[]';
+    protected $custom_fields = null;
 
     /**
      * An array of form field objects containing the name, value, and type of

library/HelloSign/Template.php

@@ -129,9 +129,9 @@ class Template extends AbstractResource
     /**
      * A JSON array of Custom Field objects
      *
-     * @var array
+     * @var string
      */
-    protected $custom_fields = '[]';
+    protected $custom_fields = null;
 
     /**
      * An array of Merge Field objects containing the name and type of each

library/HelloSign/TemplateSignatureRequest.php

@@ -59,9 +59,9 @@ class TemplateSignatureRequest extends AbstractSignatureRequest
     /**
      * A JSON array of Custom Field objects
      *
-     * @var array
+     * @var string
      */
-    protected $custom_fields = '[]';
+    protected $custom_fields = null;
 
     /**
      * Set the template ID, along with an optional order
@@ -122,7 +122,7 @@ public function setCC($role, $email)
      */
     public function setCustomFieldValue($field_name, $value, $editor = null, $required = null)
     {
-        $custom_fields = json_decode($this->custom_fields);
+        $custom_fields = isset($this->custom_fields) ? json_decode($this->custom_fields) : array();
 
         $custom_fields[] = array(
             'name'     => $field_name,