build: moved private API controller in another folder, fixed code formatting in tests

Author: thorsten

phpmyfaq/.htaccess

@@ -109,7 +109,7 @@ Header set Access-Control-Allow-Headers "Content-Type, Authorization"
     RewriteRule ^add-question.html$ index.php?action=ask [L,QSA]
     RewriteRule ^show-categories.html$ index.php?action=show [L,QSA]
     RewriteRule ^forgot-password$ index.php?action=password [L,QSA]
-    RewriteRule ^(search|open-questions|glossary|overview|login|privacy)\.html$ index.php?action=$1 [L,QSA]
+    RewriteRule ^(search|open-questions|glossary|overview|login|privacy|contact)\.html$ index.php?action=$1 [L,QSA]
     RewriteRule ^(login) index.php?action=login [L,QSA]
     # start page
     RewriteRule ^index.html$ index.php [L,QSA]
@@ -162,5 +162,6 @@ Header set Access-Control-Allow-Headers "Content-Type, Authorization"
     RewriteCond %{REQUEST_URI} ^(.*/)setup/
     RewriteCond %{REQUEST_URI} !index\.php$
     RewriteRule ^(.*/)?setup/(.*) $1setup/index.php [L,QSA]
-    RewriteRule ^update/(.*) update/index.php [L,QSA]
+    RewriteRule ^update$ update/ [R=301,L]
+    RewriteRule ^update/(.*) index.php [L,QSA]
 </IfModule>

phpmyfaq/index.php

@@ -23,7 +23,6 @@
 use phpMyFAQ\Attachment\AttachmentFactory;
 use phpMyFAQ\Category;
 use phpMyFAQ\Category\Relation;
-use phpMyFAQ\Controller\PageNotFoundController;
 use phpMyFAQ\Core\Exception;
 use phpMyFAQ\Entity\SeoEntity;
 use phpMyFAQ\Enums\PermissionType;
@@ -148,7 +147,7 @@
 
     // Send response and exit
     $routeResponse->send();
-    exit;
+    exit();
 } catch (ResourceNotFoundException $e) {
     // No route matched - continue with legacy logic below
 }
@@ -585,10 +584,7 @@
     'msgSubmit' => Translation::get(key: 'msgNewContentSubmit'),
     'loginPageMessage' => Translation::get(key: 'loginPageMessage'),
     'msgAdvancedSearch' => Translation::get(key: 'msgAdvancedSearch'),
-    'currentYear' => date(
-        format: 'Y',
-        timestamp: time(),
-    ),
+    'currentYear' => date(format: 'Y', timestamp: time()),
     'cookieConsentEnabled' => $faqConfig->get('layout.enableCookieConsent'),
 ];
 
@@ -650,19 +646,15 @@
     'msgPrivacyNote' => Translation::get(key: 'msgPrivacyNote'),
     'isCookieConsentEnabled' => $faqConfig->get('layout.enableCookieConsent'),
     'cookiePreferences' => Translation::get(key: 'cookiePreferences'),
-    'currentYear' => date(
-        format: 'Y',
-        timestamp: time(),
-    ),
+    'currentYear' => date(format: 'Y', timestamp: time()),
 ];
 
 //
 // Show the login box or logged-in user information
 //
 if ($user->isLoggedIn() && $user->getUserId() > 0) {
     if (
-        $user->perm->hasPermission($user->getUserId(), PermissionType::VIEW_ADMIN_LINK->value)
-        || $user->isSuperAdmin()
+        $user->perm->hasPermission($user->getUserId(), PermissionType::VIEW_ADMIN_LINK->value) || $user->isSuperAdmin()
     ) {
         $templateVars = [
             ...$templateVars,
@@ -688,10 +680,10 @@
 // Handle 404 action with PageNotFoundController
 //
 if ('404' === $action) {
-    $pageNotFoundController = new \phpMyFAQ\Controller\PageNotFoundController();
+    $pageNotFoundController = new \phpMyFAQ\Controller\Frontend\PageNotFoundController();
     $notFoundResponse = $pageNotFoundController->index($request);
     $notFoundResponse->send();
-    exit;
+    exit();
 }
 
 //

phpmyfaq/setup/index.php

@@ -25,7 +25,7 @@
 
 use Composer\Autoload\ClassLoader;
 use phpMyFAQ\Application;
-use phpMyFAQ\Controller\Frontend\SetupController;
+use phpMyFAQ\Controller\Frontend\Api\SetupController;
 use phpMyFAQ\Environment;
 use phpMyFAQ\Strings;
 use phpMyFAQ\Translation;

phpmyfaq/src/Bootstrap.php

@@ -25,8 +25,8 @@
 use phpMyFAQ\Configuration\ElasticsearchConfiguration;
 use phpMyFAQ\Configuration\LdapConfiguration;
 use phpMyFAQ\Configuration\OpenSearchConfiguration;
-use phpMyFAQ\Database;
 use phpMyFAQ\Core\Exception;
+use phpMyFAQ\Database;
 use phpMyFAQ\Environment;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -40,7 +40,7 @@
 $foundCurrPath = false;
 $includePaths = explode(PATH_SEPARATOR, ini_get('include_path'));
 $i = 0;
-while ((!$foundCurrPath) && ($i < count($includePaths))) {
+while (!$foundCurrPath && $i < count($includePaths)) {
     if ('.' == $includePaths[$i]) {
         $foundCurrPath = true;
     }
@@ -100,7 +100,7 @@
     if (!$isSetupContext) {
         $response = new RedirectResponse('/setup/');
         $response->send();
-        exit;
+        exit();
     }
 } else {
     if (file_exists(PMF_CONFIG_DIR . '/database.php')) {
@@ -152,7 +152,7 @@
         $dbConfig->getUser(),
         $dbConfig->getPassword(),
         $dbConfig->getDatabase(),
-        $dbConfig->getPort()
+        $dbConfig->getPort(),
     );
 } catch (Exception $exception) {
     Database::errorPage($exception->getMessage());
@@ -210,7 +210,7 @@
     // Optional: wait for Elasticsearch to be ready (HTTP health)
     try {
         $http = HttpClient::create(['verify_peer' => false]);
-        $deadline = time() + (int)($_ENV['SEARCH_WAIT_TIMEOUT'] ?? 15);
+        $deadline = time() + (int) ($_ENV['SEARCH_WAIT_TIMEOUT'] ?? 15);
         do {
             try {
                 $res = $http->request('GET', rtrim($esBaseUri, '/') . '/_cluster/health');
@@ -247,7 +247,7 @@
     // Optional: wait for OpenSearch to be ready (HTTP health)
     try {
         $http = HttpClient::create(['verify_peer' => false]);
-        $deadline = time() + (int)($_ENV['SEARCH_WAIT_TIMEOUT'] ?? 15);
+        $deadline = time() + (int) ($_ENV['SEARCH_WAIT_TIMEOUT'] ?? 15);
         do {
             try {
                 $res = $http->request('GET', rtrim($baseUri, '/') . '/_cluster/health');