fix: corrected ErrorDocument handling

Author: thorsten

phpmyfaq/.htaccess

@@ -101,7 +101,7 @@ Header set Access-Control-Allow-Headers "Content-Type, Authorization"
     # Exclude assets from being handled by Symfony Router
     RewriteRule ^(admin/assets)($|/) - [L]
     # Error pages
-    ErrorDocument 404 index.php?action=404
+    ErrorDocument 404 /index.php?action=404
     # General pages
     RewriteRule ^add-faq.html$ index.php?action=add [L,QSA]
     RewriteRule ^add-question.html$ index.php?action=ask [L,QSA]

phpmyfaq/src/phpMyFAQ/Setup/EnvironmentConfigurator.php

@@ -102,10 +102,16 @@ public function adjustRewriteBaseHtaccess(): bool
         }
 
         // Adjust ErrorDocument 404
-        $errorDocument404 = $htaccess->search('ErrorDocument 404', TOKEN_DIRECTIVE);
+        $errorDocument404 = $htaccess->search('ErrorDocument', TOKEN_DIRECTIVE);
         if ($errorDocument404) {
+            // Get current arguments and clear them
+            $currentArgs = $errorDocument404->getArguments();
+            foreach ($currentArgs as $arg) {
+                $errorDocument404->removeArgument($arg);
+            }
+            // Set new arguments: error code and path
             $new404Path = rtrim($this->getServerPath(), '/') . '/index.php?action=404';
-            $errorDocument404->setArguments([(string) $new404Path]);
+            $errorDocument404->setArguments(['404', $new404Path]);
         }
 
         $output = (string) $htaccess;

tests/phpMyFAQ/Setup/EnvironmentConfiguratorTest.php

@@ -87,4 +87,60 @@ public function testAdjustRewriteBaseHtaccess(): void
         $this->assertTrue($configurator->adjustRewriteBaseHtaccess());
         $this->assertEquals('/path/info', $configurator->getRewriteBase());
     }
+
+    /**
+     * @throws Exception
+     * @throws \PHPUnit\Framework\MockObject\Exception
+     */
+    public function testAdjustRewriteBaseHtaccessUpdatesErrorDocumentWithRootPath(): void
+    {
+        // Set up a proper .htaccess file with ErrorDocument directive
+        $htaccessPath = dirname(__DIR__, 2) . '/.htaccess';
+        $htaccessContent = <<<'HTACCESS'
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteBase /phpmyfaq-test/
+    ErrorDocument 404 /phpmyfaq-test/index.php?action=404
+</IfModule>
+HTACCESS;
+        file_put_contents($htaccessPath, $htaccessContent);
+
+        $configuration = $this->createStub(Configuration::class);
+        $configuration->method('getRootPath')->willReturn(dirname(__DIR__, 2));
+        $configuration->method('getDefaultUrl')->willReturn('https://localhost/');
+        $configurator = new EnvironmentConfigurator($configuration);
+        $this->assertTrue($configurator->adjustRewriteBaseHtaccess());
+
+        // Read the .htaccess file and verify ErrorDocument 404 is set correctly
+        $htaccessContent = file_get_contents($htaccessPath);
+        $this->assertStringContainsString('ErrorDocument 404 /index.php?action=404', $htaccessContent);
+    }
+
+    /**
+     * @throws Exception
+     * @throws \PHPUnit\Framework\MockObject\Exception
+     */
+    public function testAdjustRewriteBaseHtaccessUpdatesErrorDocumentWithSubdirectoryPath(): void
+    {
+        // Set up a proper .htaccess file with ErrorDocument directive
+        $htaccessPath = dirname(__DIR__, 2) . '/.htaccess';
+        $htaccessContent = <<<'HTACCESS'
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteBase /
+    ErrorDocument 404 /index.php?action=404
+</IfModule>
+HTACCESS;
+        file_put_contents($htaccessPath, $htaccessContent);
+
+        $configuration = $this->createStub(Configuration::class);
+        $configuration->method('getRootPath')->willReturn(dirname(__DIR__, 2));
+        $configuration->method('getDefaultUrl')->willReturn('https://localhost/faq/');
+        $configurator = new EnvironmentConfigurator($configuration);
+        $this->assertTrue($configurator->adjustRewriteBaseHtaccess());
+
+        // Read the .htaccess file and verify ErrorDocument 404 is set correctly
+        $htaccessContent = file_get_contents($htaccessPath);
+        $this->assertStringContainsString('ErrorDocument 404 /faq/index.php?action=404', $htaccessContent);
+    }
 }