Major refactoring of underlying object model for performance reasons.

- Still requires further refactoring.

Author: dcarbone

src/AbstractDefinedCollection.php renamed to src/AbstractObjectModel.php

@@ -17,26 +17,28 @@
 */
 
 /**
- * Class AbstractResponseModel
- * @package DCarbone\PHPConsulAPI\Base
+ * Class AbstractObjectModel
+ * @package DCarbone\PHPConsulAPI
  */
-abstract class AbstractDefinedCollection extends AbstractCollection
+abstract class AbstractObjectModel
 {
-    /** @var array */
-    protected $_definition = array();
-
     /**
-     * AbstractConsulConfig constructor.
+     * AbstractObjectModel constructor.
      * @param array $data
      */
     public function __construct(array $data = array())
     {
-        $this->_definition = $this->getDefinition();
-        parent::__construct($data + $this->_definition);
+        foreach($data as $k => $v)
+        {
+            $this->{$k} = $v;
+        }
     }
 
     /**
-     * @return array
+     * @return string
      */
-    abstract protected function getDefinition();
+    public function __toString()
+    {
+        return get_class($this);
+    }
 }

src/AbstractDefinedStrictCollection.php renamed to src/AbstractStrictCollection.php

@@ -17,11 +17,29 @@
 */
 
 /**
- * Class AbstractDefinedCollection
- * @package DCarbone\PHPConsulAPI\Base
+ * Class AbstractStrictCollection
+ * @package DCarbone\PHPConsulAPI
  */
-abstract class AbstractDefinedStrictCollection extends AbstractDefinedCollection
+abstract class AbstractStrictCollection extends AbstractCollection
 {
+    /** @var array */
+    protected $_definition = array();
+
+    /**
+     * AbstractConsulConfig constructor.
+     * @param array $data
+     */
+    public function __construct(array $data = array())
+    {
+        $this->_definition = $this->getDefinition();
+        parent::__construct($data + $this->_definition);
+    }
+
+    /**
+     * @return array
+     */
+    abstract protected function getDefinition();
+    
     /**
      * Whether a offset exists
      * @link http://php.net/manual/en/arrayaccess.offsetexists.php

src/Agent/AgentCheck.php

@@ -16,100 +16,36 @@
    limitations under the License.
 */
 
-use DCarbone\PHPConsulAPI\AbstractDefinedCollection;
+use DCarbone\PHPConsulAPI\AbstractObjectModel;
 
 /**
  * Class AgentCheck
  * @package DCarbone\PHPConsulAPI\Agent
  */
-class AgentCheck extends AbstractDefinedCollection
+class AgentCheck extends AbstractObjectModel
 {
-    /**
-     * @return array
-     */
-    protected function getDefinition()
-    {
-        return array(
-            'Node' => null,
-            'CheckID' => null,
-            'Name' => null,
-            'Status' => null,
-            'Notes' => null,
-            'Output' => null,
-            'ServiceID' => null,
-            'ServiceName' => null
-        );
-    }
-
-    /**
-     * @return string
-     */
-    public function getNode()
-    {
-        return $this['Node'];
-    }
-
-    /**
-     * @return string
-     */
-    public function getCheckID()
-    {
-        return $this['CheckID'];
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this['Name'];
-    }
-
-    /**
-     * @return string
-     */
-    public function getStatus()
-    {
-        return $this['Status'];
-    }
-
-    /**
-     * @return string
-     */
-    public function getNotes()
-    {
-        return $this['Nodes'];
-    }
-
-    /**
-     * @return string
-     */
-    public function getOutput()
-    {
-        return $this['Output'];
-    }
-
-    /**
-     * @return string
-     */
-    public function getServiceID()
-    {
-        return $this['ServiceID'];
-    }
-
-    /**
-     * @return string
-     */
-    public function getServiceName()
-    {
-        return $this['ServiceName'];
-    }
+    /** @var string */
+    public $Node = '';
+    /** @var string */
+    public $CheckID = '';
+    /** @var string */
+    public $Name = '';
+    /** @var string */
+    public $Status = '';
+    /** @var string */
+    public $Notes = '';
+    /** @var string */
+    public $Output = '';
+    /** @var string */
+    public $ServiceID = '';
+    /** @var string */
+    public $ServiceName = '';
 
     /**
      * @return string
      */
     public function __toString()
     {
-        return (string)$this['CheckID'];
+        return (string)$this->CheckID;
     }
 }