fix: address review feedback for requirements check module

- Split DB version config into MariaDB/MySQL-specific thresholds
- Strip export prefix in env file parser
- Use exact in_array matching for locale checks
- Check supplementary groups for user group validation
- Update docs to reflect client-specific DB versions

Author: konradmichalik

deployer/requirements/config/set.php

@@ -78,7 +78,8 @@
 ]);
 
 // Database
-set('requirements_db_min_version', '10.2.7');
+set('requirements_mariadb_min_version', '10.2.7');
+set('requirements_mysql_min_version', '8.0.0');
 
 // User / permissions
 set('requirements_user_group', 'www-data');

deployer/requirements/functions.php

@@ -176,7 +176,8 @@ function getSharedEnvVars(): array
             $value = substr($value, 1, -1);
         }
 
-        $vars[trim($parts[0])] = $value;
+        $key = trim(preg_replace('/^export\s+/', '', trim($parts[0])));
+        $vars[$key] = $value;
     }
 
     return $vars;

deployer/requirements/task/check_database.php

@@ -35,13 +35,21 @@
         return;
     }
 
-    $minVersion = get('requirements_db_min_version');
-
-    if (preg_match('/Distrib\s+([\d.]+)/', $versionOutput, $matches)
-        || preg_match('/Ver\s+([\d.]+)/', $versionOutput, $matches)) {
+    if (preg_match('/Distrib\s+([\d.]+)/', $versionOutput, $matches)) {
+        $actualVersion = $matches[1];
+        $minVersion = get('requirements_mariadb_min_version');
+        $meets = version_compare($actualVersion, $minVersion, '>=');
+        $info = $meets ? "MariaDB $actualVersion" : "MariaDB $actualVersion (required: >= $minVersion)";
+        addRequirementRow(
+            'Database client',
+            $meets ? REQUIREMENT_OK : REQUIREMENT_FAIL,
+            $info
+        );
+    } elseif (preg_match('/Ver\s+([\d.]+)/', $versionOutput, $matches)) {
         $actualVersion = $matches[1];
+        $minVersion = get('requirements_mysql_min_version');
         $meets = version_compare($actualVersion, $minVersion, '>=');
-        $info = $meets ? $actualVersion : "$actualVersion (required: >= $minVersion)";
+        $info = $meets ? "MySQL $actualVersion" : "MySQL $actualVersion (required: >= $minVersion)";
         addRequirementRow(
             'Database client',
             $meets ? REQUIREMENT_OK : REQUIREMENT_FAIL,

deployer/requirements/task/check_locales.php

@@ -19,12 +19,16 @@
         return;
     }
 
+    $localeLines = array_map('trim', explode("\n", $availableLocales));
+
     foreach (get('requirements_locales') as $locale) {
         $normalizedLocale = strtolower($locale);
         $altLocale = str_replace('.utf8', '.utf-8', $normalizedLocale);
 
-        if (str_contains($availableLocales, $normalizedLocale)
-            || str_contains($availableLocales, $altLocale)) {
+        $found = in_array($normalizedLocale, $localeLines, true)
+            || in_array($altLocale, $localeLines, true);
+
+        if ($found) {
             addRequirementRow("Locale: $locale", REQUIREMENT_OK, 'Available');
         } else {
             addRequirementRow("Locale: $locale", REQUIREMENT_FAIL, 'Not available');

deployer/requirements/task/check_user.php

@@ -13,10 +13,11 @@
 
     $expectedGroup = get('requirements_user_group');
 
-    // Check primary group
+    // Check group membership (primary + supplementary)
     try {
+        $groups = explode(' ', trim(run('id -Gn')));
+        $meets = in_array($expectedGroup, $groups, true);
         $actualGroup = trim(run('id -gn'));
-        $meets = ($actualGroup === $expectedGroup);
         addRequirementRow(
             'User group',
             $meets ? REQUIREMENT_OK : REQUIREMENT_WARN,

docs/REQUIREMENTS.md

@@ -42,7 +42,7 @@ Checks PHP CLI configuration values against expected minimums:
 
 ### Database client
 
-Checks for the availability of the `mariadb` or `mysql` client and validates the version against the configured minimum (default: >= 10.2.7).
+Checks for the availability of the `mariadb` or `mysql` client and validates the version against client-specific minimums (MariaDB: >= 10.2.7, MySQL: >= 8.0.0).
 
 ### User and permissions