Skip to content

Commit e75ae8a

Browse files
Merge remote-tracking branch 'origin/main'
# Conflicts: # composer.lock
2 parents bc9b5b1 + 90a6ec4 commit e75ae8a

14 files changed

Lines changed: 2314 additions & 2501 deletions

app/Collections/PemCertificateCollection.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@
22

33
namespace App\Collections;
44

5+
use Override;
6+
use InvalidArgumentException;
57
use App\DataTransferObjects\PemCertificate;
68
use Illuminate\Support\Collection;
79

810
/** @extends Collection<int,PemCertificate> */
911
final class PemCertificateCollection extends Collection
1012
{
11-
#[\Override]
13+
#[Override]
1214
public function add($item): self
1315
{
1416
if (!$item instanceof PemCertificate) {
15-
throw new \InvalidArgumentException('Item must be an instance of PemCertificate');
17+
throw new InvalidArgumentException('Item must be an instance of PemCertificate');
1618
}
1719

1820
parent::add($item);

app/Livewire/ShowCertificates.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@
22

33
namespace App\Livewire;
44

5+
use Filament\Actions\Contracts\HasActions;
6+
use Filament\Actions\Concerns\InteractsWithActions;
7+
use Filament\Actions\ViewAction;
8+
use Filament\Schemas\Components\Section;
59
use App\Enumerations\CertificateType;
610
use App\Models\Certificate;
711
use Carbon\Carbon;
812
use Filament\Forms\Concerns\InteractsWithForms;
913
use Filament\Forms\Contracts\HasForms;
10-
use Filament\Infolists\Components\Section;
1114
use Filament\Infolists\Components\TextEntry;
1215
use Filament\Infolists\Concerns\InteractsWithInfolists;
1316
use Filament\Infolists\Contracts\HasInfolists;
14-
use Filament\Tables\Actions\ViewAction;
1517
use Filament\Tables\Columns\IconColumn;
1618
use Filament\Tables\Columns\TextColumn;
1719
use Filament\Tables\Concerns\InteractsWithTable;
@@ -25,8 +27,9 @@
2527
use Livewire\Component;
2628
use Filament\Tables\Table;
2729

28-
class ShowCertificates extends Component implements HasForms, HasTable, HasInfolists
30+
class ShowCertificates extends Component implements HasForms, HasTable, HasInfolists, HasActions
2931
{
32+
use InteractsWithActions;
3033
use InteractsWithForms;
3134
use InteractsWithTable;
3235
use InteractsWithInfolists;
@@ -70,9 +73,9 @@ public function table(Table $table): Table
7073
false: fn(Builder $query) => $query->where('valid_to', '<', Carbon::now()),
7174
),
7275
], layout: FiltersLayout::AboveContent)
73-
->actions([
76+
->recordActions([
7477
ViewAction::make()
75-
->infolist([
78+
->schema([
7679
Section::make('Certificate Info')
7780
->schema([
7881
TextEntry::make('gateway.name'),
@@ -92,7 +95,7 @@ public function table(Table $table): Table
9295

9396
])
9497
])
95-
->bulkActions([
98+
->toolbarActions([
9699
// ...
97100
])
98101
->groups([

app/Models/Certificate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Certificate extends Model
2222
protected $guarded = [];
2323

2424
/**
25-
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\App\Models\Gateway, $this>
25+
* @return BelongsTo<Gateway, $this>
2626
*/
2727
public function gateway(): BelongsTo
2828
{

app/Models/Gateway.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Gateway extends Model
1111
use HasFactory;
1212

1313
/**
14-
* @return \Illuminate\Database\Eloquent\Relations\HasMany<\App\Models\Certificate, $this>
14+
* @return HasMany<Certificate, $this>
1515
*/
1616
public function certificates(): HasMany
1717
{

app/Models/User.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
namespace App\Models;
44

55
// use Illuminate\Contracts\Auth\MustVerifyEmail;
6+
use Database\Factories\UserFactory;
67
use Illuminate\Database\Eloquent\Factories\HasFactory;
78
use Illuminate\Foundation\Auth\User as Authenticatable;
89
use Illuminate\Notifications\Notifiable;
910

1011
class User extends Authenticatable
1112
{
12-
/** @use HasFactory<\Database\Factories\UserFactory> */
13+
/** @use HasFactory<UserFactory> */
1314
use HasFactory, Notifiable;
1415

1516
protected $fillable = [

app/Providers/AppServiceProvider.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
namespace App\Providers;
44

5+
use Override;
56
use Illuminate\Support\ServiceProvider;
67

78
class AppServiceProvider extends ServiceProvider
89
{
910
/**
1011
* Register any application services.
1112
*/
12-
#[\Override]
13+
#[Override]
1314
public function register(): void
1415
{
1516
//

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"require": {
88
"php": "^8.4",
99
"ext-openssl": "*",
10-
"filament/infolists": "^3.3",
11-
"filament/tables": "^3.3",
10+
"filament/infolists": "^4.0",
11+
"filament/tables": "^4.0",
1212
"laravel/framework": "^12",
1313
"laravel/tinker": "^2.9",
1414
"saloonphp/laravel-plugin": "^3.0",
@@ -18,13 +18,14 @@
1818
"require-dev": {
1919
"driftingly/rector-laravel": "^2",
2020
"fakerphp/faker": "^1.23",
21+
"filament/upgrade": "^4.0",
2122
"larastan/larastan": "^3",
2223
"laravel/pail": "^1.1",
2324
"laravel/pint": "^1.13",
2425
"mockery/mockery": "^1.6",
2526
"nunomaduro/collision": "^8.1",
26-
"pestphp/pest": "^3.5",
27-
"pestphp/pest-plugin-laravel": "^3.0",
27+
"pestphp/pest": "^4",
28+
"pestphp/pest-plugin-laravel": "^4",
2829
"rector/rector": "^2"
2930
},
3031
"autoload": {

0 commit comments

Comments
 (0)