Merge pull request #22 from teaandcode/develop

Develop

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6

composer.json

@@ -18,7 +18,7 @@
         "php": ">=5.3.3",
         "behat/behat": "~3.0,>=3.0.5",
         "guzzle/guzzle": ">=3.5",
-        "symfony/config": ">=2.2"
+        "symfony/config": ">=2.2 <3.3"
     },
     "require-dev": {
         "phpspec/phpspec": "~2.0",

src/Behat/GuzzleExtension/Context/RawGuzzleContext.php

@@ -13,6 +13,7 @@
 
 namespace Behat\GuzzleExtension\Context;
 
+use Guzzle\Common\Exception\RuntimeException;
 use Guzzle\Http\Exception\BadResponseException;
 use Guzzle\Http\Exception\ClientErrorResponseException;
 use Guzzle\Http\Message\Response;
@@ -38,7 +39,7 @@ class RawGuzzleContext implements GuzzleAwareContext
     /**
      * @var string
      */
-    const GUZZLE_EXTENSION_VERSION = '0.4.0';
+    const GUZZLE_EXTENSION_VERSION = '0.4.1';
 
     /**
      * @var Client
@@ -90,6 +91,22 @@ public function executeCommand($command, array $data = array())
         } catch (BadResponseException $e) {
             $this->response = $e->getResponse();
 
+            try {
+                $this->result = $this->response->json();
+
+                return;
+            } catch (RuntimeException $e) {
+                continue;
+            }
+
+            try {
+                $this->result = $this->response->xml();
+
+                return;
+            } catch (RuntimeException $e) {
+                continue;
+            }
+
             return;
         }
 
@@ -325,7 +342,7 @@ private function setRequestOptions(array $options)
      * Adds, updates or removes header (if no value is provided)
      *
      * @param string $field Field name
-     * @param mixed  $value Header value
+     * @param string $value Header value
      *
      * @access private
      * @return void