8000 [Feature] Support Laravel 8 · nelson6e65/laravel-json-api@721d7eb · GitHub
[go: up one dir, main page]
Skip to content

Commit 721d7eb

Browse files
lindyhopchrislindyhopchris
committed
[Feature] Support Laravel 8
1 parent b2c6aa7 commit 721d7eb

File tree

4 files changed

+17
-19
lines changed

4 files changed

+17
-19
lines changed

‎.travis.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,13 @@ sudo: false
44

55
matrix:
66
include:
7-
- php: "7.2"
8-
env:
9-
- LARAVEL_VERSION=^7.0
10-
- PHPUNIT_VERSION=^8.0
117
- php: "7.3"
128
env:
13-
- LARAVEL_VERSION=^7.0
9+
- LARAVEL_VERSION=^8.0
1410
- PHPUNIT_VERSION=^9.0
1511
- php: "7.4"
1612
env:
17-
- LARAVEL_VERSION=^7.0
13+
- LARAVEL_VERSION=^8.0
1814
- PHPUNIT_VERSION=^9.0
1915

2016
install:

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ A demo application is available at [here](https://github.com/cloudcreativity/dem
6262

6363
| Laravel | This Package |
6464
| --- | --- |
65-
| `^7.0` | `^2.0` |
65+
| `^8.0` | `^3.0` |
66+
| `^7.0` | `^2.0`, `^3.0` |
6667
| `^6.0` | `^1.7` |
6768
| `5.8.*` | `^1.7` |
6869
| `5.7.*` | `^1.0` |

‎composer.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,26 @@
2424
"require": {
2525
"php": "^7.2",
2626
"ext-json": "*",
27-
"illuminate/console": "^7.0",
28-
"illuminate/contracts": "^7.0",
29-
"illuminate/database": "^7.0",
30-
"illuminate/filesystem": "^7.0",
31-
"illuminate/http": "^7.0",
32-
"illuminate/pagination": "^7.0",
33-
"illuminate/support": "^7.0",
27+
"illuminate/console": "^7.0|^8.0",
28+
"illuminate/contracts": "^7.0|^8.0",
29+
"illuminate/database": "^7.0|^8.0",
30+
"illuminate/filesystem": "^7.0|^8.0",
31+
"illuminate/http": "^7.0|^8.0",
32+
"illuminate/pagination": "^7.0|^8.0",
33+
"illuminate/support": "^7.0|^8.0",
3434
"neomerx/json-api": "^1.0.3",
3535
"nyholm/psr7": "^1.2",
3636
"ramsey/uuid": "^3.0|^4.0",
3737
"symfony/psr-http-message-bridge": "^2.0"
3838
},
3939
"require-dev": {
4040
"ext-sqlite3": "*",
41-
"cloudcreativity/json-api-testing": "^3.0",
42-
"guzzlehttp/guzzle": "^6.3",
41+
"cloudcreativity/json-api-testing": "^3.1",
42+
"guzzlehttp/guzzle": "^6.3|^7.0",
43+
"laravel/legacy-factories": "^1.0.4",
4344
"laravel/ui": "^2.0",
4445
"mockery/mockery": "^1.1",
45-
"orchestra/testbench": "^5.0",
46+
"orchestra/testbench": "^5.0|^6.0",
4647
"phpunit/phpunit": "^9.0"
4748
},
4849
"suggest": {
@@ -77,7 +78,7 @@
7778
}
7879
}
7980
},
80-
"minimum-stability": "stable",
81+
"minimum-stability": "dev",
8182
"prefer-stable": true,
8283
"config": {
8384
"sort-packages": true

‎src/Document/ResourceObject.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public function __unset($field)
167167
*/
168168
public function offsetExists($offset)
169169
{
170-
return $this->fieldValues->offsetExists($offset);
170+
return $this->fieldValues->has($offset);
171171
}
172172

173173
/**

0 commit comments

Comments
 (0)
0