Update

Author: Florent Morselli

.travis.yml

@@ -1,31 +1,31 @@
 language: php
 
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
+sudo: false
 
 matrix:
-  fast_finish: true
-  include:
-    - php: 5.6
-      env: GUZZLE_VERSION=4.*
-
-before_install:
-  # start a web server on port 8080, running in the background
-  - bin/start_server.sh
+    fast_finish: true
+    allow_failures:
+        - php: nightly
+    include:
+        - php: 5.6
+        - php: 5.6
+          env: deps=low
+        - php: 7.0
+        - php: hhvm
+        - php: nightly
+        - php: nightly
+          env: deps=low
 
 before_script:
-  - composer self-update
-  - if [ "$GUZZLE_VERSION" != "" ]; then composer require "guzzlehttp/guzzle:${GUZZLE_VERSION}" --no-update; fi;
-  - composer install --prefer-source
-  - export LANG=C
-  - export PATH=vendor/bin:$PATH
+    - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-rm xdebug.ini; fi;'
+    - composer self-update
+    - if [[ $deps = low ]]; then composer update --no-interaction --prefer-lowest ; fi
+    - if [[ !$deps ]]; then composer install --no-interaction ; fi
+    - export LANG=C
+    - export PATH=vendor/bin:$PATH
 
 script:
-  - behat -fprogress --strict
+    - vendor/bin/behat -fprogress --strict
 
 after_failure:
   - cat server.log

composer.json

@@ -17,10 +17,10 @@
     ],
 
     "require": {
-        "php": ">=5.4",
+        "php": "^5.6|^7.0",
         "behat/behat": "~3.0",
-        "guzzlehttp/guzzle": "4 - 6",
-        "phpunit/phpunit": "4 - 5"
+        "guzzlehttp/guzzle": "^6.0",
+        "beberlei/assert": "^2.4"
     },
 
     "require-dev": {

doc/index.rst

@@ -44,3 +44,13 @@ The easiest way to keep your suite updated is to use `Composer <http://getcompos
 
 Usage
 -----
+
+Configuring the guzzle client
+
+.. code-block:: yaml
+    # behat.yml
+    default:
+      # ...
+      extensions:
+        Behat\WebApiExtension:
+          base_url: https://localhost

features/bootstrap/FeatureContext.php

@@ -1,5 +1,6 @@
 <?php
 
+use Assert\Assertion;
 use Behat\Behat\Context\SnippetAcceptingContext;
 use Behat\Gherkin\Node\PyStringNode;
 use Symfony\Component\Process\PhpExecutableFinder;
@@ -119,7 +120,7 @@ public function itShouldPassWith($success, PyStringNode $text)
      */
     public function theOutputShouldContain(PyStringNode $text)
     {
-        PHPUnit_Framework_Assert::assertContains($this->getExpectedOutput($text), $this->getOutput());
+        Assertion::contains($this->getOutput(), $this->getExpectedOutput($text));
     }
 
     private function getExpectedOutput(PyStringNode $expectedText)
@@ -162,13 +163,13 @@ public function itShouldFail($success)
                 echo 'Actual output:' . PHP_EOL . PHP_EOL . $this->getOutput();
             }
 
-            PHPUnit_Framework_Assert::assertNotEquals(0, $this->getExitCode());
+            Assertion::notEq(0, $this->getExitCode());
         } else {
             if (0 !== $this->getExitCode()) {
                 echo 'Actual output:' . PHP_EOL . PHP_EOL . $this->getOutput();
             }
 
-            PHPUnit_Framework_Assert::assertEquals(0, $this->getExitCode());
+            Assertion::eq(0, $this->getExitCode());
         }
     }
 

features/context.feature

@@ -8,6 +8,7 @@ Feature: client aware context
       """
       <?php
 
+      use Assert\Assertion;
       use Behat\WebApiExtension\Context\ApiClientAwareContext;
       use GuzzleHttp\ClientInterface;
 
@@ -24,7 +25,7 @@ Feature: client aware context
            * @Then /^the client should be set$/
            */
           public function theClientShouldBeSet() {
-              PHPUnit_Framework_Assert::assertInstanceOf('GuzzleHttp\Client', $this->client);
+              Assertion::isInstanceOf($this->client, 'GuzzleHttp\ClientInterface');
           }
       }
       """

src/Context/ApiClientAwareContext.php

@@ -25,7 +25,7 @@ interface ApiClientAwareContext extends Context
     /**
      * Sets Guzzle Client instance.
      *
-     * @param \GuzzleHttp\Client $client Guzzle client.
+     * @param \GuzzleHttp\ClientInterface $client Guzzle client.
      *
      * @return void
      */