Merge branch '11.x'

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
This commit is contained in:
Mior Muhammad Zaki
2024-12-27 09:03:41 +08:00
22 changed files with 111 additions and 32 deletions

View File

@@ -1,4 +1,5 @@
{
"$schema": "https://getcomposer.org/schema.json",
"name": "laravel/laravel",
"type": "project",
"description": "The skeleton application for the Laravel framework.",
@@ -11,10 +12,16 @@
},
"require-dev": {
"fakerphp/faker": "^1.23",
"laravel/pail": "^1.1",
"laravel/pint": "^1.13",
"laravel/sail": "dev-develop",
"mockery/mockery": "^1.6",
<<<<<<< HEAD
"phpunit/phpunit": "^10.5"
=======
"nunomaduro/collision": "^8.1",
"phpunit/phpunit": "^11.0.1"
>>>>>>> 11.x
},
"autoload": {
"psr-4": {
@@ -43,6 +50,10 @@
"@php artisan key:generate --ansi",
"@php -r \"file_exists('database/database.sqlite') || touch('database/database.sqlite');\"",
"@php artisan migrate --graceful --ansi"
],
"dev": [
"Composer\\Config::disableProcessTimeout",
"npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite"
]
},
"extra": {