commit 82eb058d41cf109edeccc99a6c327c734470d3d8
author Donald Szeto <donald@prediction.io> Mon Jan 27 21:21:19 2014 +0900
committer Donald Szeto <donald@prediction.io> Mon Jan 27 21:21:19 2014 +0900
tree 1fe55ca6fbe27d2a54ec8a1a8c3cc3e7122db180
parent 28b3656666b68fe8b74d9b1b316d55833cfc6da7
parent ff7e8650e65638ae0d120aa17c13d897bdba9520

Merge branch 'develop'

composer.json

diff --git a/composer.json b/composer.json
index 98fa668..d30709a 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     ],
     "require": {
     	"php": ">=5.3.2",
-    	"guzzle/guzzle": "~3.3.1"
+    	"guzzle/guzzle": "~3.8.0"
     },
     "require-dev": {
     	"symfony/class-loader": "*"

src/PredictionIO/PredictionIOClient.php

diff --git a/src/PredictionIO/PredictionIOClient.php b/src/PredictionIO/PredictionIOClient.php
index 3a5f3e2..940ba48 100644
--- a/src/PredictionIO/PredictionIOClient.php
+++ b/src/PredictionIO/PredictionIOClient.php
@@ -114,10 +114,11 @@
      * @param string|array                              $uri     Resource URI
      * @param array|Collection                          $headers HTTP headers
      * @param string|resource|array|EntityBodyInterface $body    Entity body of request (POST/PUT) or response (GET)
+     * @param array                                     $options Array of options to apply to the request
      *
      * @return RequestInterface
      */
-    public function createRequest($method = RequestInterface::GET, $uri = null, $headers = null, $body = null)
+    public function createRequest($method = RequestInterface::GET, $uri = null, $headers = null, $body = null, array $options = array())
     {
         if (is_array($body)) {
             $body['pio_appkey'] = $this->getConfig()->get("appkey");
@@ -133,10 +134,10 @@
         unset($body[AbstractCommand::RESPONSE_BODY]);
 
         if ($method == RequestInterface::GET || $method == RequestInterface::DELETE) {
-            $request = parent::createRequest($method, $uri, $headers, null);
+            $request = parent::createRequest($method, $uri, $headers, null, $options);
             $request->getQuery()->replace($body);
         } else {
-            $request = parent::createRequest($method, $uri, $headers, $body);
+            $request = parent::createRequest($method, $uri, $headers, $body, $options);
         }
         $request->setPath($request->getPath() . ".json");