Skip to content

Commit e6ac16a

Browse files
committed
[Tests] Fix broken Laravel 6 test
1 parent 8d48b3f commit e6ac16a

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

.travis.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,47 @@ matrix:
77
- php: "7.1"
88
env:
99
- LARAVEL_VERSION=5.5.*
10+
- JSON_API_TESTING=^1.2
1011
- PHPUNIT_VERSION=^6.5
1112
- php: "7.1"
1213
env:
1314
- LARAVEL_VERSION=5.6.*
15+
- JSON_API_TESTING=^1.2
1416
- PHPUNIT_VERSION=^7.0
1517
- php: "7.1"
1618
env:
1719
- LARAVEL_VERSION=5.7.*
20+
- JSON_API_TESTING=^1.2
1821
- PHPUNIT_VERSION=^7.0
1922
- php: "7.2"
2023
env:
2124
- LARAVEL_VERSION=5.5.*
25+
- JSON_API_TESTING=^1.2
2226
- PHPUNIT_VERSION=^6.5
2327
- php: "7.2"
2428
env:
2529
- LARAVEL_VERSION=5.8.*
30+
- JSON_API_TESTING=^1.2
2631
- PHPUNIT_VERSION=^7.0
2732
- php: "7.3"
2833
env:
2934
- LARAVEL_VERSION=5.5.*
35+
- JSON_API_TESTING=^1.2
3036
- PHPUNIT_VERSION=^6.5
3137
- php: "7.3"
3238
env:
3339
- LARAVEL_VERSION=5.8.*
40+
- JSON_API_TESTING=^2.0
3441
- PHPUNIT_VERSION=^7.0
3542
- php: "7.3"
3643
env:
3744
- LARAVEL_VERSION=^6.0
45+
- JSON_API_TESTING=^2.0
3846
- PHPUNIT_VERSION=^8.0
3947

4048
install:
4149
- composer require "laravel/framework:${LARAVEL_VERSION}" --no-update -n
50+
- composer require "cloudcreativity/json-api-testing:${JSON_API_TESTING}" --dev --no-update -n
4251
- composer require "phpunit/phpunit:${PHPUNIT_VERSION}" --dev --no-update -n
4352
- travis_retry composer install --no-suggest --prefer-dist -n -o
4453

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"require-dev": {
4141
"ext-sqlite3": "*",
42-
"cloudcreativity/json-api-testing": "^1.2",
42+
"cloudcreativity/json-api-testing": "^1.2|^2.0",
4343
"composer/semver": "^1.5",
4444
"guzzlehttp/guzzle": "^6.3",
4545
"mockery/mockery": "^1.1",
@@ -78,7 +78,7 @@
7878
}
7979
}
8080
},
81-
"minimum-stability": "stable",
81+
"minimum-stability": "dev",
8282
"prefer-stable": true,
8383
"config": {
8484
"sort-packages": true

docs/installation.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ Install using [Composer](http://getcomposer.org):
44

55
``` bash
66
$ composer require cloudcreativity/laravel-json-api
7-
$ composer require --dev cloudcreativity/json-api-testing
7+
# see note below for which version of the testing package to use.
8+
$ composer require --dev cloudcreativity/json-api-testing:^2.0
89
```
910

11+
> For Laravel 5.5, 5.6 and 5.7, you will need to use `^1.2` for the `json-api-testing` package.
12+
1013
This package's service provider and facade will be automatically added using package discovery. You will
1114
then need to check your API route prefix and update your Exception handler as follows...
1215

0 commit comments

Comments
 (0)