EOD Changes

- Require 'ext-curl'
- Fix xml2js return
- Added API_Authenticate test
- Create runAll.php for running tests

Author: tflanagan

composer.json

@@ -23,6 +23,7 @@
 		}
 	],
 	"require": {
-		"php": ">=5.4.0"
+		"php": ">=5.4.0",
+		"ext-curl": "*"
 	}
 }

quickbase.php

@@ -15,19 +15,6 @@
  * limitations under the License.
 */
 
-/* Error Handling */
-class QuickBaseError extends Exception {
-
-	public function __construct($code = 0, $message = 'No error', $detail = ''){
-		parent::__construct($message.$detail, $code);
-	}
-
-	public function __toString(){
-		return __CLASS__.': ['.$this->code.'] '.$this->message;
-	}
-
-}
-
 class QuickBase {
 
 	private $defaults = array(
@@ -55,22 +42,40 @@ class QuickBase {
 			'errdetail' => ''
 		),
 
-		'maxErrorRetryAttempts': 3,
-		// 'connectionLimit' => 10,
-		// 'errorOnConnectionLimit' => false
+		'maxErrorRetryAttempts' => 3
 	);
 
-	public function __construct($options){
+	public function __construct($options = array()){
 		$this->settings = array_merge_recursive($this->defaults, $options);
 	}
 
-	public function api($action, $options){
+	public function api($action, $options = array()){
+		return new QuickBaseQuery($this, $action, $options);
+	}
+
+}
+
+class QuickBaseError extends Exception {
+
+	public function __construct($code = 0, $message = 'No error', $detail = ''){
+		parent::__construct($message.$detail, $code);
+	}
+
+	public function __toString(){
+		return __CLASS__.': ['.$this->code.'] '.$this->message;
+	}
+
+}
 
+class QuickBaseQuery {
+	
+	public function __construct($action, $options){
+		$this->packet = new SimpleXMLElement('<qdbapi></qdbapi>');
+	
+		return $this;
 	}
 
-	/* Helpers */
-	protected function xml2js($xml){
-		$root = func_num_args() > 1 ? false : true;
+	protected function xml2js($xml, $root = false){
 		$js = array();
 
 		if($root){
@@ -79,7 +84,7 @@ protected function xml2js($xml){
 
 			array_push($js[$nodeName], $this->xml2js($xml, true));
 
-			return $json_encode($js);
+			return json_encode($js);
 		}
 
 		if(count($xml->attributes()) > 0){
@@ -106,7 +111,7 @@ protected function xml2js($xml){
 			array_push($js[$childName], $this->xml2js($child, true));
 		}
 
-		return $js;
+		return json_encode($js);
 	}
 
 }

tests/API_Authenticate.php

@@ -0,0 +1,23 @@
+<?php
+
+/* Copyright 2015 Tristian Flanagan
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+$response = $qb->api('API_Authenticate', array(
+	'username' => '',
+	'password' => ''
+));
+
+?>

tests/runAll.php

@@ -15,6 +15,65 @@
  * limitations under the License.
 */
 
-require_once('../quickbase.php');
+/* Dependancies */
+require_once(__DIR__.'/../quickbase.php');
+
+/* Error Handling */
+set_error_handler(function($errno, $errstr, $errfile, $errline, $errcontext){
+	if(error_reporting() === 0){
+		return false;
+	}
+
+	throw new Exception($errstr, $errno);
+});
+
+/* Globals */
+$stderr = fopen('php://stderr', 'w+');
+$error = false;
+
+$qb = new QuickBase();
+
+/* Main */
+$files = array_diff(scandir(__DIR__), array(
+	'..',
+	'.',
+	'runAll.php',
+	'API_Authenticate.php'
+));
+
+array_unshift($files, 'API_Authenticate.php');
+
+foreach($files as $i => $file){
+	if(strpos($file, '.') === 0){
+		continue;
+	}
+
+	try {
+		echo "\nRunning Test ".$file.'... ';
+
+		include(__DIR__.'/'.$file);
+
+		echo 'Passed.';
+	}catch(Exception $e){
+		fwrite($stderr, implode('', array(
+			'Failed!',
+			"\n\nError: [".$e->getCode().'] ',
+			$e->getMessage(),
+			"\n".$e->getTraceAsString()
+		)));
+
+		$error = true;
+
+		break;
+	}
+}
+
+fclose($stderr);
+
+if($error){
+	echo "\n\nTesting Failed! Please see above for details.";
+}else{
+	echo "\n\nTesting Complete!";
+}
 
 ?>