Skip to content

Commit eb7a6fa

Browse files
committed
[Build] Set minimum Laravel version to 5.8
1 parent 71fc1a8 commit eb7a6fa

File tree

4 files changed

+23
-34
lines changed

4 files changed

+23
-34
lines changed

.travis.yml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,12 @@ matrix:
66
include:
77
- php: "7.1"
88
env:
9-
- LARAVEL_VERSION=5.5.*
10-
- PHPUNIT_VERSION=^6.5
11-
- php: "7.1"
12-
env:
13-
- LARAVEL_VERSION=5.6.*
14-
- PHPUNIT_VERSION=^7.0
15-
- php: "7.1"
16-
env:
17-
- LARAVEL_VERSION=5.7.*
9+
- LARAVEL_VERSION=5.8.*
1810
- PHPUNIT_VERSION=^7.0
19-
- php: "7.2"
20-
env:
21-
- LARAVEL_VERSION=5.5.*
22-
- PHPUNIT_VERSION=^6.5
2311
- php: "7.2"
2412
env:
2513
- LARAVEL_VERSION=5.8.*
2614
- PHPUNIT_VERSION=^7.0
27-
- php: "7.3"
28-
env:
29-
- LARAVEL_VERSION=5.5.*
30-
- PHPUNIT_VERSION=^6.5
3115
- php: "7.3"
3216
env:
3317
- LARAVEL_VERSION=5.8.*

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
All notable changes to this project will be documented in this file. This project adheres to
33
[Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
44

5+
## Unreleased
6+
7+
### Changed
8+
- Minimum Laravel version is now `5.8` (previously `5.5`).
9+
510
## [1.6.0] - 2020-01-13
611

712
### Added

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# cloudcreativity/laravel-json-api
44

5-
Build feature-rich and standards-compliant APIs in Laravel.
5+
Build feature-rich and standards-compliant APIs in Laravel.
66

77
This package provides all the capabilities you need to add [JSON API](http://jsonapi.org)
88
compliant APIs to your application. Extensive support for the specification, including:
@@ -21,7 +21,7 @@ compliant APIs to your application. Extensive support for the specification, inc
2121
- Validation of:
2222
- JSON API documents; and
2323
- Query parameters.
24-
24+
2525
The following additional features are also supported:
2626

2727
- Full support for Eloquent resources, with features such as:
@@ -37,11 +37,11 @@ The following additional features are also supported:
3737

3838
From [jsonapi.org](http://jsonapi.org)
3939

40-
> If you've ever argued with your team about the way your JSON responses should be formatted, JSON API is your
40+
> If you've ever argued with your team about the way your JSON responses should be formatted, JSON API is your
4141
anti-bikeshedding weapon.
4242
>
43-
> By following shared conventions, you can increase productivity, take advantage of generalized tooling, and focus
44-
on what matters: your application. Clients built around JSON API are able to take advantage of its features around
43+
> By following shared conventions, you can increase productivity, take advantage of generalized tooling, and focus
44+
on what matters: your application. Clients built around JSON API are able to take advantage of its features around
4545
efficiently caching responses, sometimes eliminating network requests entirely.
4646

4747
For full information on the spec, plus examples, see [http://jsonapi.org](http://jsonapi.org).
@@ -62,13 +62,13 @@ A demo application is available at [here](https://github.com/cloudcreativity/dem
6262

6363
| Laravel | This Package |
6464
| --- | --- |
65-
| `^6.0` | `^1.4` |
66-
| `5.8.*` | `^1.0` |
65+
| `^6.0` | `^1.7` |
66+
| `5.8.*` | `^1.7` |
6767
| `5.7.*` | `^1.0` |
6868
| `5.6.*` | `^1.0` |
6969
| `5.5.*` | `^1.0` |
7070

71-
Make sure you consult the [Upgrade Guide](http://laravel-json-api.readthedocs.io/en/latest/upgrade/)
71+
Make sure you consult the [Upgrade Guide](http://laravel-json-api.readthedocs.io/en/latest/upgrade/)
7272
when upgrading between major or pre-release versions.
7373

7474
> You may notice that there are `2.0.0-alpha` tags. We **do not** recommend using these versions
@@ -90,7 +90,7 @@ Installation is via `composer`. See the documentation for complete instructions.
9090

9191
## Contributing
9292

93-
Contributions are absolutely welcome. Ideally submit a pull request, even more ideally with unit tests.
93+
Contributions are absolutely welcome. Ideally submit a pull request, even more ideally with unit tests.
9494
Please note the following:
9595

9696
- **Bug Fixes** - submit a pull request against the `master` branch.

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
"php": "^7.1",
2626
"ext-json": "*",
2727
"cloudcreativity/utils-object": "^1.0",
28-
"illuminate/console": "^5.5|^6.0",
29-
"illuminate/contracts": "^5.5|^6.0",
30-
"illuminate/database": "^5.5|^6.0",
31-
"illuminate/filesystem": "^5.5|^6.0",
32-
"illuminate/http": "^5.5|^6.0",
33-
"illuminate/pagination": "^5.5|^6.0",
34-
"illuminate/support": "^5.5|^6.0",
28+
"illuminate/console": "5.8.*|^6.0",
29+
"illuminate/contracts": "5.8.*|^6.0",
30+
"illuminate/database": "5.8.*|^6.0",
31+
"illuminate/filesystem": "5.8.*|^6.0",
32+
"illuminate/http": "5.8.*|^6.0",
33+
"illuminate/pagination": "5.8.*|^6.0",
34+
"illuminate/support": "5.8.*|^6.0",
3535
"neomerx/json-api": "^1.0.3",
3636
"ramsey/uuid": "^3.0",
3737
"symfony/psr-http-message-bridge": "^1.0",
@@ -67,7 +67,7 @@
6767
},
6868
"extra": {
6969
"branch-alias": {
70-
"dev-develop": "1.x-dev"
70+
"dev-1.x": "1.x-dev"
7171
},
7272
"laravel": {
7373
"providers": [

0 commit comments

Comments
 (0)