8000 Merge branch 'release/0.12.0' · CodingSeo/laravel-json-api@e01db85 · GitHub
[go: up one dir, main page]
Skip to content

Commit e01db85

Browse files
lindyhopchrislindyhopchris
committed
Merge branch 'release/0.12.0'
2 parents a5e2360 + 97077cc commit e01db85

File tree

6 files changed

+38
-14
lines changed

6 files changed

+38
-14
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ php:
44
- '5.6'
55
- '7.0'
66
- '7.1'
7+
- '7.2'
78

89
before_script:
910
- travis_retry composer install --no-interaction --prefer-dist

‎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+
## [0.12.0] - 2018-02-08
6+
7+
### Added
8+
- Package now supports Laravel 5.6 in addition to Laravel 5.4 and 5.5.
9+
510
## [0.11.5] - 2018-02-06
611

712
### Fixed

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ A demo application is available at [here](https://github.com/cloudcreativity/dem
2727

2828
| Laravel | This Package |
2929
| --- | --- |
30-
| 5.4.* | ^0.11 |
31-
| 5.5.* | ^0.11 |
30+
| 5.4.* | ^0.12 |
31+
| 5.5.* | ^0.12 |
32+
| 5.6.* | ^0.12 |
3233

3334
Make sure you consult the [Upgrade Guide](http://laravel-json-api.readthedocs.io/en/latest/upgrade/) when upgrading.
3435

‎composer.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@
2424
"require": {
2525
"php": "^5.6|^7.0",
2626
"cloudcreativity/json-api": "^0.11",
27-
"illuminate/console": "5.4.*|5.5.*",
28-
"illuminate/contracts": "5.4.*|5.5.*",
29-
"illuminate/database": "5.4.*|5.5.*",
30-
"illuminate/filesystem": "5.4.*|5.5.*",
31-
"illuminate/http": "5.4.*|5.5.*",
32-
"illuminate/pagination": "5.4.*|5.5.*",
33-
"illuminate/support": "5.4.*|5.5.*",
27+
"illuminate/console": "5.4.*|5.5.*|5.6.*",
28+
"illuminate/contracts": "5.4.*|5.5.*|5.6.*",
29+
"illuminate/database": "5.4.*|5.5.*|5.6.*",
30+
"illuminate/filesystem": "5.4.*|5.5.*|5.6.*",
31+
"illuminate/http": "5.4.*|5.5.*|5.6.*",
32+
"illuminate/pagination": "5.4.*|5.5.*|5.6.*",
33+
"illuminate/support": "5.4.*|5.5.*|5.6.*",
3434
"symfony/psr-http-message-bridge": "^1.0",
3535
"zendframework/zend-diactoros": "^1.3"
3636
},
3737
"require-dev": {
3838
"ext-sqlite3": "*",
39-
"cloudcreativity/json-api-testing": "^0.1.1|^0.2",
40-
"orchestra/testbench": "^3.4",
41-
"phpunit/phpunit": "^5.7|^6.0"
39+
"cloudcreativity/json-api-testing": "^0.3",
40+
"orchestra/testbench": "3.4.*|3.5.*|3.6.*",
41+
"phpunit/phpunit": "^5.7|^6.0|^7.0"
4242
},
4343
"suggest": {
4444
"cloudcreativity/json-api-testing": "Required to use the test helpers."
@@ -58,7 +58,7 @@
5858
},
5959
"extra": {
6060
"branch-alias": {
61-
"dev-develop": "0.12.x-dev"
61+
"dev-develop": "0.13.x-dev"
6262
},
6363
"laravel": {
6464
"providers": [

‎docs/upgrade.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,21 @@ As we are currently on pre-1.0 releases, when you upgrade you will also need to
44
dependencies need to be upgraded. Use the following command:
55

66
```bash
7-
$ composer require cloudcreativity/laravel-json-api:^0.11 --update-with-dependencies
7+
$ composer require cloudcreativity/laravel-json-api:^0.12 --update-with-dependencies
88
```
99

10+
## Upgrading to 0.12 from 0.11
11+
12+
There are no major changes in this upgrade, we have tagged a new version to mark adding in support
13+
for Laravel 5.6.
14+
15+
The only additional step is to upgrade our testing package if you are using it to `v0.3`. There are
16+
no major changes in this testing package - `v0.3` just adds in support for PHPUnit 7.0.
17+
18+
```bash
19+
$ composer require --dev cloudcreativity/json-api-testing:^0.3
20+
```
21+
1022
## Upgrading to 0.11 from 0.10
1123

1224
Version `0.11` now supports Laravel 5.5 in addition to 5.4.

‎phpunit.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,9 @@
2121
<directory suffix="Test.php">./tests/Integration/</directory>
2222
</testsuite>
2323
</testsuites>
24+
<filter>
25+
<whitelist>
26+
<directory suffix=".php">src/</directory>
27+
</whitelist>
28+
</filter>
2429
</phpunit>

0 commit comments

Comments
 (0)
0