Merge pull request #4 from apruve/AP-3072

AP-3072 - porting to v4 API.

.gitignore

@@ -4,5 +4,6 @@
 
 vendor/
 composer.phar
+phpunit.phar
 .idea/
 .DS_Store

Apruve.php

@@ -1,8 +1,7 @@
 <?php
 
-interface Environment 
-{
-  const PROD = 'https://app.apruve.com';
-  const TEST = 'https://test.apruve.com';
-  const DEV = 'http://localhost:3000';
+interface Environment {
+	const PROD = 'https://app.apruve.com';
+	const TEST = 'https://test.apruve.com';
+	const DEV = 'http://localhost:3000';
 }

README.md

@@ -17,7 +17,7 @@ Please use [Github issues](https://github.com/apruve/apruve-php/issues) to reque
 Add this require to your `composer.json`:
 
     "require": {
-      "apruve/apruve-php": "~1.0"
+      "apruve/apruve-php": "~1.2"
     }
 
 **NOTE**: Be sure to update the version as you update the version of apruve-php

composer.json

@@ -1,22 +1,22 @@
 {
-    "name": "apruve/apruve-php",
-    "description": "Apruve PHP Library to support apruve.js.",
-    "require-dev": {
-        "phpunit/phpunit": "4.1.0"
-    },
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Apruve",
-            "email": "support@apruve.com"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0"
-    },
-    "autoload": {
-      "psr-0" : {
-        "Apruve" : "src"
-      }
+  "name": "apruve/apruve-php",
+  "description": "Apruve PHP Library to support apruve.js.",
+  "require-dev": {
+    "phpunit/phpunit": "4.1.0"
+  },
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Apruve",
+      "email": "support@apruve.com"
     }
+  ],
+  "require": {
+    "php": ">=5.3.0"
+  },
+  "autoload": {
+    "psr-0": {
+      "Apruve": "src"
+    }
+  }
 }

src/Apruve/ApruveObject.php

@@ -4,59 +4,47 @@
 
 abstract class ApruveObject {
 
-  protected $client;
-
-  public function __construct($values=[], $client=null) 
-  {
-    if ($client == null)
-    {
-      $this->client = new Client();
-    }
-    else
-    {
-      $this->client = $client;
-    }
-    foreach ($values as $name => $value)
-    {
-      $this->$name = $value;
-    }
-  }
-
-  public function toHashString()
-  {
-    $ret = '';
-    $called_class = get_called_class();
-    foreach ($called_class::$hash_order as $key)
-    {
-      $ret .= $this->$key;
-    }
-    return $ret;
-  }
-
-  public function toJsonArray()
-  {
-    $jsonArr = [];
-    $called_class = get_called_class();
-    foreach ($called_class::$json_fields as $key)
-    {
-      if (gettype($this->$key) == "array")
-      {
-        $jsonArr[$key] = [];
-        foreach($this->$key as $item)
-        {
-          array_push($jsonArr[$key], $item->toJsonArray());
-        }
-      }
-      else
-      {
-        $jsonArr[$key] = $this->$key;
-      }
-    }
-    return $jsonArr;
-  }
-
-  public function toJson()
-  {
-    return json_encode($this->toJsonArray());
-  }  
+	protected $client;
+
+	public function __construct( $values = [], $client = null ) {
+		if ( $client == null ) {
+			$this->client = new Client();
+		} else {
+			$this->client = $client;
+		}
+		foreach ( $values as $name => $value ) {
+			$this->$name = $value;
+		}
+	}
+
+	public function toHashString() {
+		$ret          = '';
+		$called_class = get_called_class();
+		foreach ( $called_class::$hash_order as $key ) {
+			$ret .= $this->$key;
+		}
+
+		return $ret;
+	}
+
+	public function toJson() {
+		return json_encode( $this->toJsonArray() );
+	}
+
+	public function toJsonArray() {
+		$jsonArr      = [];
+		$called_class = get_called_class();
+		foreach ( $called_class::$json_fields as $key ) {
+			if ( gettype( $this->$key ) == "array" ) {
+				$jsonArr[ $key ] = [];
+				foreach ( $this->$key as $item ) {
+					array_push( $jsonArr[ $key ], $item->toJsonArray() );
+				}
+			} else {
+				$jsonArr[ $key ] = $this->$key;
+			}
+		}
+
+		return $jsonArr;
+	}
 }