Skip to content

Commit fd13279

Browse files
MarcinOrlowskiMarcinOrlowski
authored
Merge pull request #233 from MarcinOrlowski/dev
Release 9.4.0
2 parents 4964aa6 + 89994a8 commit fd13279

File tree

107 files changed

+3835
-3904
lines changed

Some content is hidden

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

107 files changed

+3835
-3904
lines changed

‎.codecov.yml

+1-1
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-2022 Marcin Orlowski
8+
# @copyright 2016-2023 Marcin Orlowski
99
# @license http://www.opensource.org/licenses/mit-license.php MIT
1010
# @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1111
#

‎.config/README.md

-19
This file was deleted.

‎.config/composer-laravel-6.x.json

-20
This file was deleted.

‎.config/composer-laravel-7.x.json

-20
This file was deleted.

‎.config/composer-laravel-8.x.json

-22
This file was deleted.

‎.config/composer-laravel-9.x.json

-22
This file was deleted.

‎.github/workflows/coding-standards.yml

+3-7
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-2022 Marcin Orlowski
8+
# @copyright 2016-2023 Marcin Orlowski
99
# @license http://www.opensource.org/licenses/mit-license.php MIT
1010
# @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1111
#
@@ -26,18 +26,14 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
# quotes are needed it is treated as a number and zero at decimal part is gone at runtime
29-
laravel: ["8.x"]
29+
laravel: ["9.x"]
3030
php: ["8.0", "8.1"]
3131

3232
runs-on: ubuntu-latest
3333

3434
steps:
3535
- name: "Checkout repository..."
36-
uses: actions/checkout@v2
37-
38-
- name: "Setup proper composer.json"
39-
shell: bash
40-
run: cp -f ".config/composer-laravel-${{ matrix.laravel }}.json" composer.json
36+
uses: actions/checkout@v3
4137

4238
# https://github.com/marketplace/actions/composer-php-actions
4339
- name: "Installing dependencies..."

‎.github/workflows/coverage.yml

+7-7
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-2022 Marcin Orlowski
8+
# @copyright 2016-2023 Marcin Orlowski
99
# @license http://www.opensource.org/licenses/mit-license.php MIT
1010
# @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1111
#
@@ -29,18 +29,14 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
# quotes are needed it is treated as a number and zero at decimal part is gone at runtime
32-
laravel: ["8.x"]
32+
laravel: ["9.x"]
3333
php: ["8.0", "8.1"]
3434

3535
runs-on: ubuntu-latest
3636

3737
steps:
3838
- name: "Checkout repository..."
39-
uses: actions/checkout@v2
40-
41-
- name: "Setup proper composer.json"
42-
shell: bash
43-
run: cp -f ".config/composer-laravel-${{ matrix.laravel }}.json" composer.json
39+
uses: actions/checkout@v3
4440

4541
# https://github.com/marketplace/actions/composer-php-actions
4642
- name: "Installing dependencies..."
@@ -50,6 +46,10 @@ jobs:
5046
php_version: "${{ matrix.php }}"
5147
dev: yes
5248

49+
- name: "Patching testbench's onNotSuccessfulTest() signature..."
50+
shell: bash
51+
run: "sed -i 's/^protected function onNotSuccessfulTest(Throwable \\$exception)\\: void/protected function onNotSuccessfulTest(Throwable \\$exception)\\: never/' vendor/orchestra/testbench-core/src/TestCase.php"
52+
5353
# https://github.com/marketplace/actions/phpunit-php-actions
5454
- name: "Running PHPUnit with Coverage..."
5555
uses: php-actions/phpunit@v3

‎.github/workflows/markdown.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717

1818
# https://github.com/marketplace/actions/my-markdown-linter
1919
- name: "Running markdown linter..."

‎.github/workflows/phpstan.yml

+18-14
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-2022 Marcin Orlowski
8+
# @copyright 2016-2023 Marcin Orlowski
99
# @license http://www.opensource.org/licenses/mit-license.php MIT
1010
# @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1111
#
@@ -29,18 +29,14 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
# quotes are needed it is treated as a number and zero at decimal part is gone at runtime
32-
laravel: ["8.x"]
33-
php: ["7.4", "8.0", "8.1"]
32+
laravel: ["9.x"]
33+
php: ["8.0", "8.1"]
3434

3535
runs-on: ubuntu-latest
3636

3737
steps:
3838
- name: "Checkout repository..."
39-
uses: actions/checkout@v2
40-
41-
- name: "Setup proper composer.json"
42-
shell: bash
43-
run: cp -f ".config/composer-laravel-${{ matrix.laravel }}.json" composer.json
39+
uses: actions/checkout@v3
4440

4541
# https://github.com/marketplace/actions/composer-php-actions
4642
- name: "Installing dependencies..."
@@ -50,10 +46,18 @@ jobs:
5046
php_version: "${{ matrix.php }}"
5147
dev: yes
5248

53-
# https://github.com/marketplace/actions/phpstan-php-actions
49+
# # https://github.com/marketplace/actions/phpstan-php-actions
50+
# - name: "Running PHPStan..."
51+
# uses: php-actions/phpstan@v3
52+
# with:
53+
# configuration: "phpstan.neon"
54+
# php_version: "${{ matrix.php }}"
55+
# # memory_limit: "16M"
56+
57+
# - name: "Making cache folder writable"
58+
# shell: bash
59+
# run: chmod 777 vendor/orchestra/testbench-core/laravel/bootstrap/cache
60+
5461
- name: "Running PHPStan..."
55-
uses: php-actions/phpstan@v3
56-
with:
57-
configuration: "phpstan.neon"
58-
php_version: "${{ matrix.php }}"
59-
memory_limit: 16M
62+
shell: bash
63+
run: vendor/bin/phpstan

‎.github/workflows/phpunit.yml

+7-15
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-2022 Marcin Orlowski
8+
# @copyright 2016-2023 Marcin Orlowski
99
# @license http://www.opensource.org/licenses/mit-license.php MIT
1010
# @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1111
#
@@ -29,24 +29,14 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
# quotes are needed it is treated as a number and zero at decimal part is gone at runtime
32-
laravel: ["6.x", "7.x", "8.x"]
33-
php: ["7.2", "7.3", "7.4", "8.0", "8.1"]
34-
exclude:
35-
# Laravel 8.x requires PHP 7.3+
36-
- laravel: "8.x"
37-
php: "7.2"
38-
- laravel: "9.x"
39-
php: ["7.2", "7.3", "7.4"]
32+
laravel: ["9.x"]
33+
php: ["8.0", "8.1"]
4034

4135
runs-on: ubuntu-latest
4236

4337
steps:
4438
- name: "Checkout repository..."
45-
uses: actions/checkout@v2
46-
47-
- name: "Setup proper composer.json"
48-
shell: bash
49-
run: cp -f ".config/composer-laravel-${{ matrix.laravel }}.json" composer.json
39+
uses: actions/checkout@v3
5040

5141
# https://github.com/marketplace/actions/composer-php-actions
5242
- name: "Installing dependencies..."
@@ -62,4 +52,6 @@ jobs:
6252
with:
6353
bootstrap: "vendor/autoload.php"
6454
configuration: "tests/phpunit.xml"
65-
55+
version: "9.6.3"
56+
# memory_limit: "16M"
57+
php_version: "${{ matrix.php }}"

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![REST API Response Builder for Laravel](artwork/laravel-api-response-builder-logo.svg)
1+
![REST API Response Builder for Laravel](artwork/laravel-api-response-builder-logo.png)
22

33
# REST API Response Builder for Laravel #
44

@@ -66,5 +66,5 @@ Development branch:
6666

6767
## License ##
6868

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

‎artwork/README.md

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
![REST API Response Builder for Laravel](../artwork/laravel-api-response-builder-logo.png)
2+
3+
# Project artwork #
4+
5+
Designed by Marcin Orlowski <http://MarcinOrlowski.com>
6+
7+
The `ResponseBuilder` logo and icon use [Ubuntu Condensed](https://design.ubuntu.com/font/) font.
8+
9+
## SVG files ##
10+
11+
* `laravel-api-response-builder-logo.svg` - main logo project file (with texts as editable strings),
12+
* `laravel-api-response-builder-logo.png` - bitmap rendition of the logo,
13+
* `laravel-api-response-builder-icon.svg` - project icon.

‎artwork/laravel-api-response-builder-logo.png

49.1 KB
Loading

‎composer.json

+16-9
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@
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.3.2",
5+
"version": "9.4.0",
66
"keywords": [
77
"laravel",
8+
"laravel9",
89
"json",
910
"api",
1011
"builder",
1112
"rest",
1213
"helper",
13-
"php7",
14+
"php",
1415
"php8",
16+
"php81",
1517
"mobile",
1618
"android",
1719
"ios"
@@ -20,7 +22,7 @@
2022
"authors": [
2123
{
2224
"name": "Marcin Orlowski",
23-
"homepage": "http://MarcinOrlowski.com/"
25+
"homepage": "https://MarcinOrlowski.com/"
2426
}
2527
],
2628
"support": {
@@ -42,13 +44,18 @@
4244
}
4345
},
4446
"require": {
45-
"php": "^7.2 | ^7.3 | ^8.0",
46-
"laravel/framework": ">= 6.0"
47+
"php": "^8.0|^8.1",
48+
"laravel/framework": "^9.0"
4749
},
4850
"require-dev": {
49-
"marcin-orlowski/phpunit-extra-asserts": "^1.2",
50-
"orchestra/testbench": "^4.0",
51-
"phpunit/phpunit": "^8.0",
52-
"phpunit/php-code-coverage": "^7.0"
51+
"marcin-orlowski/phpunit-extra-asserts": "^5.1.0",
52+
"orchestra/testbench": "^7.0",
53+
"phpunit/phpunit": "^9.6.3",
54+
"phpunit/php-code-coverage": "^9.2",
55+
"nunomaduro/larastan": "^2.0",
56+
"marcin-orlowski/php-lockpick": "^1.0"
57+
},
58+
"scripts": {
59+
"test": "vendor/bin/phpunit -c tests/phpunit.xml"
5360
}
5461
}

‎config/response_builder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* See docs/config.md for detailed documentation
88
*
99
* @author Marcin Orlowski <mail (#) marcinOrlowski (.) com>
10-
* @copyright 2016-2022 Marcin Orlowski
10+
* @copyright 2016-2023 Marcin Orlowski
1111
* @license http://www.opensource.org/licenses/mit-license.php MIT
1212
* @link https://github.com/MarcinOrlowski/laravel-api-response-builder
1313
*

0 commit comments

Comments
 (0)