[BUGFIX] Show ImageMagick command on failure 89/55689/2
authorTymoteusz Motylewski <t.motylewski@gmail.com>
Mon, 12 Feb 2018 21:02:44 +0000 (22:02 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Mon, 12 Feb 2018 21:39:06 +0000 (22:39 +0100)
Install tool now shows an ImageMagick command which
failed.

Resolves: #83868
Releases: master
Change-Id: I4555d2ccdf68eea9180b8c7d2671b11e9b637709
Reviewed-on: https://review.typo3.org/55689
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Tested-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/install/Classes/Controller/EnvironmentController.php

index cefd3e6..9139b94 100644 (file)
@@ -331,6 +331,7 @@ class EnvironmentController extends AbstractController
         } else {
             $result = [
                 'status' => [$this->imageGenerationFailedMessage()],
         } else {
             $result = [
                 'status' => [$this->imageGenerationFailedMessage()],
+                'command' => $imageProcessor->IM_commands,
             ];
         }
         return $this->getImageTestResponse($result);
             ];
         }
         return $this->getImageTestResponse($result);
@@ -363,6 +364,7 @@ class EnvironmentController extends AbstractController
         } else {
             $result = [
                 'status' => [$this->imageGenerationFailedMessage()],
         } else {
             $result = [
                 'status' => [$this->imageGenerationFailedMessage()],
+                'command' => $imageProcessor->IM_commands,
             ];
         }
         return $this->getImageTestResponse($result);
             ];
         }
         return $this->getImageTestResponse($result);
@@ -395,6 +397,7 @@ class EnvironmentController extends AbstractController
         } else {
             $result = [
                 'status' => [$this->imageGenerationFailedMessage()],
         } else {
             $result = [
                 'status' => [$this->imageGenerationFailedMessage()],
+                'command' => $imageProcessor->IM_commands,
             ];
         }
         return $this->getImageTestResponse($result);
             ];
         }
         return $this->getImageTestResponse($result);
@@ -427,6 +430,7 @@ class EnvironmentController extends AbstractController
         } else {
             $result = [
                 'status' => [$this->imageGenerationFailedMessage()],
         } else {
             $result = [
                 'status' => [$this->imageGenerationFailedMessage()],
+                'command' => $imageProcessor->IM_commands,
             ];
         }
         return $this->getImageTestResponse($result);
             ];
         }
         return $this->getImageTestResponse($result);
@@ -459,6 +463,7 @@ class EnvironmentController extends AbstractController
         } else {
             $result = [
                 'status' => [$this->imageGenerationFailedMessage()],
         } else {
             $result = [
                 'status' => [$this->imageGenerationFailedMessage()],
+                'command' => $imageProcessor->IM_commands,
             ];
         }
         return $this->getImageTestResponse($result);
             ];
         }
         return $this->getImageTestResponse($result);
@@ -495,6 +500,7 @@ class EnvironmentController extends AbstractController
         } else {
             $result = [
                 'status' => [$this->imageGenerationFailedMessage()],
         } else {
             $result = [
                 'status' => [$this->imageGenerationFailedMessage()],
+                'command' => $imageProcessor->IM_commands,
             ];
         }
         return $this->getImageTestResponse($result);
             ];
         }
         return $this->getImageTestResponse($result);
@@ -531,6 +537,7 @@ class EnvironmentController extends AbstractController
         } else {
             $result = [
                 'status' => [$this->imageGenerationFailedMessage()],
         } else {
             $result = [
                 'status' => [$this->imageGenerationFailedMessage()],
+                'command' => $imageProcessor->IM_commands,
             ];
         }
         return $this->getImageTestResponse($result);
             ];
         }
         return $this->getImageTestResponse($result);
@@ -813,7 +820,10 @@ class EnvironmentController extends AbstractController
                 'command' => $imageProcessor->IM_commands,
             ];
         } else {
                 'command' => $imageProcessor->IM_commands,
             ];
         } else {
-            $result['status'] = [$this->imageGenerationFailedMessage()];
+            $result = [
+                'status' => [$this->imageGenerationFailedMessage()],
+                'command' => $imageProcessor->IM_commands,
+            ];
         }
         return $this->getImageTestResponse($result);
     }
         }
         return $this->getImageTestResponse($result);
     }