diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..741cb0b --- /dev/null +++ b/.travis.yml @@ -0,0 +1,31 @@ +language: php + +matrix: + include: + - php: "7.0" + env: LARAVEL_VERSION="5.5.*" + - php: "7.1" + env: LARAVEL_VERSION="5.5.*" + - php: "7.2" + env: LARAVEL_VERSION="5.5.*" + - php: "7.2" + env: LARAVEL_VERSION="5.6.*" + - php: "7.2" + env: LARAVEL_VERSION="5.7.*" RUN_CS_FIXER=1 + +sudo: false + +install: + - composer require "illuminate/support:${LARAVEL_VERSION}" --no-update --no-interaction + - travis_retry composer install --no-interaction --prefer-dist + +script: + - if [ "$RUN_CS_FIXER" ] ; then vendor/bin/php-cs-fixer fix -v --dry-run --using-cache=no ; fi + - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.xml + + +branches: + only: + - master + - develop + diff --git a/CHANGELOG.md b/CHANGELOG.md index 21dafa1..7a2f892 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ All Notable changes to `json-api-server` will be documented in this file. Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles. +## Unreleased + +### Changed + +- Added support for recent Laravel versions. +- Run tests on Travis instead of Shippable + + + ## 0.2.1 ### Changed diff --git a/composer.json b/composer.json index 04f44b5..82d7799 100644 --- a/composer.json +++ b/composer.json @@ -39,16 +39,16 @@ ], "require": { "php": "^7.0", - "dimsav/laravel-translatable": "^8.0", - "laravel/framework": "5.5.*" + "dimsav/laravel-translatable": "^8.0|^9.0", + "laravel/framework": "5.5.*|5.6.*|5.7.*" }, "require-dev": { "filp/whoops": "~2.0", "friendsofphp/php-cs-fixer": "^2.4", "mockery/mockery": "^1.0", - "orchestra/testbench": "~3.5", - "phpunit/php-code-coverage": "^5.3", - "phpunit/phpunit": "~6.0", + "graham-campbell/testbench": "^4.0|^5.1", + "phpunit/php-code-coverage": "^5.3|^6.0", + "phpunit/phpunit": "^7.0|^6.1", "spatie/phpunit-watcher": "^1.3", "squizlabs/php_codesniffer": "^2.3" }, diff --git a/phpunit.xml b/phpunit.xml index a850180..d249af6 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -28,7 +28,6 @@ diff --git a/shippable.yml b/shippable.yml deleted file mode 100644 index 396dac9..0000000 --- a/shippable.yml +++ /dev/null @@ -1,26 +0,0 @@ -language: php - -php: - - '7.0' - -build: - ci: - # Install dependencies - - composer --no-interaction --no-progress --no-suggest install - - # Code style - - composer check-style - - # Tests - - vendor/bin/phpunit --coverage-xml shippable/codecoverage - -notifications: - email: - - ddewit@swis.nl - on_success: change - on_failure: always - -branches: - only: - - develop - - master