Merge pull request #5 from elliotchance/release/0.5

Release/0.5

Author: elliotchance

README.md

@@ -6,9 +6,15 @@ Xero API
 [![License](https://poser.pugx.org/elliotchance/xero-api/license.svg)](https://packagist.org/packages/elliotchance/xero-api)
 [![Build Status](https://travis-ci.org/elliotchance/xero-api.svg?branch=master)](https://travis-ci.org/elliotchance/xero-api)
 
-**This is the community official package since Xero is unwilling to add composer support or clean up the library.** Please add existing pull requests and issues against this repository and we can all help fix it up :)
+**This is the community official package since Xero is unwilling to add composer
+support or clean up the library.** Please add existing pull requests and issues
+against this repository and we can all help fix it up :)
 
-Semantic versions have been created for existing releases and will be created here in the future.
+Semantic versions have been created for existing releases and will be created
+based on the same version from the original repository to keep it up to date. On
+top of that we have patches (i.e. `0.5.1`) between Xero releases.
+
+There will be a suite of tests coming soon.
 
 ### Installation
 
@@ -31,7 +37,7 @@ production environment.
 
 ## Requirements
 * PHP 5+
-* php\_curl extension
+* php\_curl extension - ensure a recent version (7.30+)
 * php\_openssl extension
 
 

_config.php

@@ -43,6 +43,7 @@
     // API versions
     'core_version'=> '2.0',
     'payroll_version'=> '1.0',
+    'file_version' => '1.0'
 );
 
 if (XRO_APP_TYPE=="Private"||XRO_APP_TYPE=="Partner") {

certs/ca-bundle.crt

@@ -235,7 +235,6 @@ private function prepare_method($method) {
 	 * @return void response data is stored in the class variable 'response'
 	 */
 	private function curlit() {
-		$this->headers = array ();
 		$this->request_params = array();
 
 
@@ -367,19 +366,6 @@ private function curlit() {
 		$this->response ['format'] = $this->format;
 		return $code;
 	}
-	function MakeRequest($endpoint, $parameters, $action, $data, $app_type, $format = "xml") {
-		$oauthObject = new OAuthSimple ();
-		
-		// Set some standard curl options....
-		
-		$useragent = USER_AGENT;
-		$useragent = isset ( $useragent ) ? USER_AGENT : 'XeroOAuth-PHP';
-		$options [CURLOPT_USERAGENT] = $useragent;
-		$options [CURLOPT_VERBOSE] = 1;
-		$options [CURLOPT_RETURNTRANSFER] = 1;
-		$options [CURLOPT_SSL_VERIFYHOST] = 0;
-		$options [CURLOPT_SSL_VERIFYPEER] = 0;
-	}
 
 	/**
 	 * Make an HTTP request using this library.
@@ -400,6 +386,7 @@ function request($method, $url, $params = array(), $xml = "", $format = 'xml') {
 		// removed these as function parameters for now
 		$useauth = true;
 		$multipart = false;
+		$this->headers = array ();
 
 		if (isset ( $format )) {
 			switch ($format) {
@@ -445,7 +432,10 @@ function request($method, $url, $params = array(), $xml = "", $format = 'xml') {
 		} 
 
 		catch ( Exception $e ) {
-			$errorMessage = $e->getMessage ();
+			$errorMessage = 'XeroOAuth::request() ' . $e->getMessage ();
+			$this->response['response'] = $errorMessage;
+			$this->response['helper'] = $url;
+			return $this->response;
 		}
 		$this->format = $format;
 
@@ -524,6 +514,10 @@ function url($request, $api = "core") {
 					$api_stem = "payroll.xro";
 					$api_version = $this->config ['payroll_version'];
 				}
+				if ($api == "file") {
+					$api_stem = "files.xro";
+					$api_version = $this->config ['file_version'];
+				}
 			}
 			$this->config ['host'] = $this->config ['xero_url'] . $api_stem . '/' . $api_version . '/';
 		}

lib/XeroOAuth.php

@@ -40,7 +40,8 @@
 		'shared_secret' => 's',
 		// API versions
 		'core_version' => '2.0',
-		'payroll_version' => '1.0' 
+		'payroll_version' => '1.0',
+		'file_version' => '1.0'
 );
 
 if (XRO_APP_TYPE == "Private" || XRO_APP_TYPE == "Partner") {

partner.php

@@ -11,7 +11,8 @@
 		'shared_secret' => 'YOURSECRET',
 		// API versions
 		'core_version' => '2.0',
-		'payroll_version' => '1.0' 
+		'payroll_version' => '1.0',
+		'file_version' => '1.0' 
 );
 
 if (XRO_APP_TYPE == "Private" || XRO_APP_TYPE == "Partner") {

private.php

@@ -43,7 +43,8 @@
 		'shared_secret' => 'YOURSECRET',
 		// API versions
 		'core_version' => '2.0',
-		'payroll_version' => '1.0' 
+		'payroll_version' => '1.0',
+		'file_version' => '1.0' 
 );
 
 if (XRO_APP_TYPE == "Private" || XRO_APP_TYPE == "Partner") {

public.php

@@ -7,15 +7,20 @@ function testLinks()
         echo '<ul>
                 <li><a href="?=1">Home</a></li>
                 <li><a href="?organisation=1">Organisation</a></li>
+                <li><a href="?organisation=1&request=json">Organisation (JSON response)</a></li>
                 <li><a href="?accounts=1">Accounts GET</a></li>
                 <li><a href="?accountsfilter=1">Accounts GET - Where Type is BANK</a></li>
                 <li><a href="?banktransactions=1">BankTransactions GET</a></li>
                 <li><a href="?banktransactions=1&method=put">BankTransactions PUT</a></li>
                 <li><a href="?contacts=1">Contacts GET</a></li>
                 <li><a href="?contacts=1&method=post">Contacts POST</a></li>
                 <li><a href="?contacts=1&method=put">Contacts PUT</a></li>
+                <li><a href="?folders=1">Folders GET</a></li>
                 <li><a href="?payrollemployees=1">Payroll Employees GET</a></li>
                 <li><a href="?payruns=1">Payroll Payruns GET</a></li>
+                <li><a href="?payrollsuperfunds=1">Payroll Superfunds GET</a></li>
+                <li><a href="?payments=1">Payments GET</a></li>
+                <li><a href="?payments=1&method=post">Payments POST (Delete payment)</a></li>
                 <li><a href="?invoice=1">Invoices GET (with order by Total example)</a></li>
                 <li><a href="?invoicesfilter=1">Invoices GET - Where Contact Name contains "Martin"</a></li>
                 <li><a href="?invoicesmodified=1">Invoices GET - If-Modified-Since</a></li>
@@ -24,7 +29,14 @@ function testLinks()
                 <li><a href="?invoice=1&method=post">Invoices POST</a></li>
                 <li><a href="?invoice=attachment&method=put">Invoice attachment PUT</a></li>
                 <li><a href="?invoice=pdf">Invoice PDF</a></li>
-                <li><a href="?trialbalance=1">Trial Balance</a></li>';
+                <li><a href="?items=1">Items GET</a></li>
+                <li><a href="?items=1&method=put">Items PUT</a></li>
+                <li><a href="?trialbalance=1">Trial Balance</a></li>
+                <li><a href="?trackingcategories=1">Tracking Categories - GET</a></li>
+                <li><a href="?trackingcategories=1&method=getarchived">Tracking Categories - GET (+ archived)</a></li>
+                <li><a href="?trackingcategories=1&method=put">Tracking Categories - PUT</a></li>
+                <li><a href="?trackingcategories=1&method=archive">Tracking Categories - ARCHIVE</a></li>
+                <li><a href="?trackingcategories=1&method=restore">Tracking Categories - restore to active</a></li>';
 
         if (XRO_APP_TYPE == 'Partner')   echo '<li><a href="?refresh=1">Refresh access token</a></li>';
         if (XRO_APP_TYPE !== 'Private' && isset($_SESSION['access_token'])) {