Skip to content

Commit 4142e1a

Browse files
committed
fix: code style and remaining PHPStan issues
Pint style fixes: - Fix import ordering in DocumentsRelationManager and DocumentResource - Convert double quotes to single quotes in migration - Fix brace position in anonymous class - Use single line empty body for boot method PHPStan fixes: - Add array value type to forTypes @method annotation - Use empty() instead of === null for slug check - Remove unnecessary null return type from closure
1 parent 20614ec commit 4142e1a

6 files changed

Lines changed: 17 additions & 20 deletions

File tree

server-documentation/database/migrations/2024_01_01_000004_update_documents_type_column.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
use Illuminate\Support\Facades\DB;
55
use Illuminate\Support\Facades\Schema;
66

7-
return new class extends Migration
8-
{
7+
return new class extends Migration {
98
public function up(): void
109
{
1110
$driver = Schema::getConnection()->getDriverName();
@@ -15,11 +14,11 @@ public function up(): void
1514
// SQLite doesn't support ALTER COLUMN, but it also doesn't enforce enum types
1615
// The column will accept any value, so we just need to update the data
1716
} elseif ($driver === 'mysql' || $driver === 'mariadb') {
18-
DB::statement("ALTER TABLE documents MODIFY COLUMN type VARCHAR(50) NOT NULL DEFAULT 'player'");
17+
DB::statement('ALTER TABLE documents MODIFY COLUMN type VARCHAR(50) NOT NULL DEFAULT \'player\'');
1918
} elseif ($driver === 'pgsql') {
2019
// PostgreSQL: drop the enum constraint and change to varchar
21-
DB::statement("ALTER TABLE documents ALTER COLUMN type TYPE VARCHAR(50)");
22-
DB::statement("ALTER TABLE documents ALTER COLUMN type SET DEFAULT 'player'");
20+
DB::statement('ALTER TABLE documents ALTER COLUMN type TYPE VARCHAR(50)');
21+
DB::statement('ALTER TABLE documents ALTER COLUMN type SET DEFAULT \'player\'');
2322
}
2423

2524
// Migrate old 'admin' type to 'server_admin' for all drivers
@@ -36,7 +35,7 @@ public function down(): void
3635

3736
// Change back to enum (MySQL only - other drivers will just have varchar)
3837
if ($driver === 'mysql' || $driver === 'mariadb') {
39-
DB::statement("ALTER TABLE documents MODIFY COLUMN type ENUM('admin', 'player') NOT NULL DEFAULT 'player'");
38+
DB::statement('ALTER TABLE documents MODIFY COLUMN type ENUM(\'admin\', \'player\') NOT NULL DEFAULT \'player\'');
4039
}
4140
}
4241
};

server-documentation/src/Filament/Admin/RelationManagers/DocumentsRelationManager.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
namespace Starter\ServerDocumentation\Filament\Admin\RelationManagers;
66

7-
use Filament\Forms\Components\TextInput;
8-
use Filament\Resources\RelationManagers\RelationManager;
97
use Filament\Actions\AttachAction;
108
use Filament\Actions\CreateAction;
119
use Filament\Actions\DetachAction;
1210
use Filament\Actions\DetachBulkAction;
1311
use Filament\Actions\ViewAction;
12+
use Filament\Forms\Components\TextInput;
13+
use Filament\Resources\RelationManagers\RelationManager;
1414
use Filament\Tables\Columns\TextColumn;
1515
use Filament\Tables\Table;
1616
use Starter\ServerDocumentation\Filament\Admin\Resources\DocumentResource;

server-documentation/src/Filament/Admin/Resources/DocumentResource.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44

55
namespace Starter\ServerDocumentation\Filament\Admin\Resources;
66

7+
use App\Models\Egg;
8+
use App\Models\Server;
79
use App\Traits\Filament\CanCustomizePages;
810
use App\Traits\Filament\CanCustomizeRelations;
911
use App\Traits\Filament\CanModifyForm;
1012
use App\Traits\Filament\CanModifyTable;
11-
use App\Models\Egg;
12-
use App\Models\Server;
13+
use Filament\Actions\DeleteBulkAction;
14+
use Filament\Actions\EditAction;
1315
use Filament\Forms\Components\CheckboxList;
1416
use Filament\Forms\Components\Placeholder;
1517
use Filament\Forms\Components\RichEditor;
@@ -20,8 +22,6 @@
2022
use Filament\Resources\Resource;
2123
use Filament\Schemas\Components\Section;
2224
use Filament\Schemas\Schema;
23-
use Filament\Actions\DeleteBulkAction;
24-
use Filament\Actions\EditAction;
2525
use Filament\Tables\Columns\TextColumn;
2626
use Filament\Tables\Filters\TrashedFilter;
2727
use Filament\Tables\Table;

server-documentation/src/Models/Document.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* @property-read \Illuminate\Database\Eloquent\Collection<int, DocumentVersion> $versions
4040
*
4141
* @method static Builder|Document forServer(Server $server)
42-
* @method static Builder|Document forTypes(array $types)
42+
* @method static Builder|Document forTypes(array<string> $types)
4343
* @method static Builder|Document published()
4444
* @method static Builder|Document global()
4545
* @method static Builder|Document search(string $term)
@@ -114,7 +114,7 @@ protected static function booted(): void
114114
{
115115
static::creating(function (Document $document) {
116116
$document->uuid ??= Str::uuid()->toString();
117-
if ($document->slug === null) {
117+
if (empty($document->slug)) {
118118
$document->slug = static::generateUniqueSlug($document->title);
119119
}
120120
if ($document->author_id === null && auth()->check()) {

server-documentation/src/ServerDocumentationPlugin.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,5 @@ public function register(Panel $panel): void
3636
}
3737
}
3838

39-
public function boot(Panel $panel): void
40-
{
41-
}
39+
public function boot(Panel $panel): void {}
4240
}

server-documentation/src/Services/DocumentService.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@ public function createVersionFromOriginal(
191191
?string $originalContent,
192192
?string $changeSummary = null,
193193
?int $userId = null
194-
): ?DocumentVersion {
195-
/** @var DocumentVersion|null */
196-
return DB::transaction(function () use ($document, $originalTitle, $originalContent, $changeSummary, $userId): ?DocumentVersion {
194+
): DocumentVersion {
195+
/** @var DocumentVersion */
196+
return DB::transaction(function () use ($document, $originalTitle, $originalContent, $changeSummary, $userId): DocumentVersion {
197197
/** @var DocumentVersion|null $latestVersion */
198198
$latestVersion = $document->versions()
199199
->lockForUpdate()

0 commit comments

Comments
 (0)