Merge pull request #6 from php-http/Nyholm-patch-2

Add PHP requirements & travis fixes

Author: kelunik

.travis.yml

@@ -9,7 +9,6 @@ cache:
 php:
     - 7.0
     - 7.1
-    - hhvm
 
 env:
     global:
@@ -22,7 +21,7 @@ branches:
 matrix:
     fast_finish: true
     include:
-        - php: 5.5
+        - php: 7.0
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
 
 before_install:
@@ -33,6 +32,9 @@ install:
     - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
     - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
 
+before_script:
+    - vendor/bin/http_test_server > /dev/null 2>&1 &
+
 script:
     - $TEST_COMMAND
 

composer.json

@@ -14,11 +14,13 @@
         }
     },
     "require": {
-        "amphp/artax": "^3",
+        "php": "^7.0",
+        "amphp/artax": "^3.0",
         "php-http/httplug": "^1.1",
         "php-http/discovery": "^1.2"
     },
     "require-dev": {
+        "phpunit/phpunit": "^6.0",
         "amphp/phpunit-util": "^1",
         "php-http/client-integration-tests": "^0.6.0",
         "php-http/message": "^1.6"
@@ -27,6 +29,7 @@
         "php-http/client-implementation": "1.0"
     },
     "scripts": {
-        "test": "vendor/bin/phpunit"
+        "test": "vendor/bin/phpunit",
+        "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
     }
 }

phpunit.xml.dist

@@ -2,7 +2,7 @@
 <phpunit colors="true" bootstrap="vendor/autoload.php">
     <testsuites>
         <testsuite name="Artax Adapter Test Suite">
-            <directory>test</directory>
+            <directory>tests/</directory>
         </testsuite>
     </testsuites>
     <php>
@@ -16,4 +16,4 @@
     <listeners>
         <listener class="Amp\PHPUnit\LoopReset" />
     </listeners>
-</phpunit>
+</phpunit>