Skip to content
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"xenolope/quahog": "^3.0",
"firebase/php-jwt": "^6.3",
"intervention/image": "^3.0",
"doctrine/dbal": "^3.6"
"doctrine/dbal": "^4.0"
},
"require-dev": {
"laravel/pint": "^1.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Controllers/Support/SupportController.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function update(FormDataRequest $request)
'body' => '<h3>Aanvraag '.env('APP_NAME', 'SiteBoss support form').'</h3><p>'.nl2br(htmlentities($request->input('description'))).'</p><hr/>'.$message,
'email' => $request->input('email'),
'subject' => $request->input('subject'),
'api_key' => config('support.api_key')
'api_key' => config('support.api_key'),
]);
$url = config('support.endpoint');
$ch = curl_init($url);
Expand Down
20 changes: 18 additions & 2 deletions src/Services/PageRouterService.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ public function create()
[
'prefix' => LaravelLocalization::setLocale(),
'middleware' => [LaravelLocalizationViewPath::class],
], function () use ($routes) {
],
function () use ($routes) {
PageRedirectService::getRoutes();
$this->setRouteList($routes);
}
Expand Down Expand Up @@ -97,7 +98,7 @@ private function getControllerClassName(Menu $page): string|false
return false;
}

$pageClassName = sprintf('App\\Http\\Controllers\\Page\\%sController', ucfirst($page->template->controller ?? $page->template->filename));
$pageClassName = sprintf('App\\Http\\Controllers\\Page\\%sController', ucfirst($page->template->controller ?? $this->transformFilename($page->template->filename)));

if (class_exists($pageClassName)) {
return $pageClassName;
Expand All @@ -112,6 +113,21 @@ private function getControllerClassName(Menu $page): string|false
return false;
}

private function transformFilename(string $filename): string
{
if (substr($filename, -4, 4) === 'page') {
$filename = substr($filename, 0, -4);
$filename .= 'Page';
}
$filenameParts = preg_split('/[\/-]/', $filename);
$cappedParts = [];
foreach ($filenameParts as $key => $part) {
$cappedParts[] = ucfirst($part);
}

return implode('\\', $cappedParts);
}

private function cliError($message): void
{
if (! $this->output) {
Expand Down
Loading