Skip to content

Commit b4b20b5

Browse files
laravel 12
1 parent 7707036 commit b4b20b5

Some content is hidden

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

42 files changed

+2684
-1590
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
.phpunit.result.cache
1515
Homestead.json
1616
Homestead.yaml
17-
auth.json
1817
npm-debug.log
1918
yarn-error.log
19+
/auth.json
2020
/.fleet
2121
/.idea
2222
/.nova

app/Models/User.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
* @property int $id
1616
* @property string $name
1717
* @property string $email
18-
* @property string|null $avatar
1918
* @property \Illuminate\Support\Carbon|null $email_verified_at
2019
* @property string $password
21-
* @property string|null $timezone +7 or Asia/Ho_Chi_Minh
2220
* @property string|null $remember_token
21+
* @property string|null $timezone +7 or Asia/Ho_Chi_Minh
2322
* @property \Illuminate\Support\Carbon|null $created_at
2423
* @property \Illuminate\Support\Carbon|null $updated_at
2524
* @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
@@ -44,7 +43,7 @@ class User extends Authenticatable implements FilamentUser, HasAvatar, MustVerif
4443
/**
4544
* The attributes that are mass assignable.
4645
*
47-
* @var array<int, string>
46+
* @var list<string>
4847
*/
4948
protected $fillable = [
5049
'name',
@@ -57,7 +56,7 @@ class User extends Authenticatable implements FilamentUser, HasAvatar, MustVerif
5756
/**
5857
* The attributes that should be hidden for serialization.
5958
*
60-
* @var array<int, string>
59+
* @var list<string>
6160
*/
6261
protected $hidden = [
6362
'password',
@@ -98,10 +97,8 @@ public function getFilamentAvatarUrl(): ?string
9897

9998
/**
10099
* Send the email verification notification.
101-
*
102-
* @return void
103100
*/
104-
public function sendEmailVerificationNotification()
101+
public function sendEmailVerificationNotification(): void
105102
{
106103
$this->notify(new \App\Notifications\VerifyEmail);
107104
}

artisan

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env php
22
<?php
33

4+
use Illuminate\Foundation\Application;
45
use Symfony\Component\Console\Input\ArgvInput;
56

67
define('LARAVEL_START', microtime(true));
@@ -9,7 +10,9 @@ define('LARAVEL_START', microtime(true));
910
require __DIR__.'/vendor/autoload.php';
1011

1112
// Bootstrap Laravel and handle the command...
12-
$status = (require_once __DIR__.'/bootstrap/app.php')
13-
->handleCommand(new ArgvInput);
13+
/** @var Application $app */
14+
$app = require_once __DIR__.'/bootstrap/app.php';
15+
16+
$status = $app->handleCommand(new ArgvInput);
1417

1518
exit($status);

bootstrap/app.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
commands: __DIR__.'/../routes/console.php',
1111
health: '/up',
1212
)
13-
->withMiddleware(function (Middleware $middleware) {
13+
->withMiddleware(function (Middleware $middleware): void {
1414
//
1515
})
16-
->withExceptions(function (Exceptions $exceptions) {
16+
->withExceptions(function (Exceptions $exceptions): void {
1717
//
1818
})->create();

composer.json

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"$schema": "https://getcomposer.org/schema.json",
23
"name": "laravel/laravel",
34
"type": "project",
45
"description": "The skeleton application for the Laravel framework.",
@@ -9,22 +10,22 @@
910
"license": "MIT",
1011
"require": {
1112
"php": "^8.2",
12-
"filament/filament": "^3.2",
13-
"laravel/framework": "^11.33",
14-
"laravel/tinker": "^2.10"
13+
"filament/filament": "^3.3",
14+
"laravel/framework": "^12.0",
15+
"laravel/tinker": "^2.10.1"
1516
},
1617
"require-dev": {
17-
"barryvdh/laravel-debugbar": "^3.13",
18-
"barryvdh/laravel-ide-helper": "^3.0",
19-
"driftingly/rector-laravel": "^1.2",
20-
"fakerphp/faker": "^1.23",
21-
"larastan/larastan": "^2.9",
18+
"barryvdh/laravel-debugbar": "^3.15",
19+
"barryvdh/laravel-ide-helper": "^3.5",
20+
"driftingly/rector-laravel": "^2.0",
21+
"fakerphp/faker": "^1.24",
22+
"larastan/larastan": "^3.2",
2223
"laravel/pail": "^1.2",
23-
"laravel/pint": "^1.13",
24-
"laravel/sail": "^1.26",
24+
"laravel/pint": "^1.21",
25+
"laravel/sail": "^1.41",
2526
"mockery/mockery": "^1.6",
26-
"nunomaduro/collision": "^8.4",
27-
"phpunit/phpunit": "^11.0.1"
27+
"nunomaduro/collision": "^8.7",
28+
"phpunit/phpunit": "^11.5"
2829
},
2930
"autoload": {
3031
"psr-4": {
@@ -58,6 +59,10 @@
5859
"@php -r \"file_exists('database/database.sqlite') || touch('database/database.sqlite');\"",
5960
"@php artisan migrate --graceful --ansi"
6061
],
62+
"dev": [
63+
"Composer\\Config::disableProcessTimeout",
64+
"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"
65+
],
6166
"ide": [
6267
"php artisan ide-helper:models --write --reset",
6368
"./vendor/bin/rector",

0 commit comments

Comments
 (0)