diff --git a/composer.json b/composer.json index f9f7343..094cbf2 100644 --- a/composer.json +++ b/composer.json @@ -18,8 +18,8 @@ "nunomaduro/collision": "^8.7", "php-open-source-saver/jwt-auth": "^2.7", "psr/simple-cache": "^3.0", - "ronasit/laravel-helpers": "^3.3", - "ronasit/laravel-swagger": "^3.1", + "ronasit/laravel-helpers": "^3.5", + "ronasit/laravel-swagger": "^3.2", "spatie/laravel-google-cloud-storage": "^2.3", "spatie/laravel-ignition": "^2.8", "symfony/http-client": "^7.2.0", diff --git a/composer.lock b/composer.lock index 5a81b52..291d80e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "843d293f052ea09bac864fa29f7c45d7", + "content-hash": "9bb7361400fb04e45d7f17db10814c0f", "packages": [ { "name": "brick/math", @@ -3980,16 +3980,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.4.0", + "version": "v5.6.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "447a020a1f875a434d62f2a401f53b82a396e494" + "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494", - "reference": "447a020a1f875a434d62f2a401f53b82a396e494", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2", + "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2", "shasum": "" }, "require": { @@ -4008,7 +4008,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.x-dev" } }, "autoload": { @@ -4032,9 +4032,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1" }, - "time": "2024-12-30T11:07:19+00:00" + "time": "2025-08-13T20:13:15+00:00" }, { "name": "nunomaduro/collision", @@ -6121,16 +6121,16 @@ }, { "name": "ronasit/laravel-helpers", - "version": "3.4.5", + "version": "3.5", "source": { "type": "git", "url": "https://github.com/RonasIT/laravel-helpers.git", - "reference": "d680d000497286a7b8de0d197cecd8baf16fb8d4" + "reference": "eeb12597fc85386adf6160e4738aadfb28bbdf2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/RonasIT/laravel-helpers/zipball/d680d000497286a7b8de0d197cecd8baf16fb8d4", - "reference": "d680d000497286a7b8de0d197cecd8baf16fb8d4", + "url": "https://api.github.com/repos/RonasIT/laravel-helpers/zipball/eeb12597fc85386adf6160e4738aadfb28bbdf2a", + "reference": "eeb12597fc85386adf6160e4738aadfb28bbdf2a", "shasum": "" }, "require": { @@ -6196,34 +6196,35 @@ ], "support": { "issues": "https://github.com/RonasIT/laravel-helpers/issues", - "source": "https://github.com/RonasIT/laravel-helpers/tree/3.4.5" + "source": "https://github.com/RonasIT/laravel-helpers/tree/3.5" }, - "time": "2025-06-23T08:22:31+00:00" + "time": "2025-08-13T11:41:48+00:00" }, { "name": "ronasit/laravel-swagger", - "version": "3.1.5", + "version": "3.2.3", "source": { "type": "git", "url": "https://github.com/RonasIT/laravel-swagger.git", - "reference": "d8dea15cbbc76d1cf07d75c9fb4cb4474b4eb30b" + "reference": "2a8f884ba5fc3986ab4021367079580f36c63744" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/RonasIT/laravel-swagger/zipball/d8dea15cbbc76d1cf07d75c9fb4cb4474b4eb30b", - "reference": "d8dea15cbbc76d1cf07d75c9fb4cb4474b4eb30b", + "url": "https://api.github.com/repos/RonasIT/laravel-swagger/zipball/2a8f884ba5fc3986ab4021367079580f36c63744", + "reference": "2a8f884ba5fc3986ab4021367079580f36c63744", "shasum": "" }, "require": { "ext-json": "*", "laravel/framework": ">=11.34", "php": "^8.3", - "phpunit/phpunit": "^11.4" + "phpunit/phpunit": ">=11.4" }, "require-dev": { - "orchestra/testbench": "^9.3", + "orchestra/testbench": ">=9.3", "php-coveralls/php-coveralls": "^2.7", - "php-mock/php-mock-phpunit": "^2.10" + "php-mock/php-mock-phpunit": ">=2.10", + "ronasit/laravel-helpers": "^3.4" }, "type": "library", "extra": { @@ -6260,9 +6261,9 @@ ], "support": { "issues": "https://github.com/RonasIT/laravel-swagger/issues", - "source": "https://github.com/RonasIT/laravel-swagger/tree/3.1.5" + "source": "https://github.com/RonasIT/laravel-swagger/tree/3.2.3" }, - "time": "2025-03-18T13:10:20+00:00" + "time": "2025-08-14T08:52:43+00:00" }, { "name": "sebastian/cli-parser", @@ -11676,7 +11677,7 @@ ], "aliases": [], "minimum-stability": "beta", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/config/auto-doc.php b/config/auto-doc.php index 2a2d909..f62ae93 100644 --- a/config/auto-doc.php +++ b/config/auto-doc.php @@ -101,6 +101,15 @@ '204' => 'Operation successfully done', '404' => 'This entity not found', ], + + /* + |-------------------------------------------------------------------------- + | Error Template + |-------------------------------------------------------------------------- + | + | You can use your custom description view for errors. + */ + 'error' => 'auto-doc::error', ], /* @@ -121,7 +130,7 @@ |-------------------------------------------------------------------------- | | Tool for rendering API documentation in HTML format. - | Available values: "swagger", "elements", "rapidoc" + | Available values: "swagger", "elements", "rapidoc", "scalar" */ 'documentation_viewer' => env('SWAGGER_SPEC_VIEWER', 'swagger'), @@ -184,5 +193,32 @@ 'development', ], - 'config_version' => '2.8', + /* + |-------------------------------------------------------------------------- + | Paratests + |-------------------------------------------------------------------------- + | + | The config for parallel tests execution setup + */ + 'paratests' => [ + 'tmp_file_lock' => [ + /* + |-------------------------------------------------------------------------- + | Maximum attempts count, int + |-------------------------------------------------------------------------- + | The maximum number of attempts to append data to a temporary documentation file + */ + 'max_retries' => 20, + + /* + |-------------------------------------------------------------------------- + | Wait time between attempts, microseconds + |-------------------------------------------------------------------------- + | The waiting time between attempts to write to the temporary documentation file while the file is locked + */ + 'wait_time' => 500, + ], + ], + + 'config_version' => '2.10', ]; diff --git a/tests/fixtures/SettingTest/get_public_settings.json b/tests/fixtures/SettingTest/get_public_settings.json index 9c9f461..9acfac5 100755 --- a/tests/fixtures/SettingTest/get_public_settings.json +++ b/tests/fixtures/SettingTest/get_public_settings.json @@ -28,8 +28,8 @@ } ], "links": { - "first": "http:\/\/localhost\/v0.1\/settings?page=1", - "last": "http:\/\/localhost\/v0.1\/settings?page=1", + "first": "https:\/\/localhost\/v0.1\/settings?page=1", + "last": "https:\/\/localhost\/v0.1\/settings?page=1", "prev": null, "next": null }, @@ -44,7 +44,7 @@ "active": false }, { - "url": "http:\/\/localhost\/v0.1\/settings?page=1", + "url": "https:\/\/localhost\/v0.1\/settings?page=1", "label": "1", "active": true }, @@ -54,7 +54,7 @@ "active": false } ], - "path": "http:\/\/localhost\/v0.1\/settings", + "path": "https:\/\/localhost\/v0.1\/settings", "per_page": 10, "to": 3, "total": 3 diff --git a/tests/fixtures/SettingTest/get_setting_by_key.json b/tests/fixtures/SettingTest/get_setting_by_key.json index d0a0993..bd490f2 100755 --- a/tests/fixtures/SettingTest/get_setting_by_key.json +++ b/tests/fixtures/SettingTest/get_setting_by_key.json @@ -15,8 +15,8 @@ } ], "links": { - "first": "http:\/\/localhost\/v0.1\/settings?page=1", - "last": "http:\/\/localhost\/v0.1\/settings?page=1", + "first": "https:\/\/localhost\/v0.1\/settings?page=1", + "last": "https:\/\/localhost\/v0.1\/settings?page=1", "prev": null, "next": null }, @@ -31,7 +31,7 @@ "active": false }, { - "url": "http:\/\/localhost\/v0.1\/settings?page=1", + "url": "https:\/\/localhost\/v0.1\/settings?page=1", "label": "1", "active": true }, @@ -41,7 +41,7 @@ "active": false } ], - "path": "http:\/\/localhost\/v0.1\/settings", + "path": "https:\/\/localhost\/v0.1\/settings", "per_page": 10, "to": 1, "total": 1 diff --git a/tests/fixtures/SettingTest/get_settings_check_order.json b/tests/fixtures/SettingTest/get_settings_check_order.json index 08ebe58..1f5ac46 100755 --- a/tests/fixtures/SettingTest/get_settings_check_order.json +++ b/tests/fixtures/SettingTest/get_settings_check_order.json @@ -35,8 +35,8 @@ } ], "links": { - "first": "http:\/\/localhost\/v0.1\/settings?page=1", - "last": "http:\/\/localhost\/v0.1\/settings?page=1", + "first": "https:\/\/localhost\/v0.1\/settings?page=1", + "last": "https:\/\/localhost\/v0.1\/settings?page=1", "prev": null, "next": null }, @@ -51,7 +51,7 @@ "active": false }, { - "url": "http:\/\/localhost\/v0.1\/settings?page=1", + "url": "https:\/\/localhost\/v0.1\/settings?page=1", "label": "1", "active": true }, @@ -61,7 +61,7 @@ "active": false } ], - "path": "http:\/\/localhost\/v0.1\/settings", + "path": "https:\/\/localhost\/v0.1\/settings", "per_page": 10, "to": 4, "total": 4 diff --git a/tests/fixtures/SettingTest/search_all.json b/tests/fixtures/SettingTest/search_all.json index 05b48f0..d481669 100755 --- a/tests/fixtures/SettingTest/search_all.json +++ b/tests/fixtures/SettingTest/search_all.json @@ -35,8 +35,8 @@ } ], "links": { - "first": "http:\/\/localhost\/v0.1\/settings?page=1", - "last": "http:\/\/localhost\/v0.1\/settings?page=1", + "first": "https:\/\/localhost\/v0.1\/settings?page=1", + "last": "https:\/\/localhost\/v0.1\/settings?page=1", "prev": null, "next": null }, @@ -51,7 +51,7 @@ "active": false }, { - "url": "http:\/\/localhost\/v0.1\/settings?page=1", + "url": "https:\/\/localhost\/v0.1\/settings?page=1", "label": "1", "active": true }, @@ -61,7 +61,7 @@ "active": false } ], - "path": "http:\/\/localhost\/v0.1\/settings", + "path": "https:\/\/localhost\/v0.1\/settings", "per_page": 4, "to": 4, "total": 4 diff --git a/tests/fixtures/SettingTest/search_complex.json b/tests/fixtures/SettingTest/search_complex.json index f54ffcf..ec39dec 100755 --- a/tests/fixtures/SettingTest/search_complex.json +++ b/tests/fixtures/SettingTest/search_complex.json @@ -15,8 +15,8 @@ } ], "links": { - "first": "http:\/\/localhost\/v0.1\/settings?page=1", - "last": "http:\/\/localhost\/v0.1\/settings?page=1", + "first": "https:\/\/localhost\/v0.1\/settings?page=1", + "last": "https:\/\/localhost\/v0.1\/settings?page=1", "prev": null, "next": null }, @@ -31,7 +31,7 @@ "active": false }, { - "url": "http:\/\/localhost\/v0.1\/settings?page=1", + "url": "https:\/\/localhost\/v0.1\/settings?page=1", "label": "1", "active": true }, @@ -41,7 +41,7 @@ "active": false } ], - "path": "http:\/\/localhost\/v0.1\/settings", + "path": "https:\/\/localhost\/v0.1\/settings", "per_page": 1, "to": 1, "total": 1 diff --git a/tests/fixtures/SettingTest/search_per_page.json b/tests/fixtures/SettingTest/search_per_page.json index 84194ec..82b11b0 100755 --- a/tests/fixtures/SettingTest/search_per_page.json +++ b/tests/fixtures/SettingTest/search_per_page.json @@ -16,10 +16,10 @@ } ], "links": { - "first": "http:\/\/localhost\/v0.1\/settings?page=1", - "last": "http:\/\/localhost\/v0.1\/settings?page=2", + "first": "https:\/\/localhost\/v0.1\/settings?page=1", + "last": "https:\/\/localhost\/v0.1\/settings?page=2", "prev": null, - "next": "http:\/\/localhost\/v0.1\/settings?page=2" + "next": "https:\/\/localhost\/v0.1\/settings?page=2" }, "meta": { "current_page": 1, @@ -32,22 +32,22 @@ "active": false }, { - "url": "http:\/\/localhost\/v0.1\/settings?page=1", + "url": "https:\/\/localhost\/v0.1\/settings?page=1", "label": "1", "active": true }, { - "url": "http:\/\/localhost\/v0.1\/settings?page=2", + "url": "https:\/\/localhost\/v0.1\/settings?page=2", "label": "2", "active": false }, { - "url": "http:\/\/localhost\/v0.1\/settings?page=2", + "url": "https:\/\/localhost\/v0.1\/settings?page=2", "label": "Next »", "active": false } ], - "path": "http:\/\/localhost\/v0.1\/settings", + "path": "https:\/\/localhost\/v0.1\/settings", "per_page": 2, "to": 2, "total": 4 diff --git a/tests/fixtures/UserTest/get_users_by_email.json b/tests/fixtures/UserTest/get_users_by_email.json index e60b78f..059781b 100644 --- a/tests/fixtures/UserTest/get_users_by_email.json +++ b/tests/fixtures/UserTest/get_users_by_email.json @@ -8,8 +8,8 @@ } ], "links": { - "first": "http:\/\/localhost\/v0.1\/users?page=1", - "last": "http:\/\/localhost\/v0.1\/users?page=1", + "first": "https:\/\/localhost\/v0.1\/users?page=1", + "last": "https:\/\/localhost\/v0.1\/users?page=1", "prev": null, "next": null }, @@ -24,7 +24,7 @@ "active": false }, { - "url": "http:\/\/localhost\/v0.1\/users?page=1", + "url": "https:\/\/localhost\/v0.1\/users?page=1", "label": "1", "active": true }, @@ -34,7 +34,7 @@ "active": false } ], - "path": "http:\/\/localhost\/v0.1\/users", + "path": "https:\/\/localhost\/v0.1\/users", "per_page": 10, "to": 1, "total": 1 diff --git a/tests/fixtures/UserTest/get_users_by_name.json b/tests/fixtures/UserTest/get_users_by_name.json index f07340c..1dc6311 100644 --- a/tests/fixtures/UserTest/get_users_by_name.json +++ b/tests/fixtures/UserTest/get_users_by_name.json @@ -8,8 +8,8 @@ } ], "links": { - "first": "http:\/\/localhost\/v0.1\/users?page=1", - "last": "http:\/\/localhost\/v0.1\/users?page=1", + "first": "https:\/\/localhost\/v0.1\/users?page=1", + "last": "https:\/\/localhost\/v0.1\/users?page=1", "prev": null, "next": null }, @@ -24,7 +24,7 @@ "active": false }, { - "url": "http:\/\/localhost\/v0.1\/users?page=1", + "url": "https:\/\/localhost\/v0.1\/users?page=1", "label": "1", "active": true }, @@ -34,7 +34,7 @@ "active": false } ], - "path": "http:\/\/localhost\/v0.1\/users", + "path": "https:\/\/localhost\/v0.1\/users", "per_page": 10, "to": 1, "total": 1 diff --git a/tests/fixtures/UserTest/get_users_by_query.json b/tests/fixtures/UserTest/get_users_by_query.json index e60b78f..059781b 100644 --- a/tests/fixtures/UserTest/get_users_by_query.json +++ b/tests/fixtures/UserTest/get_users_by_query.json @@ -8,8 +8,8 @@ } ], "links": { - "first": "http:\/\/localhost\/v0.1\/users?page=1", - "last": "http:\/\/localhost\/v0.1\/users?page=1", + "first": "https:\/\/localhost\/v0.1\/users?page=1", + "last": "https:\/\/localhost\/v0.1\/users?page=1", "prev": null, "next": null }, @@ -24,7 +24,7 @@ "active": false }, { - "url": "http:\/\/localhost\/v0.1\/users?page=1", + "url": "https:\/\/localhost\/v0.1\/users?page=1", "label": "1", "active": true }, @@ -34,7 +34,7 @@ "active": false } ], - "path": "http:\/\/localhost\/v0.1\/users", + "path": "https:\/\/localhost\/v0.1\/users", "per_page": 10, "to": 1, "total": 1 diff --git a/tests/fixtures/UserTest/get_users_check_order.json b/tests/fixtures/UserTest/get_users_check_order.json index e47417c..0137e74 100644 --- a/tests/fixtures/UserTest/get_users_check_order.json +++ b/tests/fixtures/UserTest/get_users_check_order.json @@ -14,8 +14,8 @@ } ], "links": { - "first": "http:\/\/localhost\/v0.1\/users?page=1", - "last": "http:\/\/localhost\/v0.1\/users?page=1", + "first": "https:\/\/localhost\/v0.1\/users?page=1", + "last": "https:\/\/localhost\/v0.1\/users?page=1", "prev": null, "next": null }, @@ -30,7 +30,7 @@ "active": false }, { - "url": "http:\/\/localhost\/v0.1\/users?page=1", + "url": "https:\/\/localhost\/v0.1\/users?page=1", "label": "1", "active": true }, @@ -40,7 +40,7 @@ "active": false } ], - "path": "http:\/\/localhost\/v0.1\/users", + "path": "https:\/\/localhost\/v0.1\/users", "per_page": 10, "to": 2, "total": 2 diff --git a/tests/fixtures/UserTest/get_users_complex.json b/tests/fixtures/UserTest/get_users_complex.json index 31e2b0b..88f0b2e 100644 --- a/tests/fixtures/UserTest/get_users_complex.json +++ b/tests/fixtures/UserTest/get_users_complex.json @@ -12,8 +12,8 @@ } ], "links": { - "first": "http:\/\/localhost\/v0.1\/users?page=1", - "last": "http:\/\/localhost\/v0.1\/users?page=1", + "first": "https:\/\/localhost\/v0.1\/users?page=1", + "last": "https:\/\/localhost\/v0.1\/users?page=1", "prev": null, "next": null }, @@ -28,7 +28,7 @@ "active": false }, { - "url": "http:\/\/localhost\/v0.1\/users?page=1", + "url": "https:\/\/localhost\/v0.1\/users?page=1", "label": "1", "active": true }, @@ -38,7 +38,7 @@ "active": false } ], - "path": "http:\/\/localhost\/v0.1\/users", + "path": "https:\/\/localhost\/v0.1\/users", "per_page": 10, "to": 1, "total": 1 diff --git a/tests/fixtures/UserTest/search_by_all_user.json b/tests/fixtures/UserTest/search_by_all_user.json index 588dcdf..c6f16d3 100644 --- a/tests/fixtures/UserTest/search_by_all_user.json +++ b/tests/fixtures/UserTest/search_by_all_user.json @@ -14,8 +14,8 @@ } ], "links": { - "first": "http:\/\/localhost\/v0.1\/users?page=1", - "last": "http:\/\/localhost\/v0.1\/users?page=1", + "first": "https:\/\/localhost\/v0.1\/users?page=1", + "last": "https:\/\/localhost\/v0.1\/users?page=1", "prev": null, "next": null }, @@ -30,7 +30,7 @@ "active": false }, { - "url": "http:\/\/localhost\/v0.1\/users?page=1", + "url": "https:\/\/localhost\/v0.1\/users?page=1", "label": "1", "active": true }, @@ -40,7 +40,7 @@ "active": false } ], - "path": "http:\/\/localhost\/v0.1\/users", + "path": "https:\/\/localhost\/v0.1\/users", "per_page": 2, "to": 2, "total": 2 diff --git a/tests/fixtures/UserTest/search_by_page_per_page_user.json b/tests/fixtures/UserTest/search_by_page_per_page_user.json index 588dcdf..c6f16d3 100644 --- a/tests/fixtures/UserTest/search_by_page_per_page_user.json +++ b/tests/fixtures/UserTest/search_by_page_per_page_user.json @@ -14,8 +14,8 @@ } ], "links": { - "first": "http:\/\/localhost\/v0.1\/users?page=1", - "last": "http:\/\/localhost\/v0.1\/users?page=1", + "first": "https:\/\/localhost\/v0.1\/users?page=1", + "last": "https:\/\/localhost\/v0.1\/users?page=1", "prev": null, "next": null }, @@ -30,7 +30,7 @@ "active": false }, { - "url": "http:\/\/localhost\/v0.1\/users?page=1", + "url": "https:\/\/localhost\/v0.1\/users?page=1", "label": "1", "active": true }, @@ -40,7 +40,7 @@ "active": false } ], - "path": "http:\/\/localhost\/v0.1\/users", + "path": "https:\/\/localhost\/v0.1\/users", "per_page": 2, "to": 2, "total": 2