fix: corrected 404 handling (#3834)

Author: thorsten

docs/installation.md

@@ -32,6 +32,7 @@ You can use phpMyFAQ with the following web servers:
 - [Apache](http://www.apache.org) 2.4 or later (with mod_rewrite) and mod_ssl (if you wish to run phpMyFAQ under SSL)
 - [Nginx](http://www.nginx.org) 1.0 or later (with URL rewriting) and SSL support
 - [FrankenPHP](https://frankenphp.dev) 1.0 or later (modern PHP application server built on Caddy)
+- [IIS](http://www.iis.net) 7.0 or later (with URL rewriting) and SSL support
 
 #### Apache requirements
 

phpmyfaq/admin/api/index.php

@@ -37,6 +37,7 @@
 $routes = include PMF_SRC_DIR  . '/admin-api-routes.php';
 
 $app = new Application($container);
+$app->setApiContext(true);
 try {
     $app->run($routes);
 } catch (Exception $exception) {

phpmyfaq/api/index.php

@@ -36,6 +36,7 @@
 $routes = include PMF_SRC_DIR . '/api-routes.php';
 
 $app = new Application($container);
+$app->setApiContext(true);
 try {
     $app->run($routes);
 } catch (Exception $exception) {

phpmyfaq/src/phpMyFAQ/Application.php

@@ -41,6 +41,8 @@ class Application
 
     private ControllerResolver $controllerResolver;
 
+    private bool $isApiContext = false;
+
     public function __construct(
         private readonly ?ContainerInterface $container = null,
     ) {
@@ -70,6 +72,11 @@ public function setControllerResolver(ControllerResolver $controllerResolver): v
         $this->controllerResolver = $controllerResolver;
     }
 
+    public function setApiContext(bool $isApiContext): void
+    {
+        $this->isApiContext = $isApiContext;
+    }
+
     private function setLanguage(): string
     {
         if (!is_null($this->container)) {
@@ -132,14 +139,37 @@ private function handleRequest(
             $response->setStatusCode(Response::HTTP_OK);
             $response = call_user_func_array($controller, $arguments);
         } catch (ResourceNotFoundException $exception) {
-            $message = Environment::isDebugMode()
-                ? $this->formatExceptionMessage(
-                    template: 'Not Found: :message at line :line at :file',
-                    exception: $exception,
-                )
-                : 'Not Found';
-
-            $response = new Response(content: $message, status: Response::HTTP_NOT_FOUND);
+            // For API requests, return simple text/JSON response
+            if ($this->isApiContext) {
+                $message = Environment::isDebugMode()
+                    ? $this->formatExceptionMessage(
+                        template: 'Not Found: :message at line :line at :file',
+                        exception: $exception,
+                    )
+                    : 'Not Found';
+                $response = new Response(content: $message, status: Response::HTTP_NOT_FOUND);
+            } else {
+                // For web requests, forward to the PageNotFoundController
+                try {
+                    $request->attributes->set('_route', 'public.404');
+                    $request->attributes->set(
+                        '_controller',
+                        'phpMyFAQ\Controller\Frontend\PageNotFoundController::index',
+                    );
+                    $controller = $this->controllerResolver->getController($request);
+                    $arguments = $argumentResolver->getArguments($request, $controller);
+                    $response = call_user_func_array($controller, $arguments);
+                } catch (Throwable $e) {
+                    // Fallback if the controller fails
+                    $message = Environment::isDebugMode()
+                        ? $this->formatExceptionMessage(
+                            template: 'Not Found: :message at line :line at :file',
+                            exception: $exception,
+                        )
+                        : 'Not Found';
+                    $response = new Response(content: $message, status: Response::HTTP_NOT_FOUND);
+                }
+            }
         } catch (UnauthorizedHttpException) {
             $response = new RedirectResponse(url: './login');
             if (str_contains(haystack: $urlMatcher->getContext()->getBaseUrl(), needle: '/api')) {
@@ -211,7 +241,7 @@ private function handleRequest(
      */
     private function formatExceptionMessage(string $template, Throwable $exception): string
     {
-        return strtr(string: $template, from: [
+        return strtr($template, [
             ':message' => $exception->getMessage(),
             ':line' => (string) $exception->getLine(),
             ':file' => $exception->getFile(),