Skip to content

Commit f2d2282

Browse files
MarcinOrlowskiMarcinOrlowski
authored
Merge pull request #79 from MarcinOrlowski/dev
Release 4.1.7
2 parents 85aeca2 + adbd576 commit f2d2282

31 files changed

+125
-56
lines changed

‎.travis.yml

+25-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# @package MarcinOrlowski\ResponseBuilder
66
#
77
# @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
8-
# @copyright 2016-2017 Marcin Orlowski
8+
# @copyright 2016-2019 Marcin Orlowski
99
# @license http://www.opensource.org/licenses/mit-license.php MIT
1010
# @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1111
#
@@ -19,7 +19,7 @@ php:
1919
- 7.0
2020
- 7.1
2121
- 7.2
22-
- hhvm
22+
- 7.3
2323

2424
env:
2525
- LARAVEL_VERSION="5.1"
@@ -28,6 +28,8 @@ env:
2828
- LARAVEL_VERSION="5.4"
2929
- LARAVEL_VERSION="5.5"
3030
- LARAVEL_VERSION="5.6"
31+
- LARAVEL_VERSION="5.7"
32+
- LARAVEL_VERSION="5.8"
3133

3234
matrix:
3335
exclude:
@@ -39,26 +41,40 @@ matrix:
3941
env: LARAVEL_VERSION="5.5"
4042
- php: 5.5
4143
env: LARAVEL_VERSION="5.6"
44+
- php: 5.5
45+
env: LARAVEL_VERSION="5.7"
46+
- php: 5.5
47+
env: LARAVEL_VERSION="5.8"
48+
4249
- php: 5.6
4350
env: LARAVEL_VERSION="5.5"
4451
- php: 5.6
4552
env: LARAVEL_VERSION="5.6"
46-
- php: hhvm
47-
env: LARAVEL_VERSION="5.5"
48-
- php: hhvm
53+
- php: 5.6
54+
env: LARAVEL_VERSION="5.7"
55+
- php: 5.6
56+
env: LARAVEL_VERSION="5.8"
57+
58+
- php: 7.0
4959
env: LARAVEL_VERSION="5.6"
60+
- php: 7.0
61+
env: LARAVEL_VERSION="5.7"
62+
- php: 7.0
63+
env: LARAVEL_VERSION="5.8"
5064

5165
cache:
5266
directories:
5367
- ${HOME}/.composer/cache/files
5468

5569
before_script:
56-
# Disable coverage (hhvm does not feature xdebug)
57-
- if [ ${TRAVIS_PHP_VERSION} != hhvm && ${TRAVIS_PHP_VERSION} != 7.2 ] ; then phpenv config-rm xdebug.ini ; fi
70+
# Some PHP versions does not feature xdebug so we need to disable coverage
71+
- if [ ${TRAVIS_PHP_VERSION} != 7.2 && ${TRAVIS_PHP_VERSION} != 7.3 ]; then phpenv config-rm xdebug.ini ; fi
5872
- cp -f "travis/composer-${LARAVEL_VERSION}.json" composer.json
5973
- FLAGS="--prefer-dist"
60-
- composer install ${FLAGS}
61-
74+
- composer install "${FLAGS}"
75+
# We need to tweak signature so setUp() and tearDown() and strip ": void" otherwise PHP will fail complaining
76+
# This only affects Laravel 5.8 as it pulls recent Orchestra that features signature changes.
77+
- "if [ ${LARAVEL_VERSION} == 5.8 ]; then sed -i 's/): void/)/' vendor/orchestra/testbench-core/src/TestCase.php ; fi"
6278
script:
6379
- vendor/bin/phpunit --configuration phpunit.xml --coverage-clover /tmp/coverage.xml
6480

‎CHANGES.md

+12-6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ See [compatibility docs](docs/compatibility.md) for details about backward compa
44

55
## CHANGE LOG ##
66

7+
* v4.1.7 (2019-03-03)
8+
* Added PHP 7.3 to testing setup
9+
* Added Laravel 5.7 and Laravel 5.8 to testing setup
10+
* Corrected test env setup for Laravel 5.5, 5.6
11+
* Removed tests on HHVM from Travis config
12+
713
* v4.1.6 (2018-07-20)
814
* Documentation updated
915

@@ -38,7 +44,7 @@ See [compatibility docs](docs/compatibility.md) for details about backward compa
3844
* Exception Handler's trace data is now properly placed into `trace` leaf
3945

4046
* v4.0.0 (2017-04-10)
41-
* **BACKWARD INCOMPATIBILE CHANGES**
47+
* **BACKWARD INCOMPATIBLE CHANGES** ([more info](docs/compatibility.md))
4248
* [RB-59] Added option to remap response JSON keys to user provided values
4349
* [RB-54] Debug data no longer pollutes `data` leaf. Instead, it adds `debug` dictionary to root data structure.
4450
* [RB-37] Added support for Laravel 5.3+ `unauthenticated()` in Exception Handler. See new config keys defails
@@ -59,7 +65,7 @@ See [compatibility docs](docs/compatibility.md) for details about backward compa
5965
* v3.1.0 (2017-02-28)
6066
* [RB-38] Added `encoding_options` to control data-to-json conversion.
6167
* [RB-38] Added optional encoding options args to all methods accepting `data` argument
62-
* [RB-34] Added option to control ExceptionHandeler behavior on debug builds
68+
* [RB-34] Added option to control ExceptionHandler behavior on debug builds
6369
* ExceptionHandler's debug is now added as `debug` node to make it more clear where it comes from
6470

6571
* v3.0.3 (2017-02-24)
@@ -72,7 +78,7 @@ See [compatibility docs](docs/compatibility.md) for details about backward compa
7278
* Updated `composer.json` to list `laravel/framework` among requirements
7379

7480
* v3.0.0 (2017-02-23)
75-
* **BACKWARD INCOMPATIBILE CHANGES**
81+
* **BACKWARD INCOMPATIBLE CHANGES** ([more info](docs/compatibility.md))
7682
* [RB-17] `success()` now allows to return API code as well
7783
* Corrected default config file containing faulty and unneeded `use` entries
7884
* [RB-20] Renamed ErrorCode class to ApiCodeBase
@@ -93,7 +99,7 @@ See [compatibility docs](docs/compatibility.md) for details about backward compa
9399
* `successWithHttpCode()`, `errorWithDataAndHttpCode()`, `errorWithHttpCode()` throws exception if `http_code` is `null`
94100
* `http_code` can be handed as null to all other methods and it will be replaced by default codes
95101
* `classes` mapping now features `method` field to specify method name to call for automatic object conversion
96-
* [RB-10] When $data is an array, all elements mapped via "classes" config will be converted recursively
102+
* [RB-10] When `$data` is an `array`, all elements mapped via "classes" config will be converted recursively
97103
* [RB-3] Unit tests are now part of the package
98104

99105
* v2.1.2 (2016-08-24)
@@ -129,7 +135,7 @@ See [compatibility docs](docs/compatibility.md) for details about backward compa
129135
* Code cleanup
130136

131137
* v1.4.1 (2016-04-14)
132-
* Removed pointless Handler's overloading to report()
138+
* Removed pointless Handler's overloading of `report()`
133139
* Code style cleanup
134140

135141
* v1.4.0 (2016-04-12)
@@ -152,7 +158,7 @@ See [compatibility docs](docs/compatibility.md) for details about backward compa
152158

153159
* v1.0.1 (2016-04-11)
154160
* Docs cleanup
155-
* Added extras/ with ready to use exception handler
161+
* Added `extras/` with ready to use exception handler
156162

157163
* v1.0.0 (2016-04-11)
158164
* Initial public release

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@
6969

7070
* Easy to use,
7171
* [Stable and production ready](https://travis-ci.org/MarcinOrlowski/laravel-api-response-builder),
72-
* Laravel 5.2, 5.3, 5.4, 5.5 and 5.6 compatible,
72+
* Laravel 5.1 to 5.8 compatible,
7373
* Supports Laravel [auto-discovery](https://medium.com/@taylorotwell/package-auto-discovery-in-laravel-5-5-ea9e3ab20518) (5.5 and up),
74-
* Works on PHP 5.5, 5.6, 7.0, 7.1, 7.2 and [HHVM](http://hhvm.com/),
74+
* Works on PHP 5.5, 5.6, 7.0, 7.1, 7.2 and 7.3,
7575
* Configurable (with ready-to-use defaults),
7676
* Localization support,
7777
* Automatic object conversion with custom mapping,
@@ -102,6 +102,6 @@
102102

103103
## License ##
104104

105-
* Written and copyrighted &copy;2016-2018 by Marcin Orlowski <mail (#) marcinorlowski (.) com>
105+
* Written and copyrighted &copy;2016-2019 by Marcin Orlowski <mail (#) marcinorlowski (.) com>
106106
* ResponseBuilder is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
107107

‎composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "marcin-orlowski/laravel-api-response-builder",
3-
"description": "Helps building nice, normalized and easy to consume REST API responses.",
3+
"description": "Helps building nice, normalized and easy to consume Laravel REST API.",
44
"homepage": "https://github.com/MarcinOrlowski/laravel-api-response-builder",
5-
"version": "4.1.6",
5+
"version": "4.1.7",
66
"keywords": [
77
"laravel",
88
"json",

‎config/response_builder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Laravel API Response Builder - config file
55
*
66
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
7-
* @copyright 2016-2018 Marcin Orlowski
7+
* @copyright 2016-2019 Marcin Orlowski
88
* @license http://www.opensource.org/licenses/mit-license.php MIT
99
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1010
*/

‎docs/compatibility.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
### v4 ###
66

7-
* `ErrorCodes` class is now `BaseApiCodes`
7+
* `ApiCodeBase` class is now `BaseApiCodes`
88
* ExceptionHandler's debug trace no longer depends on `APP_DEBUG` value and can be enabled independently
99

1010
### v3 ###

‎docs/docs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ This would produce expected and much cleaner data structure:
579579

580580
## License ##
581581

582-
* Written and copyrighted &copy;2016-2018 by Marcin Orlowski <mail (#) marcinorlowski (.) com>
582+
* Written and copyrighted &copy;2016-2019 by Marcin Orlowski <mail (#) marcinorlowski (.) com>
583583
* ResponseBuilder is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
584584

585585
----

‎phpunit.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
convertNoticesToExceptions="true"
99
convertWarningsToExceptions="true"
1010
processIsolation="false"
11-
stopOnFailure="false"
12-
syntaxCheck="false">
11+
stopOnFailure="false">
1312
<testsuites>
1413
<testsuite name="all">
1514
<directory>tests/</directory>

‎src/ApiCodesHelpers.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package MarcinOrlowski\ResponseBuilder
99
*
1010
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
11-
* @copyright 2016-2018 Marcin Orlowski
11+
* @copyright 2016-2019 Marcin Orlowski
1212
* @license http://www.opensource.org/licenses/mit-license.php MIT
1313
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1414
*/

‎src/BaseApiCodes.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package MarcinOrlowski\ResponseBuilder
99
*
1010
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
11-
* @copyright 2016-2018 Marcin Orlowski
11+
* @copyright 2016-2019 Marcin Orlowski
1212
* @license http://www.opensource.org/licenses/mit-license.php MIT
1313
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1414
*/

‎src/ExceptionHandlerHelper.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package MarcinOrlowski\ResponseBuilder
99
*
1010
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
11-
* @copyright 2016-2018 Marcin Orlowski
11+
* @copyright 2016-2019 Marcin Orlowski
1212
* @license http://www.opensource.org/licenses/mit-license.php MIT
1313
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1414
*/

‎src/ResponseBuilder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package MarcinOrlowski\ResponseBuilder
99
*
1010
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
11-
* @copyright 2016-2018 Marcin Orlowski
11+
* @copyright 2016-2019 Marcin Orlowski
1212
* @license http://www.opensource.org/licenses/mit-license.php MIT
1313
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1414
*/

‎src/ResponseBuilderServiceProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package MarcinOrlowski\ResponseBuilder
99
*
1010
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
11-
* @copyright 2016-2018 Marcin Orlowski
11+
* @copyright 2016-2019 Marcin Orlowski
1212
* @license http://www.opensource.org/licenses/mit-license.php MIT
1313
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1414
*/

‎src/lang/en/builder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Laravel API Response Builder
55
*
66
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
7-
* @copyright 2016-2018 Marcin Orlowski
7+
* @copyright 2016-2019 Marcin Orlowski
88
* @license http://www.opensource.org/licenses/mit-license.php MIT
99
* @link https://github.com/MarcinOrlowski/laravel-response-builder
1010
*/

‎src/lang/pl/builder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Laravel API Response Builder
55
*
66
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
7-
* @copyright 2016-2018 Marcin Orlowski
7+
* @copyright 2016-2019 Marcin Orlowski
88
* @license http://www.opensource.org/licenses/mit-license.php MIT
99
* @link https://github.com/MarcinOrlowski/laravel-response-builder
1010
*/

‎tests/ApiCodeBaseTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package MarcinOrlowski\ResponseBuilder
99
*
1010
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
11-
* @copyright 2016-2018 Marcin Orlowski
11+
* @copyright 2016-2019 Marcin Orlowski
1212
* @license http://www.opensource.org/licenses/mit-license.php MIT
1313
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1414
*/

‎tests/BuildResponseTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* @package MarcinOrlowski\ResponseBuilder
1111
*
1212
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
13-
* @copyright 2016-2018 Marcin Orlowski
13+
* @copyright 2016-2019 Marcin Orlowski
1414
* @license http://www.opensource.org/licenses/mit-license.php MIT
1515
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1616
*/

‎tests/ErrorTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package MarcinOrlowski\ResponseBuilder
99
*
1010
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
11-
* @copyright 2016-2018 Marcin Orlowski
11+
* @copyright 2016-2019 Marcin Orlowski
1212
* @license http://www.opensource.org/licenses/mit-license.php MIT
1313
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1414
*/

‎tests/ExceptionHandlerHelperTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package MarcinOrlowski\ResponseBuilder
99
*
1010
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
11-
* @copyright 2016-2018 Marcin Orlowski
11+
* @copyright 2016-2019 Marcin Orlowski
1212
* @license http://www.opensource.org/licenses/mit-license.php MIT
1313
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1414
*/

‎tests/InternalsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package MarcinOrlowski\ResponseBuilder
99
*
1010
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
11-
* @copyright 2016-2018 Marcin Orlowski
11+
* @copyright 2016-2019 Marcin Orlowski
1212
* @license http://www.opensource.org/licenses/mit-license.php MIT
1313
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1414
*/

‎tests/Providers/ResponseBuilderServiceProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package MarcinOrlowski\ResponseBuilder
99
*
1010
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
11-
* @copyright 2016-2018 Marcin Orlowski
11+
* @copyright 2016-2019 Marcin Orlowski
1212
* @license http://www.opensource.org/licenses/mit-license.php MIT
1313
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1414
*/

‎tests/SuccessTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package MarcinOrlowski\ResponseBuilder
99
*
1010
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
11-
* @copyright 2016-2018 Marcin Orlowski
11+
* @copyright 2016-2019 Marcin Orlowski
1212
* @license http://www.opensource.org/licenses/mit-license.php MIT
1313
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1414
*/

‎tests/TestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package MarcinOrlowski\ResponseBuilder
99
*
1010
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
11-
* @copyright 2016-2018 Marcin Orlowski
11+
* @copyright 2016-2019 Marcin Orlowski
1212
* @license http://www.opensource.org/licenses/mit-license.php MIT
1313
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1414
*/

‎tests/TestModel.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package MarcinOrlowski\ResponseBuilder
99
*
1010
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
11-
* @copyright 2016-2018 Marcin Orlowski
11+
* @copyright 2016-2019 Marcin Orlowski
1212
* @license http://www.opensource.org/licenses/mit-license.php MIT
1313
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1414
*/

‎tests/Traits/ApiCodesTests.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package MarcinOrlowski\ResponseBuilder
99
*
1010
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
11-
* @copyright 2016-2018 Marcin Orlowski
11+
* @copyright 2016-2019 Marcin Orlowski
1212
* @license http://www.opensource.org/licenses/mit-license.php MIT
1313
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1414
*/

‎tests/Traits/TestingHelpers.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package MarcinOrlowski\ResponseBuilder
99
*
1010
* @author Marcin Orlowski <mail (#) marcinorlowski (.) com>
11-
* @copyright 2016-2018 Marcin Orlowski
11+
* @copyright 2016-2019 Marcin Orlowski
1212
* @license http://www.opensource.org/licenses/mit-license.php MIT
1313
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1414
*/

‎travis/composer-5.4.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"require-dev": {
1818
"orchestra/testbench": "3.4.*",
1919
"laravel/framework": "5.4.*",
20-
"phpunit/phpunit": "~5.7",
20+
"phpunit/phpunit": "^5.7",
2121
"phpunit/php-code-coverage": "^4.0.4",
22-
"codacy/coverage": "~1.0"
22+
"codacy/coverage": "^1.0"
2323
}
2424
}

‎travis/composer-5.5.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
}
1616
},
1717
"require-dev": {
18-
"orchestra/testbench": "3.4.*",
19-
"laravel/framework": "5.4.*",
20-
"phpunit/phpunit": "~5.7",
21-
"phpunit/php-code-coverage": "^4.0.4",
22-
"codacy/coverage": "~1.0"
18+
"orchestra/testbench": "3.5.*",
19+
"laravel/framework": "5.5.*",
20+
"phpunit/phpunit": "^6.0",
21+
"phpunit/php-code-coverage": "^5.3",
22+
"codacy/coverage": "^1.0"
2323
}
2424
}

0 commit comments

Comments
 (0)