Skip to content

Commit 117bc0c

Browse files
committed
[Docs] Update changelog, docs and copyright notices
1 parent bf069e8 commit 117bc0c

File tree

6 files changed

+64
-6
lines changed

6 files changed

+64
-6
lines changed

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
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+
## [1.5.0] - 2019-10-14
6+
7+
### Added
8+
- [#415](https://github.com/cloudcreativity/laravel-json-api/issues/415)
9+
Added a has-one-through JSON API resource relationship for the Eloquent has-one-through
10+
relationship that was added in Laravel 5.8.
11+
12+
### Fixed
13+
- [#439](https://github.com/cloudcreativity/laravel-json-api/issues/439)
14+
Fixed tests failing in Laravel `^6.1`. **Applications using Laravel 6 need to upgrade
15+
the JSON API testing package to `^2.0`** as follows:
16+
17+
```bash
18+
$ composer require --dev cloudcreativity/json-api-testing:^2.0
19+
```
20+
521
## [1.4.0] - 2019-09-04
622

723
### Added

docs/installation.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
Install using [Composer](http://getcomposer.org):
44

5-
``` bash
5+
```bash
66
$ composer require cloudcreativity/laravel-json-api
7-
# see note below for which version of the testing package to use.
8-
$ composer require --dev cloudcreativity/json-api-testing:^2.0
7+
$ composer require --dev "cloudcreativity/json-api-testing:^1.2|^2.0"
98
```
109

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

src/Eloquent/Concerns/SoftDeletesModels.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
use Carbon\Carbon;
2121
use CloudCreativity\LaravelJsonApi\Utils\Str;
22-
use Illuminate\Database\Eloquent\Model;
2322
use Illuminate\Database\Eloquent\Builder;
23+
use Illuminate\Database\Eloquent\Model;
2424
use Illuminate\Support\Arr;
2525
use Illuminate\Support\Collection;
2626

tests/dummy/app/History.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
<?php
2+
/**
3+
* Copyright 2019 Cloud Creativity Limited
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
217

318
namespace DummyApp;
419

tests/dummy/app/JsonApi/Histories/Schema.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
<?php
2+
/**
3+
* Copyright 2019 Cloud Creativity Limited
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
217

318
namespace DummyApp\JsonApi\Histories;
419

tests/dummy/app/Supplier.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
<?php
2+
/**
3+
* Copyright 2019 Cloud Creativity Limited
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
217

318
namespace DummyApp;
419

0 commit comments

Comments
 (0)