Crankshaft[BU000001EE1CZ5] Client - PHP @ 2015-07-06 16:32:32 +0000

9ad83f4 Pete Hamilton <[email protected]> Handle nested arrays of non-objects ---------------- 60a9bcc Pete Hamilton <[email protected]> Use latest schema version ---------------- 5c38c76 Pete Hamilton <[email protected]> Updated Makefile ----------------
gocardless · Jul 6, 2015 · 5425ad4 · 5425ad4
1 parent 8f70880
commit 5425ad4
Show file tree

Hide file tree

Showing 29 changed files with 121 additions and 254 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ Add this repository to the contents of your `composer.json`:
 ```javascript
 {
     "require": {
-        "gocardless/gocardless-pro-php": "0.2.0"
+        "gocardless/gocardless-pro-php": "0.3.0"
     }
 }
 ```

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     "squizlabs/php_codesniffer": "~2.0",
     "phpdocumentor/phpdocumentor": "2.*"
   },
-  "version": "0.2.0",
+  "version": "0.3.0",
   "autoload": {
     "psr-4": {
       "GoCardlessPro\\" : "lib/GoCardlessPro"

diff --git a/lib/GoCardlessPro/Client.php b/lib/GoCardlessPro/Client.php
@@ -163,19 +163,6 @@ public function events()
         return $this->events;
     }
 
-  /**
-    * Helpers
-    *
-    * @return Services\Helper
-    */
-    public function helpers()
-    {
-        if (!isset($this->helpers)) {
-            $this->helpers = new Services\HelpersService($this->http_client);
-        }
-        return $this->helpers;
-    }
-
   /**
     * Mandates
     *
@@ -336,10 +323,10 @@ public function refunds()
     * - The first payment must be
     * charged within 1 year.
     * - When neither `month` nor `day_of_month` are
-    * present, the subscription will recur from the `start_at` based on the
+    * present, the subscription will recur from the `start_date` based on the
     * `interval_unit`.
     * - If `month` or `day_of_month` are present, the
-    * recurrence rules will be applied from the `start_at`, and the following
+    * recurrence rules will be applied from the `start_date`, and the following
     * validations apply:
     * 
     * | interval_unit   | month                 

diff --git a/lib/GoCardlessPro/Core/CurlWrapper.php b/lib/GoCardlessPro/Core/CurlWrapper.php
@@ -70,11 +70,11 @@ private function getUserAgent()
     {
         $curlinfo = curl_version();
         $uagent = array();
-        $uagent[] = 'gocardless-pro-php/0.2.0';
+        $uagent[] = 'gocardless-pro-php/0.3.0';
         $uagent[] = 'php/' . phpversion();
         $uagent[] = 'curl/' . $curlinfo['version'];
         $uagent[] = 'os/' . $curlinfo['host'];
-        $uagent[] = 'schema-version/2015-04-29';
+        $uagent[] = 'schema-version/2015-07-06';
         return implode(' ', $uagent);
     }
 

diff --git a/lib/GoCardlessPro/Core/HttpClient.php b/lib/GoCardlessPro/Core/HttpClient.php
@@ -48,8 +48,8 @@ public function __construct($token, $baseUrl, $options = array())
         $this->headers['accept'] = 'application/json';
 
         // Config Headers
-        $this->headers['GoCardless-Version'] = '2015-04-29';
-        $this->headers['GoCardless-Version'] = '2015-04-29';
+        $this->headers['GoCardless-Version'] = '2015-07-06';
+        $this->headers['GoCardless-Version'] = '2015-07-06';
 
     }
 

diff --git a/lib/GoCardlessPro/Resources/Helper.php b/lib/GoCardlessPro/Resources/Helper.php
diff --git a/lib/GoCardlessPro/Resources/Subscription.php b/lib/GoCardlessPro/Resources/Subscription.php
@@ -18,13 +18,13 @@
   * - The first payment must be charged within 1
   * year.
   * - When neither `month` nor `day_of_month` are present, the
-  * subscription will recur from the `start_at` based on the `interval_unit`.
- 
-  * * - If `month` or `day_of_month` are present, the recurrence rules will be
-  * applied from the `start_at`, and the following validations apply:
+  * subscription will recur from the `start_date` based on the `interval_unit`.
+
+  *  * - If `month` or `day_of_month` are present, the recurrence rules will be
+  * applied from the `start_date`, and the following validations apply:
   * 
-  * |
-  * interval_unit   | month                                          |
+  *
+  * | interval_unit   | month                                          |
   * day_of_month                            |
   * | :-------------- |
   * :--------------------------------------------- |
@@ -95,8 +95,8 @@ public function amount()
     }
 
   /**
-    * An alternative way to set `end_at`. The total number of payments that
-    * should be taken by this subscription. This will set `end_at`
+    * An alternative way to set `end_date`. The total number of payments that
+    * should be taken by this subscription. This will set `end_date`
     * automatically.
     *
     * @return int
@@ -163,9 +163,9 @@ public function day_of_month()
     *
     * @return string
     */
-    public function end_at()
+    public function end_date()
     {
-        $field = 'end_at';
+        $field = 'end_date';
         if (!property_exists($this->data, $field)) {
             return null;
         }
@@ -301,9 +301,9 @@ public function payment_reference()
     *
     * @return string
     */
-    public function start_at()
+    public function start_date()
     {
-        $field = 'start_at';
+        $field = 'start_date';
         if (!property_exists($this->data, $field)) {
             return null;
         }

diff --git a/lib/GoCardlessPro/Resources/Wrapper/NestedArray.php b/lib/GoCardlessPro/Resources/Wrapper/NestedArray.php
@@ -62,7 +62,11 @@ public function raw()
     {
         $arrayOut = $this->data;
         foreach ($arrayOut as $key => $data_element) {
-            $arrayOut[$key] = $data_element->raw();
+            if (is_object($data_element) && (($data_element instanceof NestedArray) || ($data_element instanceof NestedObject))) {
+                $arrayOut[$key] = $data_element->raw();
+            } else {
+                $arrayOut[$key] = $data_element;
+            }
         }
         return $arrayOut;
     }

diff --git a/lib/GoCardlessPro/Services/HelpersService.php b/lib/GoCardlessPro/Services/HelpersService.php
diff --git a/lib/GoCardlessPro/Services/MandatesService.php b/lib/GoCardlessPro/Services/MandatesService.php
@@ -68,17 +68,6 @@ public function do_list($params = array(), $headers = array())
     *  Get a single mandate
     *
     *  Retrieves the details of an existing mandate.
-    *  
-    *  If you
-    *  specify `Accept: application/pdf` on a request to this endpoint it will
-    *  return a PDF complying to the relevant scheme rules, which you can
-    *  present to your customer.
-    *  
-    *  PDF mandates can be retrieved in
-    *  Dutch, English, French, German, Italian, Portuguese and Spanish by
-    *  specifying the [ISO
-    *  639-1](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes#Partial_ISO_639_table)
-    *  language code as an `Accept-Language` header.
     *
     *  Example URL: /mandates/:identity
     *

diff --git a/lib/GoCardlessPro/Services/SubscriptionsService.php b/lib/GoCardlessPro/Services/SubscriptionsService.php
@@ -23,10 +23,10 @@
   *  - The first payment must be charged
   *  within 1 year.
   *  - When neither `month` nor `day_of_month` are present,
-  *  the subscription will recur from the `start_at` based on the
+  *  the subscription will recur from the `start_date` based on the
   *  `interval_unit`.
   *  - If `month` or `day_of_month` are present, the
-  *  recurrence rules will be applied from the `start_at`, and the following
+  *  recurrence rules will be applied from the `start_date`, and the following
   *  validations apply:
   *  
   *  | interval_unit   | month                    

diff --git a/tests/GoCardlessPro/Core/HttpClientTest.php b/tests/GoCardlessPro/Core/HttpClientTest.php
@@ -34,7 +34,7 @@ public function testIncludedDefaultHeaders()
     {
         $defaultHeaders = $this->http_client->headers();
         // Config Headers
-        $this->assertEquals('2015-04-29', $defaultHeaders['GoCardless-Version']);
+        $this->assertEquals('2015-07-06', $defaultHeaders['GoCardless-Version']);
 
     }
 

diff --git a/tests/GoCardlessPro/Integration/BankDetailsLookupIntegrationTest.php b/tests/GoCardlessPro/Integration/BankDetailsLookupIntegrationTest.php
@@ -18,4 +18,24 @@ public function testResourceExists()
         $obj = new \GoCardlessPro\Resources\BankDetailsLookup(null);
         $this->assertNotNull($obj);
     }
+
+    public function testBankDetailsLookupsCreate()
+    {
+        $fixture = $this->stubResponse('create');
+
+        $func_array = array_values((array) $fixture->url_params);
+        $resourceService = $this->client->bank_details_lookups();
+        $response = call_user_func_array(array($resourceService, 'create'), $func_array);
+
+        $body = $fixture->body->bank_details_lookups;
+
+
+        $this->assertInstanceOf('\GoCardlessPro\Resources\BankDetailsLookup', $response);
+
+        $this->matchDeepResponse($body->available_debit_schemes, $response->available_debit_schemes());
+        $this->matchDeepResponse($body->bank_name, $response->bank_name());
+
+
+        $this->assertTrue($this->hasCheckedCurl);
+    }
 }
diff --git a/tests/GoCardlessPro/Integration/HelperIntegrationTest.php b/tests/GoCardlessPro/Integration/HelperIntegrationTest.php
diff --git a/tests/GoCardlessPro/Integration/MandatePdfIntegrationTest.php b/tests/GoCardlessPro/Integration/MandatePdfIntegrationTest.php
@@ -18,4 +18,24 @@ public function testResourceExists()
         $obj = new \GoCardlessPro\Resources\MandatePdf(null);
         $this->assertNotNull($obj);
     }
+
+    public function testMandatePdfsCreate()
+    {
+        $fixture = $this->stubResponse('create');
+
+        $func_array = array_values((array) $fixture->url_params);
+        $resourceService = $this->client->mandate_pdfs();
+        $response = call_user_func_array(array($resourceService, 'create'), $func_array);
+
+        $body = $fixture->body->mandate_pdfs;
+
+
+        $this->assertInstanceOf('\GoCardlessPro\Resources\MandatePdf', $response);
+
+        $this->matchDeepResponse($body->expires_at, $response->expires_at());
+        $this->matchDeepResponse($body->url, $response->url());
+
+
+        $this->assertTrue($this->hasCheckedCurl);
+    }
 }