Skip to content

Commit 220ea6c

Browse files
committed
Stricter code
1 parent 276fb3b commit 220ea6c

File tree

14 files changed

+91
-47
lines changed

14 files changed

+91
-47
lines changed
Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace TypiCMS\Modules\Things\Composers;
46

57
use Illuminate\Support\Facades\Gate;
@@ -14,15 +16,22 @@ public function compose(View $view): void
1416
if (Gate::denies('read things')) {
1517
return;
1618
}
17-
$view->offsetGet('sidebar')->group(__(config('typicms.modules.things.sidebar.group', 'Content')), function (SidebarGroup $group): void {
18-
$group->id = 'content';
19-
$group->weight = 30;
20-
$group->addItem(__(config('typicms.modules.things.sidebar.label', 'Things')), function (SidebarItem $item): void {
21-
$item->id = 'things';
22-
$item->icon = config('typicms.modules.things.sidebar.icon');
23-
$item->weight = config('typicms.modules.things.sidebar.weight');
24-
$item->route('admin::index-things');
25-
});
26-
});
19+
20+
$view->offsetGet('sidebar')->group(
21+
__(config('typicms.modules.things.sidebar.group', 'Content')),
22+
function (SidebarGroup $group): void {
23+
$group->id = 'content';
24+
$group->weight = 30;
25+
$group->addItem(
26+
__(config('typicms.modules.things.sidebar.label', 'Things')),
27+
function (SidebarItem $item): void {
28+
$item->id = 'things';
29+
$item->icon = config('typicms.modules.things.sidebar.icon');
30+
$item->weight = config('typicms.modules.things.sidebar.weight');
31+
$item->route('admin::index-things');
32+
},
33+
);
34+
},
35+
);
2736
}
2837
}

src/Exports/Export.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace TypiCMS\Modules\Things\Exports;
46

57
use Illuminate\Database\Eloquent\Collection;

src/Facades/Things.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace TypiCMS\Modules\Things\Facades;
46

57
use Illuminate\Support\Facades\Facade;

src/Http/Controllers/AdminController.php

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace TypiCMS\Modules\Things\Http\Controllers;
46

57
use Illuminate\Http\RedirectResponse;
@@ -12,7 +14,7 @@
1214
use TypiCMS\Modules\Things\Http\Requests\FormRequest;
1315
use TypiCMS\Modules\Things\Models\Thing;
1416

15-
class AdminController extends BaseAdminController
17+
final class AdminController extends BaseAdminController
1618
{
1719
public function index(): View
1820
{
@@ -30,29 +32,25 @@ public function create(): View
3032
{
3133
$model = new Thing();
3234

33-
return view('things::admin.create')
34-
->with(['model' => $model]);
35+
return view('things::admin.create', ['model' => $model]);
3536
}
3637

3738
public function edit(Thing $thing): View
3839
{
39-
return view('things::admin.edit')
40-
->with(['model' => $thing]);
40+
return view('things::admin.edit', ['model' => $thing]);
4141
}
4242

4343
public function store(FormRequest $request): RedirectResponse
4444
{
4545
$thing = Thing::query()->create($request->validated());
4646

47-
return $this->redirect($request, $thing)
48-
->withMessage(__('Item successfully created.'));
47+
return $this->redirect($request, $thing)->withMessage(__('Item successfully created.'));
4948
}
5049

5150
public function update(Thing $thing, FormRequest $request): RedirectResponse
5251
{
5352
$thing->update($request->validated());
5453

55-
return $this->redirect($request, $thing)
56-
->withMessage(__('Item successfully updated.'));
54+
return $this->redirect($request, $thing)->withMessage(__('Item successfully updated.'));
5755
}
5856
}

src/Http/Controllers/ApiController.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace TypiCMS\Modules\Things\Http\Controllers;
46

57
use Illuminate\Http\JsonResponse;
@@ -11,7 +13,7 @@
1113
use TypiCMS\Modules\Core\Http\Controllers\BaseApiController;
1214
use TypiCMS\Modules\Things\Models\Thing;
1315

14-
class ApiController extends BaseApiController
16+
final class ApiController extends BaseApiController
1517
{
1618
/** @return LengthAwarePaginator<int, mixed> */
1719
public function index(Request $request): LengthAwarePaginator
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace TypiCMS\Modules\Things\Http\Controllers;
46

57
use Illuminate\View\View;
68
use TypiCMS\Modules\Core\Http\Controllers\BasePublicController;
79
use TypiCMS\Modules\Things\Models\Thing;
810

9-
class PublicController extends BasePublicController
11+
final class PublicController extends BasePublicController
1012
{
1113
public function index(): View
1214
{
@@ -16,8 +18,7 @@ public function index(): View
1618
->with('image')
1719
->get();
1820

19-
return view('things::public.index')
20-
->with(['models' => $models]);
21+
return view('things::public.index', ['models' => $models]);
2122
}
2223

2324
public function show(string $slug): View
@@ -27,7 +28,6 @@ public function show(string $slug): View
2728
->whereSlugIs($slug)
2829
->firstOrFail();
2930

30-
return view('things::public.show')
31-
->with(['model' => $model]);
31+
return view('things::public.show', ['model' => $model]);
3232
}
3333
}

src/Http/Requests/FormRequest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace TypiCMS\Modules\Things\Http\Requests;
46

57
use TypiCMS\Modules\Core\Http\Requests\AbstractFormRequest;

src/Models/Thing.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace TypiCMS\Modules\Things\Models;
46

57
use Illuminate\Database\Eloquent\Casts\Attribute;
@@ -64,9 +66,7 @@ public function url(?string $locale = null): string
6466
/** @return Attribute<string, null> */
6567
protected function thumb(): Attribute
6668
{
67-
return Attribute::make(
68-
get: fn () => $this->present()->image(null, 54),
69-
);
69+
return Attribute::make(get: fn () => $this->present()->image(null, 54));
7070
}
7171

7272
/** @return BelongsTo<File, $this> */

src/Presenters/ModulePresenter.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace TypiCMS\Modules\Things\Presenters;
46

57
use TypiCMS\Modules\Core\Presenters\Presenter;

src/Providers/ModuleServiceProvider.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace TypiCMS\Modules\Things\Providers;
46

57
use Illuminate\Foundation\AliasLoader;

0 commit comments

Comments
 (0)