Skip to content

Commit d464dd4

Browse files
Merge pull request #189 from MarcinOrlowski/dev
Release v9.2.1
2 parents 4d306c6 + cf90984 commit d464dd4

File tree

76 files changed

+110
-99
lines changed

Some content is hidden

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

76 files changed

+110
-99
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,23 @@ assignees: ''
88
---
99

1010
**What's wrong?**
11-
A clear and concise description of what the bug is.
11+
Please put a clear and concise description of what the bug is.
1212

1313
**Steps to reproduce the behavior:**
14-
1.
15-
2.
16-
3.
17-
4.
14+
1.
15+
1.
16+
1.
17+
1.
1818

1919
**Expected behavior**
2020
A clear and concise description of what you expected to happen
21-
instead of currently observed behaviour..
21+
instead of currently observed behaviour.
2222

2323
**Runtime environment**
2424
- Name and version of OS: [i.e. Windows 10, Ubuntu 19.04, etc]
2525
- PHP version [i.e. 7.2]
26-
- Laravel version [e.g. 6.0.0]
26+
- Laravel version [i.e. 6.0.0]
27+
- ResponseBuilder version used [i.e. 9.0.1]
2728

2829
**Notes**
2930
Any additional information that may be helpful diagnosing the problem.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ assignees: ''
88
---
99

1010
**Please describe the problem**
11-
A clear and concise description of what your request is about.
11+
Please put a clear and concise description of what your request is about.
1212

1313
**Describe the solution you'd like to see**
14-
A clear and concise description of what you want to happen once
15-
your request is implemented. In other words, describe desired
16-
behaviour. If possible, consider adding pseudo-code if that would
17-
better illustrated your request.
14+
A clear and concise description of what you want to happen once your request
15+
is implemented. In other words, describe desired behavior. If possible, please
16+
consider adding pseudo-code if that would better illustrate your request.
1817

1918
**Notes**
2019
Add any other context or screenshots about the feature request here.
20+

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
### This pull request...
22

3-
* [ ] Fixes a bug.
3+
* [ ] Fixes a bug. Closes #TICKET-NUMBER
44
* [ ] Adds new feature or improves existing behaviour.
55
* [ ] Documentation change.
66

77
### Checklist:
88

99
* [ ] I have opened the issue ticket that this pull request is part of.
10-
* [ ] This pull request title contains `Fixes: #{$ISSUE_NO}` that closes ticket.
10+
* [ ] This pull request title contains `(#TICKET-NUMBER)` for reference..
11+
* [ ] This pull request description contains `Closes #{$ISSUE_NO}` that closes ticket.
1112
* [ ] This pull request is all my own work - I have not plagiarized.
1213
* [ ] This contribution is licensed under MIT or compatible license.
1314
* [ ] All code is covered in unit tests and all tests pass.
14-
* [ ] I have updated the documentation that covers all the changes this pull request makes.
15+
* [ ] I have updated the docs to cover PR's changes (if applicable).
1516
* [ ] All functions and variable names follow project naming conventions.
1617
* [ ] All function parameters and return values are annotated with PHP [type hints](https://www.php.net/manual/en/language.oop5.typehinting.php).
1718
* [ ] All functions have [PHPDocs](https://docs.phpdoc.org/3.0/guide/references/phpdoc/index.html) blocks.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@
5656

5757
## License ##
5858

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

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "marcin-orlowski/laravel-api-response-builder",
33
"description": "Helps building nice, normalized and easy to consume Laravel REST API.",
44
"homepage": "https://github.com/MarcinOrlowski/laravel-api-response-builder",
5-
"version": "9.2.0",
5+
"version": "9.2.1",
66
"keywords": [
77
"laravel",
88
"json",

config/response_builder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* See docs/config.md for detailed documentation
77
*
88
* @author Marcin Orlowski <mail (#) marcinOrlowski (.) com>
9-
* @copyright 2016-2020 Marcin Orlowski
9+
* @copyright 2016-2021 Marcin Orlowski
1010
* @license http://www.opensource.org/licenses/mit-license.php MIT
1111
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1212
*/

docs/CHANGES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
99
## CHANGE LOG ##
1010

11+
* v9.2.1 (2021-01-18)
12+
* [RB-186] ExceptionHandler now expects `\Throwable` instead of `\Exception`.
13+
1114
* v9.2.0 (2020-12-27)
1215
* Updated Travis config to run tests on PHP 8 too.
1316
* Added Arabic translation (thanks to @mustafa-online)

docs/exceptions.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
* [Possible Exception Handler conflicts](#possible-exception-handler-conflicts)
1414
* [ApiCodes](#apicodes)
1515

16+
---
17+
18+
> ![WARNING](img/warning.png) Use of provided `ExceptionHandler` helper **requires** additional, **manual**
19+
> installation steps to be made, otherwise Laravel's built-in handler will be used instead. See the details
20+
> documented below.
21+
1622
---
1723

1824
# Exception Handling with Response Builder #
@@ -41,7 +47,7 @@ use MarcinOrlowski\ResponseBuilder\ExceptionHandlerHelper;
4147
Default handler as of Laravel 5.2 has been significantly simplified and by default it looks like this:
4248

4349
```php
44-
public function render($request, Exception $e)
50+
public function render($request, Throwable $e)
4551
{
4652
return parent::render($request, $e);
4753
}
@@ -50,7 +56,7 @@ public function render($request, Exception $e)
5056
After your edit it shall look like this:
5157

5258
```php
53-
public function render($request, Exception $e)
59+
public function render($request, Throwable $e)
5460
{
5561
return ExceptionHandlerHelper::render($request, $e);
5662
}

src/ApiCodesHelpers.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @package MarcinOrlowski\ResponseBuilder
1010
*
1111
* @author Marcin Orlowski <mail (#) marcinOrlowski (.) com>
12-
* @copyright 2016-2020 Marcin Orlowski
12+
* @copyright 2016-2021 Marcin Orlowski
1313
* @license http://www.opensource.org/licenses/mit-license.php MIT
1414
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1515
*/

src/BaseApiCodes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @package MarcinOrlowski\ResponseBuilder
1010
*
1111
* @author Marcin Orlowski <mail (#) marcinOrlowski (.) com>
12-
* @copyright 2016-2020 Marcin Orlowski
12+
* @copyright 2016-2021 Marcin Orlowski
1313
* @license http://www.opensource.org/licenses/mit-license.php MIT
1414
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1515
*/

0 commit comments

Comments
 (0)