Merge remote-tracking branch 'origin/feature/requirements-typo3-alignment' into feature/requirements-database-grants

Author: konradmichalik

deployer/requirements/functions.php

@@ -176,7 +176,7 @@ function detectPackageVersion(string $command): ?string
     try {
         $output = trim(run($versionCmd));
 
-        if ($output !== '' && preg_match('/(\d+[\d.]+)/', $output, $matches)) {
+        if ($output !== '' && preg_match('/(\d+[\d.]*)/', $output, $matches)) {
             return $matches[1];
         }
     } catch (RunException) {

deployer/requirements/task/check_image_processing.php

@@ -13,6 +13,7 @@
 
     $gmMinVersion = get('requirements_graphicsmagick_min_version');
     $imMinVersion = get('requirements_imagemagick_min_version');
+    $gmVersionFail = false;
 
     // Try GraphicsMagick first (recommended)
     try {
@@ -27,6 +28,8 @@
 
                 return;
             }
+
+            $gmVersionFail = "GraphicsMagick $actualVersion (required: >= $gmMinVersion)";
         }
     } catch (RunException) {
         // GraphicsMagick not available, try ImageMagick
@@ -55,6 +58,8 @@
     addRequirementRow(
         'Image processing',
         REQUIREMENT_FAIL,
-        "Neither GraphicsMagick (>= $gmMinVersion) nor ImageMagick (>= $imMinVersion) found"
+        $gmVersionFail !== false
+            ? "$gmVersionFail — ImageMagick (>= $imMinVersion) not found"
+            : "Neither GraphicsMagick (>= $gmMinVersion) nor ImageMagick (>= $imMinVersion) found"
     );
 })->hidden();