Merge pull request #233 from MarcinOrlowski/dev

Release 9.4.0

.codecov.yml

@@ -5,7 +5,7 @@
 # @package   MarcinOrlowski\ResponseBuilder
 #
 # @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
-# @copyright 2016-2022 Marcin Orlowski
+# @copyright 2016-2023 Marcin Orlowski
 # @license   http://www.opensource.org/licenses/mit-license.php MIT
 # @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
 #

.github/workflows/coding-standards.yml

@@ -5,7 +5,7 @@
 # @package   MarcinOrlowski\ResponseBuilder
 #
 # @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
-# @copyright 2016-2022 Marcin Orlowski
+# @copyright 2016-2023 Marcin Orlowski
 # @license   http://www.opensource.org/licenses/mit-license.php MIT
 # @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
 #
@@ -26,18 +26,14 @@ jobs:
       fail-fast: false
       matrix:
         # quotes are needed it is treated as a number and zero at decimal part is gone at runtime
-        laravel: ["8.x"]
+        laravel: ["9.x"]
         php: ["8.0", "8.1"]
 
     runs-on: ubuntu-latest
 
     steps:
       - name: "Checkout repository..."
-        uses: actions/checkout@v2
-
-      - name: "Setup proper composer.json"
-        shell: bash
-        run: cp -f ".config/composer-laravel-${{ matrix.laravel }}.json" composer.json
+        uses: actions/checkout@v3
 
       # https://github.com/marketplace/actions/composer-php-actions
       - name: "Installing dependencies..."

.github/workflows/coverage.yml

@@ -5,7 +5,7 @@
 # @package   MarcinOrlowski\ResponseBuilder
 #
 # @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
-# @copyright 2016-2022 Marcin Orlowski
+# @copyright 2016-2023 Marcin Orlowski
 # @license   http://www.opensource.org/licenses/mit-license.php MIT
 # @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
 #
@@ -29,18 +29,14 @@ jobs:
       fail-fast: false
       matrix:
         # quotes are needed it is treated as a number and zero at decimal part is gone at runtime
-        laravel: ["8.x"]
+        laravel: ["9.x"]
         php: ["8.0", "8.1"]
 
     runs-on: ubuntu-latest
 
     steps:
       - name: "Checkout repository..."
-        uses: actions/checkout@v2
-
-      - name: "Setup proper composer.json"
-        shell: bash
-        run: cp -f ".config/composer-laravel-${{ matrix.laravel }}.json" composer.json
+        uses: actions/checkout@v3
 
       # https://github.com/marketplace/actions/composer-php-actions
       - name: "Installing dependencies..."
@@ -50,6 +46,10 @@ jobs:
           php_version: "${{ matrix.php }}"
           dev: yes
 
+      - name: "Patching testbench's onNotSuccessfulTest() signature..."
+        shell: bash
+        run: "sed -i 's/^protected function onNotSuccessfulTest(Throwable \\$exception)\\: void/protected function onNotSuccessfulTest(Throwable \\$exception)\\: never/' vendor/orchestra/testbench-core/src/TestCase.php"
+
       # https://github.com/marketplace/actions/phpunit-php-actions
       - name: "Running PHPUnit with Coverage..."
         uses: php-actions/phpunit@v3

.github/workflows/markdown.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     # https://github.com/marketplace/actions/my-markdown-linter
     - name: "Running markdown linter..."

.github/workflows/phpstan.yml

@@ -5,7 +5,7 @@
 # @package   MarcinOrlowski\ResponseBuilder
 #
 # @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
-# @copyright 2016-2022 Marcin Orlowski
+# @copyright 2016-2023 Marcin Orlowski
 # @license   http://www.opensource.org/licenses/mit-license.php MIT
 # @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
 #
@@ -29,18 +29,14 @@ jobs:
       fail-fast: false
       matrix:
         # quotes are needed it is treated as a number and zero at decimal part is gone at runtime
-        laravel: ["8.x"]
-        php: ["7.4", "8.0", "8.1"]
+        laravel: ["9.x"]
+        php: ["8.0", "8.1"]
 
     runs-on: ubuntu-latest
 
     steps:
       - name: "Checkout repository..."
-        uses: actions/checkout@v2
-
-      - name: "Setup proper composer.json"
-        shell: bash
-        run: cp -f ".config/composer-laravel-${{ matrix.laravel }}.json" composer.json
+        uses: actions/checkout@v3
 
       # https://github.com/marketplace/actions/composer-php-actions
       - name: "Installing dependencies..."
@@ -50,10 +46,18 @@ jobs:
           php_version: "${{ matrix.php }}"
           dev: yes
 
-      # https://github.com/marketplace/actions/phpstan-php-actions
+      # # https://github.com/marketplace/actions/phpstan-php-actions
+      # - name: "Running PHPStan..."
+      #   uses: php-actions/phpstan@v3
+      #   with:
+      #     configuration: "phpstan.neon"
+      #     php_version: "${{ matrix.php }}"
+      #     # memory_limit: "16M"
+
+      # - name: "Making cache folder writable"
+      #   shell: bash
+      #   run: chmod 777 vendor/orchestra/testbench-core/laravel/bootstrap/cache
+
       - name: "Running PHPStan..."
-        uses: php-actions/phpstan@v3
-        with:
-          configuration: "phpstan.neon"
-          php_version: "${{ matrix.php }}"
-          memory_limit: 16M
+        shell: bash
+        run: vendor/bin/phpstan

.github/workflows/phpunit.yml

@@ -5,7 +5,7 @@
 # @package   MarcinOrlowski\ResponseBuilder
 #
 # @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
-# @copyright 2016-2022 Marcin Orlowski
+# @copyright 2016-2023 Marcin Orlowski
 # @license   http://www.opensource.org/licenses/mit-license.php MIT
 # @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
 #
@@ -29,24 +29,14 @@ jobs:
       fail-fast: false
       matrix:
         # quotes are needed it is treated as a number and zero at decimal part is gone at runtime
-        laravel: ["6.x", "7.x", "8.x"]
-        php: ["7.2", "7.3", "7.4", "8.0", "8.1"]
-        exclude:
-          # Laravel 8.x requires PHP 7.3+
-          - laravel: "8.x"
-            php: "7.2"
-          - laravel: "9.x"
-            php: ["7.2", "7.3", "7.4"]
+        laravel: ["9.x"]
+        php: ["8.0", "8.1"]
 
     runs-on: ubuntu-latest
 
     steps:
       - name: "Checkout repository..."
-        uses: actions/checkout@v2
-
-      - name: "Setup proper composer.json"
-        shell: bash
-        run: cp -f ".config/composer-laravel-${{ matrix.laravel }}.json" composer.json
+        uses: actions/checkout@v3
 
       # https://github.com/marketplace/actions/composer-php-actions
       - name: "Installing dependencies..."
@@ -62,4 +52,6 @@ jobs:
         with:
           bootstrap: "vendor/autoload.php"
           configuration: "tests/phpunit.xml"
-
+          version: "9.6.3"
+          # memory_limit: "16M"
+          php_version: "${{ matrix.php }}"

README.md

@@ -1,4 +1,4 @@
-![REST API Response Builder for Laravel](artwork/laravel-api-response-builder-logo.svg)
+![REST API Response Builder for Laravel](artwork/laravel-api-response-builder-logo.png)
 
 # REST API Response Builder for Laravel #
 
@@ -66,5 +66,5 @@ Development branch:
 
 ## License ##
 
-* Written and copyrighted &copy;2016-2022 by Marcin Orlowski <mail (#) marcinorlowski (.) com>
+* Written and copyrighted &copy;2016-2023 by Marcin Orlowski <mail (#) marcinorlowski (.) com>
 * ResponseBuilder is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)

artwork/README.md

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

composer.json

@@ -2,16 +2,18 @@
   "name": "marcin-orlowski/laravel-api-response-builder",
   "description": "Helps building nice, normalized and easy to consume Laravel REST API.",
   "homepage": "https://github.com/MarcinOrlowski/laravel-api-response-builder",
-  "version": "9.3.2",
+  "version": "9.4.0",
   "keywords": [
     "laravel",
+    "laravel9",
     "json",
     "api",
     "builder",
     "rest",
     "helper",
-    "php7",
+    "php",
     "php8",
+    "php81",
     "mobile",
     "android",
     "ios"
@@ -20,7 +22,7 @@
   "authors": [
     {
       "name": "Marcin Orlowski",
-      "homepage": "http://MarcinOrlowski.com/"
+      "homepage": "https://MarcinOrlowski.com/"
     }
   ],
   "support": {
@@ -42,13 +44,18 @@
     }
   },
   "require": {
-    "php": "^7.2 | ^7.3 | ^8.0",
-    "laravel/framework": ">= 6.0"
+    "php": "^8.0|^8.1",
+    "laravel/framework": "^9.0"
   },
   "require-dev": {
-    "marcin-orlowski/phpunit-extra-asserts": "^1.2",
-    "orchestra/testbench": "^4.0",
-    "phpunit/phpunit": "^8.0",
-    "phpunit/php-code-coverage": "^7.0"
+    "marcin-orlowski/phpunit-extra-asserts": "^5.1.0",
+    "orchestra/testbench": "^7.0",
+    "phpunit/phpunit": "^9.6.3",
+    "phpunit/php-code-coverage": "^9.2",
+    "nunomaduro/larastan": "^2.0",
+    "marcin-orlowski/php-lockpick": "^1.0"
+  },
+  "scripts": {
+    "test": "vendor/bin/phpunit -c tests/phpunit.xml"
   }
 }

config/response_builder.php

@@ -7,7 +7,7 @@
  * See docs/config.md for detailed documentation
  *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2016-2022 Marcin Orlowski
+ * @copyright 2016-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  *