Skip to content

Commit f29be2c

Browse files
sdebackersdebacker
committed
Stricter code
1 parent 9286867 commit f29be2c

File tree

15 files changed

+102
-52
lines changed

15 files changed

+102
-52
lines changed

‎resources/views/admin/_form.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
<div class="header">
4040
<x-core::back-button :url="$model->indexUrl()" :title="__('Places')" />
4141
<x-core::title :$model :default="__('New place')" />
42-
<x-core::form-buttons :$model :locales="locales()" />
42+
<x-core::form-buttons :$model />
4343
</div>
4444

4545
<div class="content">
4646
<x-core::form-errors />
4747

4848
<div class="row">
4949
<div class="col-lg-8">
50-
<x-core::title-and-slug-fields :locales="locales()" />
50+
<x-core::title-and-slug-fields />
5151
<div class="mb-3">
5252
{!! TranslatableBootForm::hidden('status')->value(0) !!}
5353
{!! TranslatableBootForm::checkbox(__('Published'), 'status') !!}

‎resources/views/public/show.blade.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</header>
2323
<div class="place-body">
2424
@include('places::public._json-ld', ['place' => $model])
25-
@if (!empty($model->latitude) && !empty($model->longitude))
25+
@if ($model->latitude && $model->longitude)
2626
<div class="map" id="map" data-url="{{ route($lang . '::place-json', $model->slug) }}" data-no-button="false"></div>
2727
@endif
2828

@@ -48,21 +48,21 @@
4848
<p class="place-email"><a href="mailto:{{ $model->email }}">{{ $model->email }}</a></p>
4949
@endif
5050

51-
@if(!empty($model->website))
51+
@if($model->website)
5252
<p class="place-website">
5353
<a href="{{ $model->website }}">{{ parse_url($model->website, PHP_URL_HOST) }}</a>
5454
</p>
5555
@endif
5656
</div>
57-
@if(!empty($model->info))
57+
@if($model->info)
5858
<p class="place-info">{!! nl2br($model->info) !!}</p>
5959
@endif
6060

61-
@if(!empty($model->summary))
61+
@if($model->summary)
6262
<p class="place-summary">{!! nl2br($model->summary) !!}</p>
6363
@endif
6464

65-
@if(!empty($model->body))
65+
@if($model->body)
6666
<div class="rich-content">{!! $model->present()->body !!}</div>
6767
@endif
6868

‎src/Composers/SidebarViewComposer.php‎

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\Places\Composers;
46

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

57
use Illuminate\Database\Eloquent\Collection;

‎src/Facades/Places.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\Places\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\Places\Http\Controllers;
46

57
use Illuminate\Http\JsonResponse;
@@ -13,7 +15,7 @@
1315
use TypiCMS\Modules\Places\Http\Requests\FormRequest;
1416
use TypiCMS\Modules\Places\Models\Place;
1517

16-
class AdminController extends BaseAdminController
18+
final class AdminController extends BaseAdminController
1719
{
1820
public function index(): View
1921
{
@@ -31,30 +33,26 @@ public function create(): View
3133
{
3234
$model = new Place();
3335

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

3839
public function edit(Place $place): View
3940
{
40-
return view('places::admin.edit')
41-
->with(['model' => $place]);
41+
return view('places::admin.edit', ['model' => $place]);
4242
}
4343

4444
public function store(FormRequest $request): RedirectResponse
4545
{
4646
$place = Place::query()->create($request->validated());
4747

48-
return $this->redirect($request, $place)
49-
->withMessage(__('Item successfully created.'));
48+
return $this->redirect($request, $place)->withMessage(__('Item successfully created.'));
5049
}
5150

5251
public function update(Place $place, FormRequest $request): RedirectResponse
5352
{
5453
$place->update($request->validated());
5554

56-
return $this->redirect($request, $place)
57-
->withMessage(__('Item successfully updated.'));
55+
return $this->redirect($request, $place)->withMessage(__('Item successfully updated.'));
5856
}
5957

6058
public function files(Place $place): JsonResponse

‎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\Places\Http\Controllers;
46

57
use Illuminate\Http\JsonResponse;
@@ -11,7 +13,7 @@
1113
use TypiCMS\Modules\Core\Http\Controllers\BaseApiController;
1214
use TypiCMS\Modules\Places\Models\Place;
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

‎src/Http/Controllers/JsonController.php‎

Lines changed: 3 additions & 1 deletion
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\Places\Http\Controllers;
46

57
use Illuminate\Http\JsonResponse;
68
use TypiCMS\Modules\Core\Http\Controllers\BasePublicController;
79
use TypiCMS\Modules\Places\Models\Place;
810

9-
class JsonController extends BasePublicController
11+
final class JsonController extends BasePublicController
1012
{
1113
public function index(): JsonResponse
1214
{

‎src/Http/Controllers/PublicController.php‎

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\Places\Http\Controllers;
46

57
use Illuminate\View\View;
68
use TypiCMS\Modules\Core\Http\Controllers\BasePublicController;
79
use TypiCMS\Modules\Places\Models\Place;
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('places::public.index')
20-
->with(['models' => $models]);
21+
return view('places::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('places::public.show')
31-
->with(['model' => $model]);
31+
return view('places::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\Places\Http\Requests;
46

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

0 commit comments

Comments
 (0)