Adds a getType method on Resource

Resolves #210 Resolves #245 This adds a method `getType` on every resource object which returns the xml attribute `type`. This can currently be found on Adjustments, Transactions, and BillingInfos.
recurly · Jan 19, 2017 · 85a89c0 · 85a89c0
1 parent 87f2056
commit 85a89c0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 1 deletion.
diff --git a/Tests/Recurly/Adjustment_Test.php b/Tests/Recurly/Adjustment_Test.php
@@ -16,6 +16,7 @@ public function testGetAdjustment() {
     $this->assertInstanceOf('Recurly_Stub', $adjustment->account);
     $this->assertInstanceOf('Recurly_Stub', $adjustment->invoice);
     $this->assertInstanceOf('Recurly_Stub', $adjustment->subscription);
+    $this->assertEquals('charge', $adjustment->getType());
     $this->assertEquals('abcdef1234567890', $adjustment->uuid);
     $this->assertEquals('invoiced', $adjustment->state);
     $this->assertEquals('$12 Annual Subscription', $adjustment->description);

diff --git a/Tests/Recurly/Billing_Info_Test.php b/Tests/Recurly/Billing_Info_Test.php
@@ -27,6 +27,7 @@ public function testGetBillingInfo() {
     $this->assertEquals($billing_info->year, 2015);
     $this->assertEquals($billing_info->month, 1);
     $this->assertEquals($billing_info->getHref(), 'https://api.recurly.com/v2/accounts/abcdef1234567890/billing_info');
+    $this->assertEquals($billing_info->getType(), 'credit_card');
   }
 
   public function testGetPayPalBillingInfo() {

diff --git a/Tests/Recurly/Transaction_Test.php b/Tests/Recurly/Transaction_Test.php
@@ -35,6 +35,7 @@ public function testGetTransaction() {
     $this->assertInstanceOf('Recurly_FraudInfo', $transaction->fraud);
     $this->assertEquals($transaction->fraud->score, 99);
     $this->assertEquals($transaction->fraud->decision, 'DECLINE');
+    $this->assertEquals($transaction->getType(), 'credit_card');
   }
 
   public function testCreateTransactionFailed() {

diff --git a/Tests/fixtures/billing_info/show-200.xml b/Tests/fixtures/billing_info/show-200.xml
@@ -2,7 +2,7 @@ HTTP/1.1 200 OK
 Content-Type: application/xml; charset=utf-8
 
 <?xml version="1.0" encoding="UTF-8"?>
-<billing_info href="https://api.recurly.com/v2/accounts/abcdef1234567890/billing_info">
+<billing_info href="https://api.recurly.com/v2/accounts/abcdef1234567890/billing_info" type="credit_card">
   <account href="https://api.recurly.com/v2/accounts/abcdef1234567890"/>
   <first_name>Larry</first_name>
   <last_name>David</last_name>

diff --git a/lib/recurly/base.php b/lib/recurly/base.php
@@ -3,6 +3,7 @@
 abstract class Recurly_Base
 {
   protected $_href;
+  protected $_type;
   protected $_client;
   protected $_links;
 
@@ -149,6 +150,11 @@ public function setHref($href) {
     $this->_href = $href;
   }
 
+  /** Refers to the `type` root xml attribute **/
+  public function getType() {
+    return $this->_type;
+  }
+
   private function addLink($name, $href, $method){
     $this->_links[$name] = new Recurly_Link($name, $href, $method);
   }
@@ -299,6 +305,7 @@ protected static function __parseXmlToObject($node, &$object)
           }
 
           $new_obj = Recurly_Resource::__createNodeObject($node);
+
           if (!is_null($new_obj)) {
             if (is_object($new_obj) || is_array($new_obj)) {
               Recurly_Resource::__parseXmlToObject($node->firstChild, $new_obj);
@@ -403,6 +410,12 @@ private static function __createNodeObject($node)
       } else
         $new_obj = new $node_class();
 
+      // It may have a type attribute we wish to capture
+      $typeAttribute = $node->getAttribute('type');
+      if (!empty($typeAttribute)) {
+        $new_obj->_type = $typeAttribute;
+      }
+
       $href = $node->getAttribute('href');
       if (!empty($href)) {
         $new_obj->setHref($href);