Merge branch 'develop'

Conflicts:
	README.md

Author: Chris Park

README.md

@@ -2,13 +2,14 @@
 
 PHP client binding for Rosette API
 ==================================
+See the wiki for more information.
 
 See the [wiki](https://github.com/rosette-api/php/wiki) for more information.
 
 Installation
 ------------
 
-`composer require "rosette/api: ~1.0.0"`
+`composer require "rosette/api: ~1.0.1"`
 
 Basic Usage
 -----------

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "rosette/api",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Rosette API PHP client SDK",
   "license": "Apache",
   "keywords": [

examples/README.md

@@ -20,7 +20,6 @@ Each example, when run, prints its output to the console.
 
 | File Name                     | What it does                                          | 
 | -------------                 |-------------                                        | 
-| base64_input.php                  | Entities using base64 encoded string                  |
 | categories.php                    | Gets the category of a document at a URL              | 
 | entities.php                      | Gets the entities from a piece of text                | 
 | entities_linked.php               | Gets the linked (to Wikipedia) entities from a piece of text |

source/rosette/api/Api.php

@@ -277,7 +277,7 @@ private function callEndpoint($parameters, $subUrl)
     {
         $this->checkVersion($this->service_url);
         $this->subUrl = $subUrl;
-        $this->useMultiPart = $parameters->useMultiPart;
+        $this->useMultiPart = isset($parameters->useMultiPart) ? $parameters->useMultiPart : null;
 
         if ($this->useMultiPart) {
             $content = $parameters->content;
@@ -345,7 +345,7 @@ public function checkVersion($url, $versionToCheck = null)
             $resultObject = array_pop((array_slice($resultObject, -1)));
             $resultObject = (array) json_decode($resultObject);
 
-            if ($resultObject['versionChecked'] === true) {
+            if (key_exists('versionChecked', $resultObject) && $resultObject['versionChecked'] === true) {
                 $this->version_checked = true;
             } else {
                 throw new RosetteException(
@@ -385,11 +385,11 @@ private function makeRequest($url, $headers, $data, $method)
         if ($this->useMultiPart === null) {
             $data = (array) $data;
 
-            if ($data['content'] === "") {
+            if (key_exists('content', $data) && $data['content'] === "") {
                 unset($data['content']);
             }
 
-            if ($data['contentUri'] === "") {
+            if (key_exists('contentUri', $data) && $data['contentUri'] === "") {
                 unset($data['contentUri']);
             }
 
@@ -430,10 +430,12 @@ private function makeRequest($url, $headers, $data, $method)
         $response = explode(PHP_EOL, $response);
         $this->setResponseCode($resCode);
 
-        if (strlen($response[9]) > 3 && mb_strpos($response[9], "\x1f" . "\x8b" . "\x08", 0) === 0) {
-            // a gzipped string starts with ID1(\x1f) ID2(\x8b) CM(\x08)
-            // http://www.gzip.org/zlib/rfc-gzip.html#member-format
-            $response = gzinflate(substr($response, 10, -8));
+        if (count($response) > 8) {
+            if (strlen($response[9]) > 3 && mb_strpos($response[9], "\x1f" . "\x8b" . "\x08", 0) === 0) {
+                // a gzipped string starts with ID1(\x1f) ID2(\x8b) CM(\x08)
+                // http://www.gzip.org/zlib/rfc-gzip.html#member-format
+                $response = gzinflate(substr($response, 10, -8));
+            }
         }
         if ($this->getResponseCode() < 500) {
             return $response;
@@ -518,7 +520,7 @@ function ($k, $v) {
     private function getHttp($url, $headers)
     {
         $method = 'GET';
-        $response = $this->makeRequest($url, $headers, $data, $method);
+        $response = $this->makeRequest($url, $headers, null, $method);
 
         return $response;
     }