8000 Merge tag 'v0.11.0' into develop · PXLbros/laravel-json-api@7ced632 · GitHub
[go: up one dir, main page]

Skip to content

Commit 7ced632

Browse files
committed
Merge tag 'v0.11.0' into develop
Support Laravel 5.5
2 parents c270eea + 0430b11 commit 7ced632

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
bin/
21
vendor/
32
composer.lock

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
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
5+
## [0.11.0] - 2017-09-02
66

77
### Added
8-
- Support for Laravel 5.5.
8+
- Support for Laravel 5.5, including package discovery.
99
- Client supplied ids will now be hydrated into Eloquent models, configurable via the `$clientId` property
1010
on the Eloquent hydrator.
1111

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
},
5959
"extra": {
6060
"branch-alias": {
61-
"dev-develop": "0.11.x-dev"
61+
"dev-develop": "0.12.x-dev"
6262
},
6363
"laravel": {
6464
"providers": [

phpunit.xml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit bootstrap="vendor/autoload.php"
2+
<phpunit backupGlobals="false"
3+
backupStaticAttributes="false"
4+
beStrictAboutTestsThatDoNotTestAnything="false"
5+
bootstrap="vendor/autoload.php"
36
colors="true"
4-
verbose="true">
7+
convertErrorsToExceptions="true"
8+
convertNoticesToExceptions="true"
9+
convertWarningsToExceptions="true"
10+
processIsolation="false"
11+
stopOnError="false"
12+
stopOnFailure="false"
13+
syntaxCheck="true"
14+
verbose="true"
15+
>
516
<testsuites>
617
<testsuite name="Unit">
7-
<directory>./tests/Unit/</directory>
18+
<directory suffix="Test.php">./tests/Unit/</directory>
819
</testsuite>
920
<testsuite name="Integration">
10-
<directory>./tests/Integration/</directory>
21+
<directory suffix="Test.php">./tests/Integration/</directory>
1122
</testsuite>
1223
</testsuites>
1324
</phpunit>

0 commit comments

Comments
 (0)
0