Skip to content
This repository was archived by the owner on Feb 27, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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

9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 0 additions & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<!-- ensure build/logs directory exists on your repo -->
<logging>
<log type="coverage-html" target="./build/logs/report/"
charset="UTF-8" yui="true" highlight="true"
lowUpperBound="35" highLowerBound="70" showUncoveredFiles="true"/>
<log type="testdox-html" target="./build/logs/testdox.html"/>
<log type="coverage-clover" target="./build/logs/clover.xml"/>
Expand Down
26 changes: 0 additions & 26 deletions shippable.yml

This file was deleted.