Merge branch '4.1' into 'main'

Author: thorsten

.docker/apache/Dockerfile

@@ -6,7 +6,7 @@
 #####################################
 #=== Unique stage without payload ===
 #####################################
-FROM php:8.4.5RC1-apache
+FROM php:8.4-apache
 
 #=== Install gd PHP dependencie ===
 RUN set -x \
@@ -58,7 +58,7 @@ RUN set -ex \
  && rm -rf /var/lib/apt/lists/*
 
 #=== Install xdebug PHP dependencies ===
-RUN pecl install xdebug-3.4.2  \
+RUN pecl install xdebug-3.5.0  \
 && docker-php-ext-enable xdebug
 
 #=== php default ===

.docker/php-fpm/Dockerfile

@@ -6,7 +6,7 @@
 #####################################
 #=== Unique stage without payload ===
 #####################################
-FROM php:8.4.5RC1-fpm
+FROM php:8.4-fpm
 
 #=== Install gd PHP dependencies ===
 RUN set -x \
@@ -58,7 +58,7 @@ RUN set -ex \
  && rm -rf /var/lib/apt/lists/*
 
 #=== Install xdebug PHP dependencies ===
-RUN pecl install xdebug-3.4.2 \
+RUN pecl install xdebug-3.5.0 \
 && docker-php-ext-enable xdebug
 
 #=== php default ===

CHANGELOG.md

@@ -10,9 +10,8 @@ This is a log of major user-visible changes in each phpMyFAQ release.
 
 - changed PHP requirement to PHP 8.4 or later (Thorsten)
 
-### phpMyFAQ v4.1.0-RC - 2025-12-29
+### phpMyFAQ v4.1.0-RC.2 - unreleased
 
-- fixed security vulnerabilities (Thorsten)
 - changed PHP requirement to PHP 8.3 or later (Thorsten)
 - added configuration to edit robots.txt (Thorsten)
 - added configuration to edit llms.txt (Thorsten)
@@ -55,13 +54,25 @@ This is a log of major user-visible changes in each phpMyFAQ release.
 - updated Basque translation
 - updated Bengali translation
 - updated Bosnian translation
+- updated Ukrainian translation
+- updated Czech translation
+- updated Welsh translation
+- updated Danish translation
+- updated Greek translation
+- updated Farsi translation
+- updated Canadian French translation
+- updated Hebrew translation
 - updated to PHPUnit v12 (Thorsten)
 - migrated codebase to use PHP 8.3 language features (Thorsten)
 - migrated from WYSIWYG editor from TinyMCE to Jodit Editor (Thorsten)
 - migrated from JavaScript to TypeScript (Thorsten)
 - migrated from Webpack to Vite v7 (Thorsten)
 - migrated from Jest to Vitest v4 (Thorsten)
 
+### phpMyFAQ v4.0.17 - unreleased
+
+- updated third party dependencies (Thorsten)
+
 ### phpMyFAQ v4.0.16 - 2025-12-29
 
 - fixed security vulnerabilities (Thorsten)

phpmyfaq/assets/templates/admin/configuration/plugins.twig

@@ -36,7 +36,38 @@
       </tbody>
     </table>
 
-    <p>
+    {% if incompatiblePlugins is not empty %}
+    <div class="alert alert-warning mt-4" role="alert">
+      <h5 class="alert-heading">
+        <i aria-hidden="true" class="bi bi-exclamation-triangle-fill"></i>
+        {{ 'msgIncompatiblePlugins' | translate }}
+      </h5>
+      <p>{{ 'msgIncompatiblePluginsInfo' | translate }}</p>
+    </div>
+
+      <table class="table table-striped">
+      <thead>
+        <tr>
+          <th>{{ 'msgPluginName' | translate }}</th>
+          <th>{{ 'msgPluginVersion' | translate }}</th>
+          <th>{{ 'msgPluginAuthor' | translate }}</th>
+          <th>{{ 'msgPluginReason' | translate }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for name, info in incompatiblePlugins %}
+        <tr>
+          <td>{{ info.plugin.name }}</td>
+          <td>{{ info.plugin.version }}</td>
+          <td>{{ info.plugin.author }}</td>
+          <td><small class="text-danger">{{ info.reason }}</small></td>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+    {% endif %}
+
+    <p class="mt-3">
       <a target="_blank" href="https://phpmyfaq.readthedocs.io/en/main/plugins/">
         {{ 'msgDocumentation' | translate }}
       </a>

phpmyfaq/src/phpMyFAQ/Controller/Administration/GroupController.php

@@ -92,12 +92,12 @@ public function create(Request $request): Response
 
         $user = $this->container->get(id: 'phpmyfaq.user');
 
-        $groupName = Filter::filterVar($request->attributes->get('group_name'), FILTER_SANITIZE_SPECIAL_CHARS);
+        $groupName = Filter::filterVar($request->request->get('group_name'), FILTER_SANITIZE_SPECIAL_CHARS);
         $groupDescription = Filter::filterVar(
-            $request->attributes->get('group_description'),
+            $request->request->get('group_description'),
             FILTER_SANITIZE_SPECIAL_CHARS,
         );
-        $groupAutoJoin = Filter::filterVar($request->attributes->get('group_auto_join'), FILTER_SANITIZE_SPECIAL_CHARS);
+        $groupAutoJoin = Filter::filterVar($request->request->get('group_auto_join'), FILTER_SANITIZE_SPECIAL_CHARS);
 
         // check group name
         if ($groupName === '') {
@@ -137,7 +137,7 @@ public function confirm(Request $request): Response
 
         $session = $this->container->get(id: 'session');
 
-        $groupId = (int) Filter::filterVar($request->attributes->get('group_list_select'), FILTER_VALIDATE_INT);
+        $groupId = (int) Filter::filterVar($request->request->get('group_list_select'), FILTER_VALIDATE_INT);
         $groupData = $this->currentUser->perm->getGroupData($groupId);
 
         $this->addExtension(new AttributeExtension(PermissionTranslationTwigExtension::class));
@@ -159,8 +159,8 @@ public function delete(Request $request): Response
     {
         $this->userHasPermission(PermissionType::GROUP_DELETE);
 
-        $groupId = (int) Filter::filterVar($request->attributes->get('group_id'), FILTER_VALIDATE_INT);
-        $csrfToken = Filter::filterVar($request->attributes->get('pmf-csrf-token'), FILTER_SANITIZE_SPECIAL_CHARS);
+        $groupId = (int) Filter::filterVar($request->request->get('group_id'), FILTER_VALIDATE_INT);
+        $csrfToken = Filter::filterVar($request->request->get('pmf-csrf-token'), FILTER_SANITIZE_SPECIAL_CHARS);
 
         if (!Token::getInstance($this->container->get(id: 'session'))->verifyToken('delete-group', $csrfToken)) {
             throw new UnauthorizedHttpException('Invalid CSRF token');
@@ -194,13 +194,13 @@ public function update(Request $request): Response
     {
         $this->userHasPermission(PermissionType::GROUP_EDIT);
 
-        $groupId = (int) Filter::filterVar($request->attributes->get('group_id'), FILTER_VALIDATE_INT);
+        $groupId = (int) Filter::filterVar($request->request->get('group_id'), FILTER_VALIDATE_INT);
 
         $groupData = [];
         $dataFields = ['name', 'description', 'auto_join'];
         foreach ($dataFields as $dataField) {
             $groupData[$dataField] = Filter::filterVar(
-                $request->attributes->get($dataField),
+                $request->request->get($dataField),
                 FILTER_SANITIZE_SPECIAL_CHARS,
                 '',
             );
@@ -242,7 +242,7 @@ public function updateMembers(Request $request): Response
     {
         $this->userHasPermission(PermissionType::GROUP_EDIT);
 
-        $groupId = (int) Filter::filterVar($request->attributes->get('group_id'), FILTER_VALIDATE_INT);
+        $groupId = (int) Filter::filterVar($request->request->get('group_id'), FILTER_VALIDATE_INT);
         $groupMembers = $request->request->all()['group_members'];
 
         $user = $this->container->get(id: 'phpmyfaq.user');
@@ -280,7 +280,7 @@ public function updatePermissions(Request $request): Response
     {
         $this->userHasPermission(PermissionType::GROUP_EDIT);
 
-        $groupId = (int) Filter::filterVar($request->attributes->get('group_id'), FILTER_VALIDATE_INT);
+        $groupId = (int) Filter::filterVar($request->request->get('group_id'), FILTER_VALIDATE_INT);
         $groupPermissions = $request->request->all()['group_rights'];
 
         $user = $this->container->get(id: 'phpmyfaq.user');

phpmyfaq/src/phpMyFAQ/Controller/Administration/PluginController.php

@@ -20,7 +20,6 @@
 namespace phpMyFAQ\Controller\Administration;
 
 use phpMyFAQ\Core\Exception;
-use phpMyFAQ\Plugin\PluginException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
@@ -29,7 +28,6 @@
 final class PluginController extends AbstractAdministrationController
 {
     /**
-     * @throws PluginException
      * @throws LoaderError
      * @throws Exception
      * @throws \Exception
@@ -44,6 +42,7 @@ public function index(Request $request): Response
             ...$this->getHeader($request),
             ...$this->getFooter(),
             'pluginList' => $pluginManager->getPlugins(),
+            'incompatiblePlugins' => $pluginManager->getIncompatiblePlugins(),
         ]);
     }
 }

phpmyfaq/src/phpMyFAQ/Plugin/PluginManager.php

@@ -41,7 +41,10 @@ class PluginManager
     /** @var string[] */
     private array $loadedPlugins = [];
 
-    /** @var array<string, string[]> Plugin stylesheets: [pluginName => [css paths]] */
+    /** @var array<string, array{plugin: PluginInterface, reason: string}> */
+    private array $incompatiblePlugins = [];
+
+    /** @var array<string, string[]> Plugin stylesheets: [pluginName => [CSS paths]] */
     private array $pluginStylesheets = [];
 
     /** @var array<string, string[]> Plugin scripts: [pluginName => [js paths]] */
@@ -57,7 +60,6 @@ public function __construct()
 
     /**
      * Registers a plugin
-     * @throws PluginException
      */
     public function registerPlugin(string $pluginClass): void
     {
@@ -66,13 +68,20 @@ public function registerPlugin(string $pluginClass): void
             $this->plugins[$plugin->getName()] = $plugin;
             $this->containerBuilder->register($plugin->getName(), $pluginClass);
         } else {
-            throw new PluginException(sprintf('Plugin %s is not compatible.', $plugin->getName()));
+            $this->incompatiblePlugins[$plugin->getName()] = [
+                'plugin' => $plugin,
+                'reason' => sprintf(
+                    'Plugin version %s is not compatible with system version %s',
+                    $plugin->getVersion(),
+                    System::getPluginVersion(),
+                ),
+            ];
         }
     }
 
     /**
      * Loads and registers all plugins
-     * @throws PluginException|Exception
+     * @throws Exception
      */
     public function loadPlugins(): void
     {
@@ -121,7 +130,13 @@ public function loadPlugins(): void
                     $this->registerPluginScripts($plugin->getName(), $scripts);
                 }
             } else {
-                throw new PluginException(sprintf('Dependencies for plugin %s are not met.', $plugin->getName()));
+                $missingDeps = $this->getMissingDependencies($plugin);
+                $this->incompatiblePlugins[$plugin->getName()] = [
+                    'plugin' => $plugin,
+                    'reason' => sprintf('Missing dependencies: %s', implode(', ', $missingDeps)),
+                ];
+                // Remove plugin from the plugins array since it's incompatible
+                unset($this->plugins[$plugin->getName()]);
             }
         }
     }
@@ -319,4 +334,31 @@ public function getPluginScripts(string $pluginName): array
     {
         return $this->pluginScripts[$pluginName] ?? [];
     }
+
+    /**
+     * Returns all incompatible plugins with their reasons
+     *
+     * @return array<string, array{plugin: PluginInterface, reason: string}>
+     */
+    public function getIncompatiblePlugins(): array
+    {
+        return $this->incompatiblePlugins;
+    }
+
+    /**
+     * Gets the missing dependencies for a plugin
+     *
+     * @return string[]
+     */
+    private function getMissingDependencies(PluginInterface $plugin): array
+    {
+        $missingDeps = [];
+        foreach ($plugin->getDependencies() as $dependency) {
+            if (!in_array($dependency, $this->loadedPlugins)) {
+                $missingDeps[] = $dependency;
+            }
+        }
+
+        return $missingDeps;
+    }
 }

phpmyfaq/translations/language_ar.php

@@ -1471,6 +1471,9 @@
 $PMF_LANG['msgPluginVersion'] = 'الإصدار';
 $PMF_LANG['msgPluginAuthor'] = 'المؤلف';
 $PMF_LANG['msgPluginDescription'] = 'الوصف';
+$PMF_LANG['msgPluginReason'] = 'السبب';
+$PMF_LANG['msgIncompatiblePlugins'] = 'إضافات غير متوافقة';
+$PMF_LANG['msgIncompatiblePluginsInfo'] = 'تعذر تحميل الإضافات التالية بسبب مشكلات التوافق.';
 
 // added v4.1.0-alpha.2 - 2025-02-23 by Thorsten
 $PMF_LANG['msgReportABug'] = 'الإبلاغ عن خطأ';

phpmyfaq/translations/language_bn.php

@@ -1475,6 +1475,9 @@
 $PMF_LANG['msgPluginVersion'] = 'সংস্করণ';
 $PMF_LANG['msgPluginAuthor'] = 'লেখক';
 $PMF_LANG['msgPluginDescription'] = 'বিবরণ';
+$PMF_LANG['msgPluginReason'] = 'কারণ';
+$PMF_LANG['msgIncompatiblePlugins'] = 'অসামঞ্জস্যপূর্ণ প্লাগইন';
+$PMF_LANG['msgIncompatiblePluginsInfo'] = 'সামঞ্জস্যের সমস্যার কারণে নিম্নলিখিত প্লাগইনগুলি লোড করা যায়নি।';
 
 // added v4.1.0-alpha.2 - 2025-02-23 by Thorsten
 $PMF_LANG['msgReportABug'] = 'একটি বাগ রিপোর্ট করুন';

phpmyfaq/translations/language_bs.php

@@ -1472,6 +1472,9 @@
 $PMF_LANG['msgPluginVersion'] = 'Verzija';
 $PMF_LANG['msgPluginAuthor'] = 'Autor';
 $PMF_LANG['msgPluginDescription'] = 'Opis';
+$PMF_LANG['msgPluginReason'] = 'Razlog';
+$PMF_LANG['msgIncompatiblePlugins'] = 'Nekompatibilni dodaci';
+$PMF_LANG['msgIncompatiblePluginsInfo'] = 'Sljedeći dodaci nisu mogli biti učitani zbog problema s kompatibilnošću.';
 
 // added v4.1.0-alpha.2 - 2025-02-23 by Thorsten
 $PMF_LANG['msgReportABug'] = 'Prijavi grešku';