diff --git a/lang/en/about.php b/lang/en/about.php
index c3dfb855..bc886ca2 100644
--- a/lang/en/about.php
+++ b/lang/en/about.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
'title' => 'About the SiteBoss CMS',
'version' => 'Version',
diff --git a/lang/en/auth.php b/lang/en/auth.php
index 0ed0887d..c3ea1ca1 100644
--- a/lang/en/auth.php
+++ b/lang/en/auth.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
/*
diff --git a/lang/en/page.php b/lang/en/page.php
index 52324807..aef81378 100644
--- a/lang/en/page.php
+++ b/lang/en/page.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
// TODO: update values to use proper naming convention
return [
'title' => 'Pages',
diff --git a/lang/en/passwords.php b/lang/en/passwords.php
index 2345a56b..05f156a5 100644
--- a/lang/en/passwords.php
+++ b/lang/en/passwords.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
/*
diff --git a/lang/en/preferences.php b/lang/en/preferences.php
index e4b50377..3003aa22 100644
--- a/lang/en/preferences.php
+++ b/lang/en/preferences.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
'title' => 'User preferences',
'subtitle' => 'Here you can change your preferences',
diff --git a/lang/en/response.php b/lang/en/response.php
index a4f8e132..dd5c8516 100644
--- a/lang/en/response.php
+++ b/lang/en/response.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
'unauth' => 'Unauthorized user',
'tokenexp' => 'Token expired',
diff --git a/lang/en/support.php b/lang/en/support.php
index d5ecb987..5bbe6c59 100644
--- a/lang/en/support.php
+++ b/lang/en/support.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
'title' => 'Support',
'breadcrumb' => 'Support',
diff --git a/lang/en/ui.php b/lang/en/ui.php
index 442a6817..bad585a9 100644
--- a/lang/en/ui.php
+++ b/lang/en/ui.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
'save' => 'Save',
'save_no_redirect' => 'Save and stay on this page',
diff --git a/lang/en/validation.php b/lang/en/validation.php
index 635d4f50..91450ba8 100644
--- a/lang/en/validation.php
+++ b/lang/en/validation.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
/*
diff --git a/lang/nl/about.php b/lang/nl/about.php
index 23408cfe..a8a990b4 100644
--- a/lang/nl/about.php
+++ b/lang/nl/about.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
'title' => 'Over SiteBoss CMS',
'version' => 'Versie',
diff --git a/lang/nl/auth.php b/lang/nl/auth.php
index c4f5f6ed..58b842e4 100644
--- a/lang/nl/auth.php
+++ b/lang/nl/auth.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
/*
|--------------------------------------------------------------------------
diff --git a/lang/nl/page.php b/lang/nl/page.php
index f59bbf28..446123f5 100644
--- a/lang/nl/page.php
+++ b/lang/nl/page.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
'title' => "Pagina's",
'edit' => 'Wijzig pagina',
diff --git a/lang/nl/passwords.php b/lang/nl/passwords.php
index 778ed16d..961efb45 100644
--- a/lang/nl/passwords.php
+++ b/lang/nl/passwords.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
/*
diff --git a/lang/nl/preferences.php b/lang/nl/preferences.php
index 74399e42..c20af18f 100644
--- a/lang/nl/preferences.php
+++ b/lang/nl/preferences.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
'title' => 'Gebruikersvoorkeuren',
'subtitle' => 'Wijzig hier je voorkeuren',
diff --git a/lang/nl/redirects.php b/lang/nl/redirects.php
index 65582938..37c8e6fa 100644
--- a/lang/nl/redirects.php
+++ b/lang/nl/redirects.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
'title' => 'Doorverwijzingen',
'widget_title' => 'Overzicht van alle doorverwijzingen',
diff --git a/lang/nl/response.php b/lang/nl/response.php
index 26fe3b54..87453860 100644
--- a/lang/nl/response.php
+++ b/lang/nl/response.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
'unauth' => 'Gebruiker onbevoegd',
'tokenexp' => 'Token verlopen',
diff --git a/lang/nl/support.php b/lang/nl/support.php
index ce7063e9..1c75deaf 100644
--- a/lang/nl/support.php
+++ b/lang/nl/support.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
'title' => 'Support',
'breadcrumb' => 'Support',
diff --git a/lang/nl/ui.php b/lang/nl/ui.php
index 2abfe65f..7d783f03 100644
--- a/lang/nl/ui.php
+++ b/lang/nl/ui.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
'save' => 'Opslaan',
'save_no_redirect' => 'Opslaan en op deze pagina blijven',
diff --git a/lang/nl/validation.php b/lang/nl/validation.php
index 499303c5..51086097 100644
--- a/lang/nl/validation.php
+++ b/lang/nl/validation.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
return [
/*
diff --git a/routes/api.php b/routes/api.php
index d3728b51..2254fcae 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -27,6 +27,7 @@
| is assigned the "api" middleware group. Enjoy building your API!
|
*/
+
Route::prefix(config('siteboss.api_prefix'))->group(function () {
// Routes account management
@@ -44,7 +45,7 @@
Route::prefix('api')->group(function () {
// Unauthenticated routes
- Route::namespace('Forms')->group(function () {
+ Route::namespace('Forms')->group(function (): void {
Route::post('forms/{form:id}/{langurl}', [DataController::class, 'create'])->middleware(ProtectAgainstSpam::class)->name('formbuilder.post');
Route::get('fields/{id}', [FieldController::class, 'readOneJson']);
// RIGHTS!!!!!
@@ -62,9 +63,9 @@
Route::get('settings', [InfoController::class, 'settings']);
// Authenticated routes
- Route::group(['middleware' => ['auth:openid', 'api', EnsureEmailIsVerified::class]], function () {
+ Route::group(['middleware' => ['auth:openid', 'api', EnsureEmailIsVerified::class]], function (): void {
// Language for messages (not the language used for storing data)
- Route::group(['prefix' => '/{locale}', 'middleware' => 'set-forget-locale'], function () {
+ Route::group(['prefix' => '/{locale}', 'middleware' => 'set-forget-locale'], function (): void {
Route::get('info', [InfoController::class, 'index']);
// TODO: remove this route?
@@ -76,7 +77,7 @@
// Form builder
Route::middleware('role:forms')->group(__DIR__.'/cms/forms.php');
- Route::prefix('app')->group(function () {
+ Route::prefix('app')->group(function (): void {
if (file_exists(base_path().'/routes/siteboss.php')) {
Route::prefix('site')->group(
base_path().'/routes/siteboss.php'
@@ -109,7 +110,7 @@
Route::get('about', [AboutController::class, 'index']);
// Support page for SiteBoss CMS
- Route::prefix('support')->group(function () {
+ Route::prefix('support')->group(function (): void {
Route::get('', [SupportController::class, 'index']);
Route::post('', [SupportController::class, 'update']);
});
diff --git a/routes/cms/editor.php b/routes/cms/editor.php
index e5c1230f..7cf0edd4 100644
--- a/routes/cms/editor.php
+++ b/routes/cms/editor.php
@@ -16,18 +16,18 @@
Route::post('table-export', [CmsEditorImportExportController::class, 'exportAllTables']);
Route::post('template-export', [CmsEditorImportExportController::class, 'exportAllTemplates']);
// table
-Route::prefix('table')->group(function () {
+Route::prefix('table')->group(function (): void {
Route::get('', [CmsEditorTableController::class, 'index']);
Route::post('', [CmsEditorTableController::class, 'create']);
- Route::prefix('{table}')->group(function () {
+ Route::prefix('{table}')->group(function (): void {
Route::get('', [CmsEditorTableController::class, 'readOne']);
Route::post('', [CmsEditorTableController::class, 'update']);
Route::put('move', [CmsEditorTableController::class, 'updatePosition']);
Route::post('add-field', [CmsEditorTableController::class, 'addField']);
- Route::prefix('{tableItem}')->group(function () {
+ Route::prefix('{tableItem}')->group(function (): void {
Route::get('', [CmsEditorTableItemController::class, 'readOne']);
Route::post('', [CmsEditorTableItemController::class, 'update']);
Route::post('enabled', [CmsEditorTableItemController::class, 'enabled']);
@@ -36,11 +36,11 @@
});
// pages
-Route::prefix('page')->group(function () {
+Route::prefix('page')->group(function (): void {
Route::get('', [CmsEditorTemplateController::class, 'index']);
Route::post('', [CmsEditorTemplateController::class, 'create']);
- Route::prefix('{table}')->group(function () {
+ Route::prefix('{table}')->group(function (): void {
Route::get('', [CmsEditorTemplateController::class, 'readOne']);
Route::post('', [CmsEditorTemplateController::class, 'update']);
Route::post('import', [CmsEditorImportExportController::class, 'importTemplate']);
@@ -48,7 +48,7 @@
Route::put('move', [CmsEditorTemplateController::class, 'updatePosition']);
Route::post('add-field', [CmsEditorTemplateController::class, 'addField']);
- Route::prefix('{tableItem}')->group(function () {
+ Route::prefix('{tableItem}')->group(function (): void {
Route::get('', [CmsEditorTemplateItemController::class, 'readOne']);
Route::post('', [CmsEditorTemplateItemController::class, 'update']);
Route::post('enabled', [CmsEditorTemplateItemController::class, 'enabled']);
@@ -56,26 +56,26 @@
});
});
-Route::prefix('menu')->group(function () {
+Route::prefix('menu')->group(function (): void {
Route::get('', [CmsEditorMenuController::class, 'index']);
Route::post('', [CmsEditorMenuController::class, 'addItem']);
Route::put('move', [CmsEditorMenuController::class, 'updatePosition']);
- Route::prefix('{menuItem}')->group(function () {
+ Route::prefix('{menuItem}')->group(function (): void {
Route::get('', [CmsEditorMenuController::class, 'readOne']);
Route::post('', [CmsEditorMenuController::class, 'update']);
Route::delete('', [CmsEditorMenuController::class, 'deleteRecord']);
});
});
-Route::prefix('lang')->group(function () {
+Route::prefix('lang')->group(function (): void {
Route::get('', [CmsEditorLangController::class, 'index']);
Route::post('', [CmsEditorLangController::class, 'create']);
Route::put('move', [CmsEditorLangController::class, 'updatePosition']);
- Route::prefix('{lang:id}')->group(function () {
+ Route::prefix('{lang:id}')->group(function (): void {
Route::get('', [CmsEditorLangController::class, 'readOne']);
Route::post('', [CmsEditorLangController::class, 'update']);
Route::delete('', [CmsEditorLangController::class, 'deleteRecord']);
diff --git a/routes/cms/forms.php b/routes/cms/forms.php
index b9a55222..5c9a36e3 100644
--- a/routes/cms/forms.php
+++ b/routes/cms/forms.php
@@ -7,22 +7,22 @@
use NotFound\Framework\Http\Controllers\Forms\FieldController;
use NotFound\Framework\Http\Controllers\Forms\FormController;
-Route::namespace('Forms')->group(function () {
+Route::namespace('Forms')->group(function (): void {
// /forms
- Route::prefix('forms')->group(function () {
+ Route::prefix('forms')->group(function (): void {
Route::post('', [FormController::class, 'create']);
Route::get('combinations', [FormController::class, 'readAllCombinations']);
Route::get('archive', [FormController::class, 'readAllArchive']);
// /forms/categories
- Route::prefix('categories')->group(function () {
+ Route::prefix('categories')->group(function (): void {
Route::get('', [CategoryController::class, 'readAllBasedOnRights']);
Route::get('{category:slug}', [FormController::class, 'readAllBasedOnCategory']);
});
// /forms/{id}
- Route::prefix('{form:id}')->group(function () {
+ Route::prefix('{form:id}')->group(function (): void {
Route::delete('', [FormController::class, 'delete']);
Route::put('', [FormController::class, 'update']);
Route::post('clone', [FormController::class, 'clone']);
@@ -31,13 +31,13 @@
Route::get('csv', [DownloadController::class, 'downloadReport']);
// /forms/{id}/settings
- Route::prefix('settings')->group(function () {
+ Route::prefix('settings')->group(function (): void {
Route::get('', [FormController::class, 'getText']);
Route::put('', [FormController::class, 'updateText']);
});
// /forms/{id}/fields
- Route::prefix('fields')->group(function () {
+ Route::prefix('fields')->group(function (): void {
Route::get('', [FieldController::class, 'readOne']);
Route::patch('', [FieldController::class, 'update']);
@@ -46,13 +46,13 @@
});
// /forms/{id}/data
- Route::prefix('data')->group(function () {
+ Route::prefix('data')->group(function (): void {
Route::get('', [DataController::class, 'readOne']);
Route::get('all', [DataController::class, 'readOneAll']);
Route::get('filled', [DataController::class, 'readOneFilled']);
// /forms/{id}/data/{id}
- Route::prefix('{recordId}')->group(function () {
+ Route::prefix('{recordId}')->group(function (): void {
Route::delete('', [DataController::class, 'deleteRow']);
Route::patch('', [DataController::class, 'updateField']);
});
diff --git a/routes/cms/forwards.php b/routes/cms/forwards.php
index a01de46a..697a93d9 100644
--- a/routes/cms/forwards.php
+++ b/routes/cms/forwards.php
@@ -5,12 +5,12 @@
Route::get('/', [ForwardsController::class, 'getOptions']);
-Route::prefix('domains')->group(function () {
+Route::prefix('domains')->group(function (): void {
Route::get('/', [ForwardsController::class, 'readAll']);
Route::get('/{domain:id}', [ForwardsController::class, 'readOne']);
});
-Route::prefix('options')->group(function () {
+Route::prefix('options')->group(function (): void {
Route::get('/', [ForwardsController::class, 'readAll']);
Route::get('/rules/', [ForwardsController::class, 'readAll']);
});
diff --git a/routes/cms/page.php b/routes/cms/page.php
index 11289221..b7044144 100644
--- a/routes/cms/page.php
+++ b/routes/cms/page.php
@@ -10,7 +10,7 @@
Route::post('create/{menu}', [MenuController::class, 'create']);
// /app/page/{id}/editor/
-Route::prefix('{menu}/editor/{langSlug}')->group(function () {
+Route::prefix('{menu}/editor/{langSlug}')->group(function (): void {
Route::get('', [PageEditorController::class, 'index']);
Route::post('', [PageEditorController::class, 'update']);
Route::get('{fieldInternal}', [PageItemEditorController::class, 'ajaxGet']);
diff --git a/routes/cms/table.php b/routes/cms/table.php
index fbc33027..fe0fdbe1 100644
--- a/routes/cms/table.php
+++ b/routes/cms/table.php
@@ -5,18 +5,18 @@
use NotFound\Framework\Http\Controllers\Assets\TableItemEditorController;
use NotFound\Framework\Http\Controllers\Assets\TableOverviewController;
-Route::prefix('{table:url}')->group(function () {
+Route::prefix('{table:url}')->group(function (): void {
Route::get('', [TableOverviewController::class, 'index']);
Route::put('', [TableOverviewController::class, 'updateField']);
Route::post('', [TableOverviewController::class, 'create']);
Route::put('move', [TableOverviewController::class, 'updatePosition']);
// /table/{slug}/{recordId}
- Route::prefix('{recordId}')->group(function () {
+ Route::prefix('{recordId}')->group(function (): void {
Route::delete('', [TableEditorController::class, 'deleteRecord']);
// /table/{slug}/{recordId}/{lang}
- Route::prefix('{langSlug}')->group(function () {
+ Route::prefix('{langSlug}')->group(function (): void {
Route::get('', [TableEditorController::class, 'index']);
Route::post('', [TableEditorController::class, 'update']);
diff --git a/routes/console.php b/routes/console.php
index cc908c2c..1cf25f22 100644
--- a/routes/console.php
+++ b/routes/console.php
@@ -6,7 +6,6 @@
use NotFound\Framework\Services\Indexer\IndexBuilderService;
Artisan::command('siteboss:index-site {--debug : Whether debug messages should be displayed} {--clean : Truncate search table}', function ($debug, $clean) {
-
$indexer = new IndexBuilderService($debug, $clean);
$indexer->run();
@@ -14,7 +13,6 @@
})->purpose('Index site for local search');
Artisan::command('siteboss:cms-import {--debug : Whether debug messages should be displayed} {--dry : Dry Run}', function ($debug, $dry) {
-
$indexer = new ExchangeConsoleService($debug, $dry);
$indexer->import();
diff --git a/src/FrameworkServiceProvider.php b/src/FrameworkServiceProvider.php
index f6d4935d..560e1acc 100644
--- a/src/FrameworkServiceProvider.php
+++ b/src/FrameworkServiceProvider.php
@@ -40,13 +40,12 @@ public function boot(): void
], 'siteboss-framework');
VerifyEmail::toMailUsing(function (object $notifiable, string $url) {
-
// todo: get value from users current lang;
App::setLocale(Lang::current()->url);
$blockUrl = $url.'&block=1';
- return (new MailMessage)
+ return (new MailMessage())
->subject(__('siteboss::auth.verify_email_button').' '.config('app.name'))
->view('siteboss::emails.verify-email', ['url' => $url, 'blockUrl' => $blockUrl]);
});
diff --git a/src/Helpers/SitebossHelper.php b/src/Helpers/SitebossHelper.php
index b1f0760a..be4a05a1 100644
--- a/src/Helpers/SitebossHelper.php
+++ b/src/Helpers/SitebossHelper.php
@@ -96,14 +96,14 @@ public static function makeDirectory($root, $dir): bool
if (is_dir($root.$dir)) {
// All set
return true;
- } else {
- // Directory does not exist, so lets check the parent directory
- $parentDir = dirname($dir);
- if (! is_dir($root.$parentDir)) {
- // Parent directory does not exist, so lets create it
- make_directories($root, $parentDir);
- }
}
+ // Directory does not exist, so lets check the parent directory
+ $parentDir = dirname($dir);
+ if (! is_dir($root.$parentDir)) {
+ // Parent directory does not exist, so lets create it
+ make_directories($root, $parentDir);
+ }
+
if (! mkdir($root.$dir)) {
Log::error('[makeDirIfNotExist] Permission denied: '.$dir);
diff --git a/src/Http/Controllers/AboutController.php b/src/Http/Controllers/AboutController.php
index 8bbdf95b..6b18638a 100644
--- a/src/Http/Controllers/AboutController.php
+++ b/src/Http/Controllers/AboutController.php
@@ -78,14 +78,13 @@ private function getMaximumFileUploadSize()
{
if ($this->convertPHPSizeToBytes(ini_get('post_max_size')) < self::convertPHPSizeToBytes(ini_get('upload_max_filesize'))) {
return ini_get('post_max_size');
- } else {
- return ini_get('upload_max_filesize');
}
+
+ return ini_get('upload_max_filesize');
}
private function convertPHPSizeToBytes($sSize)
{
- //
$sSuffix = strtoupper(substr($sSize, -1));
if (! in_array($sSuffix, ['P', 'T', 'G', 'M', 'K'])) {
return (int) $sSize;
diff --git a/src/Http/Controllers/ContentBlocks/ContentBlockController.php b/src/Http/Controllers/ContentBlocks/ContentBlockController.php
index 7945116c..8cb64fdb 100644
--- a/src/Http/Controllers/ContentBlocks/ContentBlockController.php
+++ b/src/Http/Controllers/ContentBlocks/ContentBlockController.php
@@ -27,7 +27,7 @@ public function get(string $csvTables)
}
}
- $newTables = $tables->map(function ($table) {
+ return $tables->map(function ($table) {
$inputs = (new TableService($table, lang::default()))->getFieldComponents();
$newInputs = [];
@@ -41,7 +41,5 @@ public function get(string $csvTables)
return $table;
});
-
- return $newTables;
}
}
diff --git a/src/Http/Controllers/Forms/DownloadController.php b/src/Http/Controllers/Forms/DownloadController.php
index d40a3b84..bfa68dd5 100644
--- a/src/Http/Controllers/Forms/DownloadController.php
+++ b/src/Http/Controllers/Forms/DownloadController.php
@@ -51,26 +51,25 @@ public function unauthenticatedDownload($submitId, $fieldId, $UUID)
$field = $data->data->{$fieldId};
foreach ($field->value as $file) {
- if (! isset($file->uuid) || $file->uuid != $UUID) {
+ if (! isset($file->uuid) || $file->uuid !== $UUID) {
continue;
}
if (Storage::disk('formbuilder')->exists($file->loc)) {
return Storage::disk('formbuilder')->download($file->loc, $file->filename);
- } else {
- abort(403, 'File not found on server');
}
+ abort(403, 'File not found on server');
}
abort(403, 'e2');
}
- public function downloadReportFilled($id)
+ public function downloadReportFilled($id): void
{
$this->downloadReport($id, 'filled');
}
- public function downloadReportAll($id)
+ public function downloadReportAll($id): void
{
$this->downloadReport($id, 'all');
}
@@ -88,7 +87,7 @@ public function downloadReport($id, $type = 'normal')
$dataHandler = new \NotFound\Framework\Services\Forms\UserDataTransformer($id, $type);
$list = $dataHandler->getDataCsv();
- $callback = function () use ($list) {
+ $callback = function () use ($list): void {
$FH = fopen('php://output', 'w');
foreach ($list as $row) {
fputcsv($FH, $row);
diff --git a/src/Http/Controllers/Forms/FormController.php b/src/Http/Controllers/Forms/FormController.php
index b4dbff68..db0beedf 100644
--- a/src/Http/Controllers/Forms/FormController.php
+++ b/src/Http/Controllers/Forms/FormController.php
@@ -57,8 +57,8 @@ public function getText(Form $form)
$result = (object) [];
$result->fields = $fieldsController->listFields($form->id);
- $result->success_text = $form->success_text ?? new \stdClass;
- $result->confirmation_mail = $form->confirmation_mail ?? new \stdClass;
+ $result->success_text = $form->success_text ?? new \stdClass();
+ $result->confirmation_mail = $form->confirmation_mail ?? new \stdClass();
return ['form' => $result];
}
@@ -76,7 +76,7 @@ public function create(Request $request)
$form->name = $request->name;
$form->type = $request->type;
- if ($request->type == 'form') {
+ if ($request->type === 'form') {
$category = Category::whereSlug($request->category)->first();
$form->category_id = $category->id;
@@ -88,7 +88,7 @@ public function create(Request $request)
return $form->save();
} catch (\Illuminate\Database\QueryException $e) {
$errorCode = $e->errorInfo[1];
- if ($errorCode == 1062) {
+ if ($errorCode === 1062) {
return response()->json([
'message' => 'Form with the same name already exists',
], 409);
diff --git a/src/Http/Controllers/InfoController.php b/src/Http/Controllers/InfoController.php
index a4af9dc1..4156ad47 100644
--- a/src/Http/Controllers/InfoController.php
+++ b/src/Http/Controllers/InfoController.php
@@ -118,11 +118,9 @@ private function filterRights(array $menuItems): array
if (isset($menuitem->submenu) && count($menuitem->submenu) > 0) {
$submenu = $this->filterRights($menuitem->submenu);
if (count($submenu) > 0) {
-
$menuitem->submenu = $submenu;
$menu[] = $menuitem;
}
-
} else {
// No submenu, so we'll add it directly to the menu.
$menu[] = $menuitem;
@@ -151,8 +149,7 @@ private function menuFromDatabase()
$orderedMenu = [];
foreach ($menus as $menuitem) {
-
- if ($menuitem->to == null) {
+ if ($menuitem->to === null) {
if (str_starts_with($menuitem->target, 'table-') || str_starts_with($menuitem->target, '#table-')) {
$this->convertToToTable($menuitem);
} elseif (str_starts_with($menuitem->target, 'menu.php') || str_starts_with($menuitem->target, '#menu.php')) {
@@ -207,7 +204,7 @@ private function preferences()
}
/* TODO: Remove or move these conversion methods */
- private function convertToToTable($menuitem)
+ private function convertToToTable($menuitem): void
{
$newStr = str_replace('#', '', $menuitem->target);
$newStr = str_replace('-', '/', $newStr);
@@ -216,7 +213,7 @@ private function convertToToTable($menuitem)
$menuitem->save();
}
- private function convertToToMenu($menuitem)
+ private function convertToToMenu($menuitem): void
{
$newStr = str_replace('#', '', $menuitem->target);
$newStr = str_replace('menu.php', 'menu', $newStr);
diff --git a/src/Http/Controllers/MenuController.php b/src/Http/Controllers/MenuController.php
index 9ecb5a1b..917c7902 100644
--- a/src/Http/Controllers/MenuController.php
+++ b/src/Http/Controllers/MenuController.php
@@ -144,7 +144,7 @@ private function getTableWidget(Menu $currentMenu, Lang $lang): LayoutWidget
{
$menuItems = Menu::whereParentId($currentMenu->id)
->with(['template'])
- ->leftJoin('strings', function ($join) use ($lang) {
+ ->leftJoin('strings', function ($join) use ($lang): void {
$join->on('strings.string_id', '=', 'menu.id');
$join->where('strings.lang_id', '=', $lang->id);
$join->where('strings.table', '=', 'menu');
@@ -191,7 +191,7 @@ private function getTableWidget(Menu $currentMenu, Lang $lang): LayoutWidget
private function getFormWidget(Menu $currentMenu): ?LayoutWidget
{
- if (! isset($currentMenu->template?->allow_children) || $currentMenu->template?->allow_children == '') {
+ if (! isset($currentMenu->template?->allow_children) || $currentMenu->template?->allow_children === '') {
return null;
}
@@ -227,7 +227,7 @@ private function getBreadcrumb(Menu $menu): LayoutBreadcrumb
$collection = new Collection();
while ($menu !== null) {
$collection->add($menu);
- if ($menu->parent_id == null || $menu->parent_id == 0) {
+ if ($menu->parent_id === null || $menu->parent_id === 0) {
$menu = null;
} else {
$menu = Menu::whereId($menu->parent_id)->first();
diff --git a/src/Http/Controllers/Pages/AbstractPageController.php b/src/Http/Controllers/Pages/AbstractPageController.php
index 4b74272b..ad5029a8 100644
--- a/src/Http/Controllers/Pages/AbstractPageController.php
+++ b/src/Http/Controllers/Pages/AbstractPageController.php
@@ -4,12 +4,12 @@
abstract class AbstractPageController extends PageController
{
- abstract protected function getViewName(): string;
-
public function __invoke()
{
$viewName = $this->getViewName();
return view($viewName);
}
+
+ abstract protected function getViewName(): string;
}
diff --git a/src/Http/Helpers.php b/src/Http/Helpers.php
index b2d1d109..9d45c398 100644
--- a/src/Http/Helpers.php
+++ b/src/Http/Helpers.php
@@ -3,7 +3,7 @@
use Illuminate\Support\Facades\DB;
if (! function_exists('db_table_items_change_order')) {
- function db_table_items_change_order(string $tableName, int $recordId, int $replacedRecordId, string $whereSql = '')
+ function db_table_items_change_order(string $tableName, int $recordId, int $replacedRecordId, string $whereSql = ''): void
{
trigger_error('Method '.__METHOD__.' is deprecated', E_USER_DEPRECATED);
$movedRecord = DB::table($tableName)->where('id', $recordId)->first();
@@ -47,15 +47,14 @@ function db_table_items_change_order(string $tableName, int $recordId, int $repl
if (! function_exists('make_directories')) {
/**
- * @param mixed $root The root folder for the path, we'll not go higher than this.
- * @param mixed $dir The path from the root folder
+ * @param string $root The root folder for the path, we'll not go higher than this.
+ * @param string $dir The path from the root folder
* @return bool true if the directory was created or already existed.
*/
- function make_directories($root, $dir): bool
+ function make_directories(string $root, string $dir): bool
{
trigger_error('Method '.__METHOD__.' is deprecated', E_USER_DEPRECATED);
return \Sb::makeDirectory($root, $dir);
-
}
}
diff --git a/src/Models/Lang.php b/src/Models/Lang.php
index 35e8b957..1289d93f 100644
--- a/src/Models/Lang.php
+++ b/src/Models/Lang.php
@@ -32,14 +32,14 @@
*/
class Lang extends Model
{
- protected $table = 'lang';
-
public static $default = null;
public static $current = null;
public $timestamps = false;
+ protected $table = 'lang';
+
protected $fillable = [
'id',
'language',
diff --git a/src/Models/Menu.php b/src/Models/Menu.php
index 09d3f7c5..08ac76de 100644
--- a/src/Models/Menu.php
+++ b/src/Models/Menu.php
@@ -57,10 +57,10 @@
*/
class Menu extends LegacyModel
{
- protected $table = 'menu';
-
public $timestamps = true;
+ protected $table = 'menu';
+
protected $casts = [
'properties' => 'object',
'enabled' => 'boolean',
@@ -145,9 +145,9 @@ public function getTitle(?Lang $lang = null): ?string
if (isset($title)) {
return $title->value;
- } else {
- return null;
}
+
+ return null;
}
public function strings(int $langId)
@@ -157,9 +157,8 @@ public function strings(int $langId)
->whereTable(TemplateType::TEMPLATE);
}
- public static function removeRouteCache()
+ public static function removeRouteCache(): void
{
- // TODO: less brute force
Cache::clear();
}
diff --git a/src/Models/TemplateItem.php b/src/Models/TemplateItem.php
index b654f921..28a50316 100644
--- a/src/Models/TemplateItem.php
+++ b/src/Models/TemplateItem.php
@@ -91,7 +91,7 @@ public function template()
public function string()
{
- return $this->hasOne(Strings::class, 'name', 'internal')->ofMany([], function (Builder $query) {
+ return $this->hasOne(Strings::class, 'name', 'internal')->ofMany([], function (Builder $query): void {
$query->where('lang_id', Lang::current()->id);
$query->orWhere('lang_id', 0);
});
diff --git a/src/Services/Assets/Components/ComponentNumber.php b/src/Services/Assets/Components/ComponentNumber.php
index cfad8f49..b13198f0 100644
--- a/src/Services/Assets/Components/ComponentNumber.php
+++ b/src/Services/Assets/Components/ComponentNumber.php
@@ -9,9 +9,7 @@ class ComponentNumber extends AbstractComponent
{
public function getAutoLayoutClass(): ?AbstractLayout
{
- $inputText = new LayoutInputNumber($this->assetItem->internal, $this->assetItem->name);
-
- return $inputText;
+ return new LayoutInputNumber($this->assetItem->internal, $this->assetItem->name);
}
public function validate($newValue): bool
diff --git a/src/Services/Assets/Components/ComponentStaticValue.php b/src/Services/Assets/Components/ComponentStaticValue.php
index 90e487aa..c8b1e619 100644
--- a/src/Services/Assets/Components/ComponentStaticValue.php
+++ b/src/Services/Assets/Components/ComponentStaticValue.php
@@ -24,7 +24,7 @@ public function validate($newValue): bool
return true;
}
- public function setStaticValue($value)
+ public function setStaticValue($value): void
{
$this->staticValue = $value;
}
diff --git a/src/Services/Assets/TableService.php b/src/Services/Assets/TableService.php
index 73ae423f..4f32681c 100644
--- a/src/Services/Assets/TableService.php
+++ b/src/Services/Assets/TableService.php
@@ -116,6 +116,11 @@ protected function updateModel(bool $new = false): int
return $id;
}
+ protected function getCacheKey(): string
+ {
+ return 'table_'.$this->table->slug.'_'.$this->recordId.'_'.$this->lang->url;
+ }
+
private function upsertNonLocalizedModel(bool $new): int
{
$record = [];
@@ -185,9 +190,4 @@ private function setCurrentValues(): void
return $component;
});
}
-
- protected function getCacheKey(): string
- {
- return 'table_'.$this->table->slug.'_'.$this->recordId.'_'.$this->lang->url;
- }
}
diff --git a/src/View/Components/Forms/Fields/File.php b/src/View/Components/Forms/Fields/File.php
index 251a36dc..d3e0d0c0 100644
--- a/src/View/Components/Forms/Fields/File.php
+++ b/src/View/Components/Forms/Fields/File.php
@@ -15,7 +15,7 @@ public function filetypes(): string
public function multiple(): string
{
- if ($this->property('multiple') != null) {
+ if ($this->property('multiple') !== null) {
return 'multiple';
}