Skip to content
This repository was archived by the owner on Aug 31, 2024. It is now read-only.

Commit b99ebca

Browse files
fix(deps): update dependency laravel/framework to v10 (#92)
* fix(deps): update dependency laravel/framework to v10 * system: migration to laravel 10 * fix: phpunit config * doc: update doc * system: php-cs-fixer --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: lightszentip <lightszentip@gmail.com> Co-authored-by: lightszentip <lightszentip@users.noreply.github.com>
1 parent 285eaa4 commit b99ebca

Some content is hidden

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

61 files changed

+2139
-1776
lines changed

.github/workflows/phploc.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/workflows/quality-check.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,12 @@ jobs:
8888
matrix:
8989
os: [ ubuntu-latest ]
9090
php: [ 8.2, 8.1]
91-
laravel: [ 9.* ]
91+
laravel: [ 10.* ]
9292
stability: [ prefer-lowest, prefer-stable ]
9393
include:
94-
- laravel: 9.*
95-
testbench: 7.*
94+
- laravel: 10.*
95+
testbench: 8.*
96+
pest: 2.*
9697

9798
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
9899

@@ -121,7 +122,7 @@ jobs:
121122

122123
- name: Install dependencies
123124
run: |
124-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
125+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "pestphp/pest:${{ matrix.pest }}" "pestphp/pest-plugin-laravel:${{ matrix.pest }}" --no-interaction --no-update
125126
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
126127
127128
- name: List Installed Dependencies

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: 8.0
19+
php-version: 8.1
2020
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite
2121
coverage: none
2222
- name: Install Composer dependencies

.php-cs-fixer.cache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"php":"8.0.26","version":"3.13.1:v3.13.1#78d2251dd86b49c609a0fd37c20dcf0a00aea5a7","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"imports_order":["class","function","const"],"sort_algorithm":"none"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true},"hashes":{"app\/Exceptions\/Handler.php":"3be61b43ac1d7c71b51525aded851229","app\/Http\/Controllers\/Admin\/RoleController.php":"8beea52bebaecb81a07b395812316eee","app\/Http\/Controllers\/Controller.php":"d2ab2e1e385a80aec6042dc23e7f86eb","app\/Http\/Kernel.php":"7a5447f59aa9d7784bce480153f6f2fa","app\/Http\/Middleware\/VerifyCsrfToken.php":"f940a35a715b792ecc6c36e1da1adbc1","app\/Http\/Middleware\/Authenticate.php":"1a28ab8a480d33b5e262412c084e77b2","app\/Http\/Middleware\/EncryptCookies.php":"aa3be31badc36cd9d7a5ea08eef245e7","app\/Http\/Middleware\/TrustProxies.php":"61c0573d9bc4297f266b808eba9280b8","app\/Http\/Middleware\/TrustHosts.php":"c4e3014f785c6c1752713695bb8fa486","app\/Http\/Middleware\/RedirectIfAuthenticated.php":"993d02efa79a5b4243e1a69cef0d8e77","app\/Http\/Middleware\/PreventRequestsDuringMaintenance.php":"9bf727a4eeaabad8fde5110106356d60","app\/Http\/Middleware\/TrimStrings.php":"016f82bc302a0b8801eeb48edea87cdf","app\/Providers\/AuthServiceProvider.php":"bdec68f77c4f63f6408653e88921f40d","app\/Providers\/AppServiceProvider.php":"d9a21ec42039d0ce660c96e281653e7d","app\/Providers\/JetstreamServiceProvider.php":"30fd01594db88bd5d5f1770fecbb6651","app\/Providers\/BroadcastServiceProvider.php":"66addd4b8d63de202681078a53159174","app\/Providers\/RouteServiceProvider.php":"ba388f64e84f30aa427af2e95439234f","app\/Providers\/FortifyServiceProvider.php":"6983c395768dc457b55966eb99d5dcbd","app\/Providers\/EventServiceProvider.php":"23f68bfab31167aead7040b19c39978e","app\/View\/Components\/AppLayout.php":"0398a03dc0bebfeb59c5f7ea87345af0","app\/View\/Components\/GuestLayout.php":"c6558e148518850d67cb56dd86f8a4e1","app\/Console\/Kernel.php":"1ce1d77f70052683f75133889accff9c","app\/Dto\/ChangelogItem.php":"a278fc3a7a1195df819ffb734b974fc7","app\/Actions\/Jetstream\/DeleteUser.php":"7e2fc14a1272b61e394b718916229b49","app\/Actions\/Fortify\/UpdateUserProfileInformation.php":"66bcca7a29809ff94149c01e2394626f","app\/Actions\/Fortify\/CreateNewUser.php":"9c74f6e36c09efde15940832b3340d49","app\/Actions\/Fortify\/UpdateUserPassword.php":"51dfcd630881e9e676356881bb2c5a41","app\/Actions\/Fortify\/PasswordValidationRules.php":"8b190de210ff4a97e72481e2fbc011e0","app\/Actions\/Fortify\/ResetUserPassword.php":"f324f90dd31b82ae93588fcf92a5a3a8","app\/Models\/Role.php":"3ca70cfdaa96b3b42aed20f79c82eb32","app\/Models\/User.php":"26e98842fea07c43b186c767a94e0ab7"}}
1+
{"php":"8.1.10","version":"3.15.1:v3.15.1#d48755372a113bddb99f749e34805d83f3acfe04","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"imports_order":["class","function","const"],"sort_algorithm":"none"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true},"hashes":{"app\\Actions\\Fortify\\CreateNewUser.php":"9c74f6e36c09efde15940832b3340d49","app\\Actions\\Fortify\\PasswordValidationRules.php":"8b190de210ff4a97e72481e2fbc011e0","app\\Actions\\Fortify\\ResetUserPassword.php":"f324f90dd31b82ae93588fcf92a5a3a8","app\\Actions\\Fortify\\UpdateUserPassword.php":"51dfcd630881e9e676356881bb2c5a41","app\\Actions\\Fortify\\UpdateUserProfileInformation.php":"66bcca7a29809ff94149c01e2394626f","app\\Actions\\Jetstream\\DeleteUser.php":"7e2fc14a1272b61e394b718916229b49","app\\Console\\Kernel.php":"1ce1d77f70052683f75133889accff9c","app\\Dto\\ChangelogItem.php":"a278fc3a7a1195df819ffb734b974fc7","app\\Exceptions\\Handler.php":"3be61b43ac1d7c71b51525aded851229","app\\Http\\Controllers\\Admin\\RoleController.php":"8beea52bebaecb81a07b395812316eee","app\\Http\\Controllers\\Controller.php":"d2ab2e1e385a80aec6042dc23e7f86eb","app\\Http\\Kernel.php":"37459139f35a0e6ffbfa1a5d677b4be1","app\\Http\\Middleware\\Authenticate.php":"1a28ab8a480d33b5e262412c084e77b2","app\\Http\\Middleware\\EncryptCookies.php":"aa3be31badc36cd9d7a5ea08eef245e7","app\\Http\\Middleware\\PreventRequestsDuringMaintenance.php":"9bf727a4eeaabad8fde5110106356d60","app\\Http\\Middleware\\RedirectIfAuthenticated.php":"993d02efa79a5b4243e1a69cef0d8e77","app\\Http\\Middleware\\TrimStrings.php":"016f82bc302a0b8801eeb48edea87cdf","app\\Http\\Middleware\\TrustHosts.php":"c4e3014f785c6c1752713695bb8fa486","app\\Http\\Middleware\\TrustProxies.php":"61c0573d9bc4297f266b808eba9280b8","app\\Http\\Middleware\\VerifyCsrfToken.php":"f940a35a715b792ecc6c36e1da1adbc1","app\\Models\\Role.php":"3ca70cfdaa96b3b42aed20f79c82eb32","app\\Models\\User.php":"26e98842fea07c43b186c767a94e0ab7","app\\Providers\\AppServiceProvider.php":"d9a21ec42039d0ce660c96e281653e7d","app\\Providers\\AuthServiceProvider.php":"072f1a5c6e5d0dc4fb917bf494154cda","app\\Providers\\BroadcastServiceProvider.php":"66addd4b8d63de202681078a53159174","app\\Providers\\EventServiceProvider.php":"23f68bfab31167aead7040b19c39978e","app\\Providers\\FortifyServiceProvider.php":"6983c395768dc457b55966eb99d5dcbd","app\\Providers\\JetstreamServiceProvider.php":"30fd01594db88bd5d5f1770fecbb6651","app\\Providers\\RouteServiceProvider.php":"ba388f64e84f30aa427af2e95439234f","app\\View\\Components\\AppLayout.php":"0398a03dc0bebfeb59c5f7ea87345af0","app\\View\\Components\\GuestLayout.php":"c6558e148518850d67cb56dd86f8a4e1"}}

README-Laravel.md

Lines changed: 0 additions & 66 deletions
This file was deleted.

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ A laravel bootstrap template with jetstream
55
[![PHP-Quality](https://github.com/lightszentip/laravel-bootstrap-app/actions/workflows/quality-check.yml/badge.svg)](https://github.com/lightszentip/laravel-bootstrap-app/actions/workflows/quality-check.yml)
66
[![PHP-LOC and PHPMD](https://github.com/lightszentip/laravel-bootstrap-app/actions/workflows/phploc.yml/badge.svg)](https://github.com/lightszentip/laravel-bootstrap-app/actions/workflows/phploc.yml)
77

8-
[toc]
8+
## Versions
9+
10+
| Release | Laravel | PHP |
11+
|:----------|:--------------------------|:--------|
12+
| **1.2.x** | `10.*` | `>=8.1` |
13+
| **1.1.x** | `9.*` | `>=8.0` |
914

1015
## First Setup
1116

SECURITY.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ currently being supported with security updates.
77

88
| Version | PHP | Supported |
99
|---------|-----|--------------------|
10-
| 1.0.x | 8.1 | :white_check_mark: |
11-
| 1.0.x | 8.0 | :white_check_mark: |
10+
| 1.2.x | 8.1 | :white_check_mark: |
11+
| 1.1.x | 8.1 | :x: |
12+
| 1.1.x | 8.0 | :x: |
1213
| 1.0.x | 7.x | :x: |
1314
| < 1.0 | * | :x: |
1415

app/Http/Kernel.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class Kernel extends HttpKernel
1616
protected $middleware = [
1717
// \App\Http\Middleware\TrustHosts::class,
1818
\App\Http\Middleware\TrustProxies::class,
19-
\Fruitcake\Cors\HandleCors::class,
2019
\App\Http\Middleware\PreventRequestsDuringMaintenance::class,
2120
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
2221
\App\Http\Middleware\TrimStrings::class,

app/Providers/AuthServiceProvider.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ class AuthServiceProvider extends ServiceProvider
2323
*/
2424
public function boot()
2525
{
26-
$this->registerPolicies();
27-
2826
//
2927
}
3028
}

composer.json

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,36 @@
66
"license": "MIT",
77
"require": {
88
"php": "^8.1|^8.2",
9-
"fruitcake/laravel-cors": "^v3.0.0",
10-
"graham-campbell/security": "11.0.0",
9+
"graham-campbell/security": "^v11.0.0",
1110
"guzzlehttp/guzzle": "^7.5.0",
12-
"laravel/framework": "^9.39.0",
13-
"laravel/jetstream": "^v3.0.0",
14-
"laravel/sanctum": "^v3.0.1",
15-
"laravel/tinker": "^v2.7.3",
16-
"laravelcollective/html": "^6.3",
11+
"laravel/framework": "^v10.4.1",
12+
"laravel/jetstream": "^v3.1.0",
13+
"laravel/sanctum": "^v3.2.1",
14+
"laravel/tinker": "^v2.8.1",
15+
"laravelcollective/html": "^v6.4.0",
1716
"lightszentip/laravel-release-changelog-generator": "^0.2.1",
1817
"livewire/livewire": "^v2.10.7",
19-
"spatie/laravel-ignition": "^1.6",
20-
"spatie/laravel-permission": "^5.7"
18+
"spatie/laravel-ignition": "^2.0.0",
19+
"spatie/laravel-permission": "^5.9.1"
2120
},
2221
"require-dev": {
23-
"barryvdh/laravel-ide-helper": "^2.12",
24-
"fakerphp/faker": "^v1.20.0",
25-
"friendsofphp/php-cs-fixer": "^3.13",
26-
"laravel/sail": "^v1.16.3",
22+
"barryvdh/laravel-ide-helper": "^v2.13.0",
23+
"fakerphp/faker": "^v1.21.0",
24+
"friendsofphp/php-cs-fixer": "^v3.15.1",
25+
"laravel/sail": "^v1.21.2",
2726
"mockery/mockery": "^1.5.1",
2827
"mrdebug/crudgen": "^1.9.2",
29-
"nunomaduro/collision": "^v7.0.0",
28+
"nunomaduro/collision": "^v7.2.0",
3029
"nunomaduro/larastan": "2.5.1",
31-
"pestphp/pest-plugin-laravel": "^1.3",
32-
"phpat/phpat": "^0.10.2",
30+
"pestphp/pest": "^2.1.0",
31+
"pestphp/pest-plugin-laravel": "^v2.0",
32+
"phpat/phpat": "^0.10.3",
3333
"phpcheckstyle/phpcheckstyle": "^0.14.8",
34-
"phploc/phploc": "^7.0",
3534
"phpmd/phpmd": "^2.13",
36-
"phpunit/phpunit": "^10.0.0",
3735
"psalm/plugin-laravel": "^2.0",
3836
"psalm/plugin-phpunit": "^0.18.4",
3937
"romanzipp/laravel-model-doc": "^1.2",
40-
"vimeo/psalm": "^5.4.0"
38+
"vimeo/psalm": "^5.8.0"
4139
},
4240
"autoload": {
4341
"psr-4": {
@@ -79,6 +77,6 @@
7977
"pestphp/pest-plugin": true
8078
}
8179
},
82-
"minimum-stability": "dev",
80+
"minimum-stability": "stable",
8381
"prefer-stable": true
8482
}

0 commit comments

Comments
 (0)