Skip to content

Commit 9f149a1

Browse files
lindyhopchrislindyhopchris
committed
Merge branch 'release/2.0.0'
2 parents 1a84c24 + 877d4fc commit 9f149a1

File tree

138 files changed

+456
-420
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+456
-420
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,34 @@ jobs:
1414
strategy:
1515
fail-fast: true
1616
matrix:
17-
php: ['7.4', '8.0']
18-
laravel: ['^8.30']
17+
php: [7.4, '8.0', 8.1]
18+
laravel: [8.76, 9]
19+
exclude:
20+
- php: 7.4
21+
laravel: 9
1922

2023
steps:
21-
- name: Checkout Code
22-
uses: actions/checkout@v2
23-
24-
- name: Setup PHP
25-
uses: shivammathur/setup-php@v2
26-
with:
27-
php-version: ${{ matrix.php }}
28-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd
29-
tools: composer:v2
30-
coverage: none
31-
32-
- name: Set Laravel Version
33-
run: composer require "laravel/framework:${{ matrix.laravel }}" --no-update -n
34-
35-
- name: Install dependencies
36-
uses: nick-invision/retry@v1
37-
with:
38-
timeout_minutes: 5
39-
max_attempts: 5
40-
command: composer install --no-suggest --prefer-dist -n -o
41-
42-
- name: Execute tests
43-
run: vendor/bin/phpunit
24+
- name: Checkout Code
25+
uses: actions/checkout@v2
26+
27+
- name: Setup PHP
28+
uses: shivammathur/setup-php@v2
29+
with:
30+
php-version: ${{ matrix.php }}
31+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd
32+
tools: composer:v2
33+
coverage: none
34+
ini-values: error_reporting=E_ALL
35+
36+
- name: Set Laravel Version
37+
run: composer require "laravel/framework:^${{ matrix.laravel }}" --no-update
38+
39+
- name: Install dependencies
40+
uses: nick-invision/retry@v1
41+
with:
42+
timeout_minutes: 5
43+
max_attempts: 5
44+
command: composer update --prefer-dist --no-interaction --no-progress
45+
46+
- name: Execute tests
47+
run: vendor/bin/phpunit

‎CHANGELOG.md‎

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

6+
## [2.0.0] - 2022-02-09
7+
8+
### Added
9+
10+
- This package now supports Laravel 9.
11+
- This package now supports PHP 8.1.
12+
13+
### Changed
14+
15+
- **BREAKING** PHP 8.1 introduces `readonly` as a keyword. It was therefore necessary to rename the following interface
16+
and trait:
17+
- `LaravelJsonApi\Eloquent\Contracts\ReadOnly` is now `IsReadOnly`.
18+
- `LaravelJsonApi\Eloquent\Fields\Concerns\ReadOnly` is now `IsReadOnly`.
19+
- Return types have been added to all internal methods in all child packages, to remove deprecation messages in PHP 8.1
20+
- [#83](https://github.com/laravel-json-api/laravel/issues/83) Amended container bindings to ensure package works with
21+
Laravel Octane. Most of these changes should have no impact on consuming applications. However, the following changes
22+
could potentially be breaking to the JSON:API `Server` class in an application:
23+
- The type-hint of the first constructor argument has changed to `LaravelJsonApi\Core\Support\AppResolver`.
24+
- The deprecated `$container` property has been removed, and the `$app` property is now private. To access the
25+
current application instance in your server class, use `$this->app()` instead.
26+
- **BREAKING** [#110](https://github.com/laravel-json-api/laravel/issues/110) The `model()` and `modelOrFail()` methods
27+
on the `ResourceQuery` request class have been changed from `public` to `protected`. These were not documented for use
28+
on this query class, and were only intended to be used publicly on the `ResourceRequest` class. Although technically
29+
breaking, this change is unlikely to affect the vast majority of applications which should not be using the method.
30+
631
## [1.1.0] - 2022-01-03
732

833
### Added

‎composer.json‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@
2323
}
2424
],
2525
"require": {
26-
"php": "^7.4|8.0.*",
26+
"php": "^7.4|^8.0",
2727
"ext-json": "*",
28-
"laravel-json-api/core": "^1.1",
29-
"laravel-json-api/eloquent": "^1.0.1",
30-
"laravel-json-api/encoder-neomerx": "^1.1",
31-
"laravel-json-api/exceptions": "^1.0",
32-
"laravel-json-api/spec": "^1.0",
33-
"laravel-json-api/validation": "^1.0",
34-
"laravel/framework": "^8.30"
28+
"laravel-json-api/core": "^2.0",
29+
"laravel-json-api/eloquent": "^2.0",
30+
"laravel-json-api/encoder-neomerx": "^2.0",
31+
"laravel-json-api/exceptions": "^1.1",
32+
"laravel-json-api/spec": "^1.1",
33+
"laravel-json-api/validation": "^2.0",
34+
"laravel/framework": "^8.76|^9.0"
3535
},
3636
"require-dev": {
37-
"laravel-json-api/hashids": "^1.0.0",
38-
"laravel-json-api/testing": "^1.0.0",
39-
"orchestra/testbench": "^6.9",
40-
"phpunit/phpunit": "^9.5"
37+
"cloudcreativity/json-api-testing": "^4.0",
38+
"laravel-json-api/testing": "^1.1",
39+
"orchestra/testbench": "^6.23|^7.0",
40+
"phpunit/phpunit": "^9.5.10"
4141
},
4242
"autoload": {
4343
"psr-4": {
@@ -54,8 +54,7 @@
5454
},
5555
"extra": {
5656
"branch-alias": {
57-
"dev-develop": "1.x-dev",
58-
"dev-2.x": "2.x-dev"
57+
"dev-develop": "2.x-dev"
5958
},
6059
"laravel": {
6160
"aliases": {

‎phpunit.xml‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,34 @@
88
convertErrorsToExceptions="true"
99
convertNoticesToExceptions="true"
1010
convertWarningsToExceptions="true"
11+
convertDeprecationsToExceptions="true"
1112
processIsolation="false"
1213
stopOnError="false"
1314
stopOnFailure="false"
1415
verbose="true"
1516
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
1617
>
17-
<coverage>
18-
<include>
19-
<directory suffix=".php">src/</directory>
20-
</include>
21-
</coverage>
22-
<testsuites>
23-
<testsuite name="Unit">
24-
<directory suffix="Test.php">./tests/lib/Unit/</directory>
25-
</testsuite>
26-
<testsuite name="Integration">
27-
<directory suffix="Test.php">./tests/lib/Integration/</directory>
28-
</testsuite>
29-
<testsuite name="Acceptance">
30-
<directory suffix="Test.php">./tests/lib/Acceptance/</directory>
31-
</testsuite>
32-
<testsuite name="Dummy">
33-
<directory suffix="Test.php">./tests/dummy/tests/</directory>
34-
</testsuite>
35-
</testsuites>
36-
<php>
37-
<env name="DB_CONNECTION" value="testing"/>
38-
</php>
18+
<coverage>
19+
<include>
20+
<directory suffix=".php">src/</directory>
21+
</include>
22+
</coverage>
23+
<testsuites>
24+
<testsuite name="Unit">
25+
<directory suffix="Test.php">./tests/lib/Unit/</directory>
26+
</testsuite>
27+
<testsuite name="Integration">
28+
<directory suffix="Test.php">./tests/lib/Integration/</directory>
29+
</testsuite>
30+
<testsuite name="Acceptance">
31+
<directory suffix="Test.php">./tests/lib/Acceptance/</directory>
32+
</testsuite>
33+
<testsuite name="Dummy">
34+
<directory suffix="Test.php">./tests/dummy/tests/</directory>
35+
</testsuite>
36+
</testsuites>
37+
<php>
38+
<ini name="error_reporting" value="E_ALL"/>
39+
<env name="DB_CONNECTION" value="testing"/>
40+
</php>
3941
</phpunit>

‎src/Console/Concerns/ResolvesStub.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2021 Cloud Creativity Limited
3+
* Copyright 2022 Cloud Creativity Limited
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎src/Console/GeneratorCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2021 Cloud Creativity Limited
3+
* Copyright 2022 Cloud Creativity Limited
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎src/Console/MakeAuthorizer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2021 Cloud Creativity Limited
3+
* Copyright 2022 Cloud Creativity Limited
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎src/Console/MakeController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2021 Cloud Creativity Limited
3+
* Copyright 2022 Cloud Creativity Limited
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎src/Console/MakeFilter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2021 Cloud Creativity Limited
3+
* Copyright 2022 Cloud Creativity Limited
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎src/Console/MakeQuery.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2021 Cloud Creativity Limited
3+
* Copyright 2022 Cloud Creativity Limited
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)