ModelInterface addition to clean up ApiClient::deserialize call

composer.json

@@ -25,7 +25,7 @@
     }
   ],
   "require": {
-    "php": ">=5.3.3",
+    "php": ">=5.4.0",
     "ext-curl": "*",
     "ext-json": "*",
     "ext-mbstring": "*"

lib/ApiClient.php

@@ -17,6 +17,8 @@
 
 namespace DwollaSwagger;
 
+use DwollaSwagger\interfaces\ModelInterface;
+
 class ApiClient {
 
   public static $PATCH = "PATCH";
@@ -334,9 +336,10 @@ protected function sanitizeForSerialization($data)
       $sanitized = $data;
     } else if (is_object($data)) {
       $values = array();
-      foreach (array_keys($data::$swaggerTypes) as $property) {
+      /** @var ModelInterface $data */
+      foreach (array_keys($data::getSwaggerTypes()) as $property) {
         if ($data->$property !== null) {
-          $values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$property);
+          $values[$data::getAttributeMap()[$property]] = $this->sanitizeForSerialization($data->$property);
         }
       }
       $sanitized = $values;
@@ -445,10 +448,11 @@ public static function deserialize($data, $class)
       settype($data, $class);
       $deserialized = $data;
     } else {
+      /** @var ModelInterface $instance */
       $class = "DwollaSwagger\\models\\".$class;
       $instance = new $class();
-      foreach ($instance::$swaggerTypes as $property => $type) {
-        $original_property_name = $instance::$attributeMap[$property];
+      foreach ($instance::getSwaggerTypes() as $property => $type) {
+        $original_property_name = $instance::getAttributeMap()[$property];
         if (isset($original_property_name) && isset($data->$original_property_name)) {
           $instance->$property = self::deserialize($data->$original_property_name, $type);
         }

lib/interfaces/ModelInterface.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Created by Chris Piggott.
+ * User: cpiggott
+ * Date: 2019-02-27
+ * Time: 15:30
+ */
+
+namespace DwollaSwagger\interfaces;
+
+
+interface ModelInterface
+{
+  /**
+   * @return array Get Swagger Types
+   */
+  static function getSwaggerTypes();
+
+  /**
+   * @return array Get array of attributes
+   */
+  static function getAttributeMap();
+
+  public function offsetExists($offset);
+  public function offsetGet($offset);
+  public function offsetSet($offset, $value);
+  public function offsetUnset($offset);
+}

lib/models/AccountInfo.php

@@ -25,8 +25,9 @@
 namespace DwollaSwagger\models;
 
 use \ArrayAccess;
+use DwollaSwagger\interfaces\ModelInterface;
 
-class AccountInfo implements ArrayAccess {
+class AccountInfo implements ArrayAccess, ModelInterface {
   static $swaggerTypes = array(
       '_links' => 'map[string,HalLink]',
       'id' => 'string',
@@ -41,7 +42,7 @@ class AccountInfo implements ArrayAccess {
       '_embedded' => '_embedded'
   );
 
-  
+
   public $_links; /* map[string,HalLink] */
   public $id; /* string */
   public $name; /* string */
@@ -54,6 +55,22 @@ public function __construct(array $data = null) {
     $this->_embedded = $data["_embedded"];
   }
 
+  /**
+   * @return array static $swaggerTypes swagger types
+   */
+  public static function getSwaggerTypes()
+  {
+    return self::$swaggerTypes;
+  }
+
+  /**
+   * @return array static $attributeMap attribute map
+   */
+  public static function getAttributeMap()
+  {
+    return self::$attributeMap;
+  }
+
   public function offsetExists($offset) {
     return isset($this->$offset);
   }

lib/models/AccountOAuthToken.php

@@ -25,8 +25,9 @@
 namespace DwollaSwagger\models;
 
 use \ArrayAccess;
+use DwollaSwagger\interfaces\ModelInterface;
 
-class AccountOAuthToken implements ArrayAccess {
+class AccountOAuthToken implements ArrayAccess, ModelInterface {
   static $swaggerTypes = array(
       '_links' => 'map[string,HalLink]',
       '_embedded' => 'object',
@@ -50,6 +51,22 @@ public function __construct(array $data = null) {
     $this->token = $data["token"];
   }
 
+  /**
+   * @return array static $swaggerTypes swagger types
+   */
+  public static function getSwaggerTypes()
+  {
+    return self::$swaggerTypes;
+  }
+
+  /**
+   * @return array static $attributeMap attribute map
+   */
+  public static function getAttributeMap()
+  {
+    return self::$attributeMap;
+  }
+
   public function offsetExists($offset) {
     return isset($this->$offset);
   }

lib/models/Address.php

@@ -25,8 +25,9 @@
 namespace DwollaSwagger\models;
 
 use \ArrayAccess;
+use DwollaSwagger\interfaces\ModelInterface;
 
-class Address implements ArrayAccess {
+class Address implements ArrayAccess, ModelInterface {
   static $swaggerTypes = array(
       'address1' => 'string',
       'address2' => 'string',
@@ -66,6 +67,22 @@ public function __construct(array $data = null) {
     $this->postal_code = $data["postal_code"];
   }
 
+  /**
+   * @return array static $swaggerTypes swagger types
+   */
+  public static function getSwaggerTypes()
+  {
+    return self::$swaggerTypes;
+  }
+
+  /**
+   * @return array static $attributeMap attribute map
+   */
+  public static function getAttributeMap()
+  {
+    return self::$attributeMap;
+  }
+
   public function offsetExists($offset) {
     return isset($this->$offset);
   }

lib/models/Amount.php

@@ -25,8 +25,9 @@
 namespace DwollaSwagger\models;
 
 use \ArrayAccess;
+use DwollaSwagger\interfaces\ModelInterface;
 
-class Amount implements ArrayAccess {
+class Amount implements ArrayAccess, ModelInterface {
   static $swaggerTypes = array(
       'value' => 'string',
       'currency' => 'string'
@@ -46,6 +47,22 @@ public function __construct(array $data = null) {
     $this->currency = $data["currency"];
   }
 
+  /**
+   * @return array static $swaggerTypes swagger types
+   */
+  public static function getSwaggerTypes()
+  {
+    return self::$swaggerTypes;
+  }
+
+  /**
+   * @return array static $attributeMap attribute map
+   */
+  public static function getAttributeMap()
+  {
+    return self::$attributeMap;
+  }
+
   public function offsetExists($offset) {
     return isset($this->$offset);
   }

lib/models/ApplicationEvent.php

@@ -25,8 +25,9 @@
 namespace DwollaSwagger\models;
 
 use \ArrayAccess;
+use DwollaSwagger\interfaces\ModelInterface;
 
-class ApplicationEvent implements ArrayAccess {
+class ApplicationEvent implements ArrayAccess, ModelInterface {
   static $swaggerTypes = array(
       '_links' => 'map[string,HalLink]',
       '_embedded' => 'object',
@@ -62,6 +63,22 @@ public function __construct(array $data = null) {
     $this->resource_id = $data["resource_id"];
   }
 
+  /**
+   * @return array static $swaggerTypes swagger types
+   */
+  public static function getSwaggerTypes()
+  {
+    return self::$swaggerTypes;
+  }
+
+  /**
+   * @return array static $attributeMap attribute map
+   */
+  public static function getAttributeMap()
+  {
+    return self::$attributeMap;
+  }
+
   public function offsetExists($offset) {
     return isset($this->$offset);
   }

lib/models/Authorization.php

@@ -25,8 +25,9 @@
 namespace DwollaSwagger\models;
 
 use \ArrayAccess;
+use DwollaSwagger\interfaces\ModelInterface;
 
-class Authorization implements ArrayAccess {
+class Authorization implements ArrayAccess, ModelInterface {
   static $swaggerTypes = array(
 
   );
@@ -35,12 +36,27 @@ class Authorization implements ArrayAccess {
 
   );
 
-
 
   public function __construct(array $data = null) {
 
   }
 
+  /**
+   * @return array static $swaggerTypes swagger types
+   */
+  public static function getSwaggerTypes()
+  {
+    return self::$swaggerTypes;
+  }
+
+  /**
+   * @return array static $attributeMap attribute map
+   */
+  public static function getAttributeMap()
+  {
+    return self::$attributeMap;
+  }
+
   public function offsetExists($offset) {
     return isset($this->$offset);
   }

lib/models/BeneficialOwnerListResponse.php

@@ -25,8 +25,9 @@
 namespace DwollaSwagger\models;
 
 use \ArrayAccess;
+use DwollaSwagger\interfaces\ModelInterface;
 
-class BeneficialOwnerListResponse implements ArrayAccess {
+class BeneficialOwnerListResponse implements ArrayAccess, ModelInterface {
   static $swaggerTypes = array(
       '_links' => 'map[string,HalLink]',
       '_embedded' => 'object',
@@ -50,6 +51,22 @@ public function __construct(array $data = null) {
     $this->total = $data["total"];
   }
 
+  /**
+   * @return array static $swaggerTypes swagger types
+   */
+  public static function getSwaggerTypes()
+  {
+    return self::$swaggerTypes;
+  }
+
+  /**
+   * @return array static $attributeMap attribute map
+   */
+  public static function getAttributeMap()
+  {
+    return self::$attributeMap;
+  }
+
   public function offsetExists($offset) {
     return isset($this->$offset);
   }

lib/models/BusinessClassification.php

@@ -25,8 +25,9 @@
 namespace DwollaSwagger\models;
 
 use \ArrayAccess;
+use DwollaSwagger\interfaces\ModelInterface;
 
-class BusinessClassification implements ArrayAccess {
+class BusinessClassification implements ArrayAccess, ModelInterface {
   static $swaggerTypes = array(
       '_links' => 'map[string,HalLink]',
       '_embedded' => 'object',
@@ -54,6 +55,22 @@ public function __construct(array $data = null) {
     $this->name = $data["name"];
   }
 
+  /**
+   * @return array static $swaggerTypes swagger types
+   */
+  public static function getSwaggerTypes()
+  {
+    return self::$swaggerTypes;
+  }
+
+  /**
+   * @return array static $attributeMap attribute map
+   */
+  public static function getAttributeMap()
+  {
+    return self::$attributeMap;
+  }
+
   public function offsetExists($offset) {
     return isset($this->$offset);
   }

lib/models/BusinessClassificationListResponse.php

@@ -25,8 +25,9 @@
 namespace DwollaSwagger\models;
 
 use \ArrayAccess;
+use DwollaSwagger\interfaces\ModelInterface;
 
-class BusinessClassificationListResponse implements ArrayAccess {
+class BusinessClassificationListResponse implements ArrayAccess, ModelInterface {
   static $swaggerTypes = array(
       '_links' => 'map[string,HalLink]',
       '_embedded' => 'object',
@@ -50,6 +51,23 @@ public function __construct(array $data = null) {
     $this->total = $data["total"];
   }
 
+
+  /**
+   * @return array static $swaggerTypes swagger types
+   */
+  public static function getSwaggerTypes()
+  {
+    return self::$swaggerTypes;
+  }
+
+  /**
+   * @return array static $attributeMap attribute map
+   */
+  public static function getAttributeMap()
+  {
+    return self::$attributeMap;
+  }
+
   public function offsetExists($offset) {
     return isset($this->$offset);
   }