Skip to content
Permalink
Browse files

Merge pull request #6 from open-source-contributions/fix_travis

Fix failed Travis CI build
  • Loading branch information...
jacobemerick committed Sep 20, 2019
2 parents 1f02da9 + 5932683 commit 54a50c9a4e1660c255b6578fdeb13bf69624e160
Showing with 11 additions and 8 deletions.
  1. +6 −3 .travis.yml
  2. +1 −1 composer.json
  3. +2 −2 tests/ClientTest.php
  4. +2 −2 tests/JsonStreamTest.php
@@ -2,18 +2,21 @@ language: php

php:
- 5.6
- 7
- 7.0
- 7.1
- 7.2
- 7.3

install:
- composer self-update
- composer install --dev --no-interaction
- composer update --no-interaction

before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build

script: phpunit --tap --coverage-clover build/logs/clover.xml
script: vendor/bin/phpunit --coverage-clover build/logs/clover.xml

after_script:
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
@@ -7,7 +7,7 @@
"psr/log": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^5.0"
"phpunit/phpunit": "^5.0 || ^6.5 || ^7.0"
},
"autoload": {
"psr-4": {
@@ -6,9 +6,9 @@
use GuzzleHttp\HandlerStack;
use GuzzleHttp\Middleware;
use GuzzleHttp\Psr7\Response;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
class ClientTest extends PHPUnit_Framework_TestCase
class ClientTest extends TestCase
{
use MockClientTrait,
@@ -3,9 +3,9 @@
namespace Shutterstock\Api;
use GuzzleHttp\Psr7\Stream;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
class JsonStreamTest extends PHPUnit_Framework_TestCase
class JsonStreamTest extends TestCase
{
public function testIsInstanceOfJsonStream()

0 comments on commit 54a50c9

Please sign in to comment.
You can’t perform that action at this time.