Merge pull request #1577 from platformsh/backport-0c12e0c1-php56

backport (4.x): Display failing activities as failing in CLI

Author: akalipetis

src/Command/Activity/ActivityGetCommand.php

@@ -120,7 +120,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $rows = [];
         foreach ($properties as $property => $value) {
             $header[] = $property;
-            $rows[] = $formatter->format($value, $property);
+            if ($property === 'result') {
+                $rows[] = ActivityMonitor::formatResult($activity, !$table->formatIsMachineReadable());
+            } else {
+                $rows[] = $formatter->format($value, $property);
+            }
         }
 
         $table->renderSimple($rows, $header);

src/Command/Activity/ActivityListCommand.php

@@ -122,7 +122,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 'type' => new AdaptiveTableCell($activity->type, ['wrap' => false]),
                 'progress' => $activity->getCompletionPercent() . '%',
                 'state' => ActivityMonitor::formatState($activity->state),
-                'result' => ActivityMonitor::formatResult($activity->result, !$table->formatIsMachineReadable()),
+                'result' => ActivityMonitor::formatResult($activity, !$table->formatIsMachineReadable()),
                 'environments' => implode(', ', $activity->environments),
             ];
             $timings = $activity->getProperty('timings', false, false) ?: [];

src/Command/Environment/EnvironmentDeployCommand.php

@@ -72,7 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 'created' => $formatter->format($activity['created_at'], 'created_at'),
                 'description' => ActivityMonitor::getFormattedDescription($activity, !$table->formatIsMachineReadable()),
                 'type' => new AdaptiveTableCell($activity->type, ['wrap' => false]),
-                'result' => ActivityMonitor::formatResult($activity->result, !$table->formatIsMachineReadable()),
+                'result' => ActivityMonitor::formatResult($activity, !$table->formatIsMachineReadable()),
             ];
             $rows[] = $row;
         }

src/Command/Integration/Activity/IntegrationActivityListCommand.php

@@ -101,7 +101,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 'type' => new AdaptiveTableCell($activity->type, ['wrap' => false]),
                 'progress' => $activity->getCompletionPercent() . '%',
                 'state' => ActivityMonitor::formatState($activity->state),
-                'result' => ActivityMonitor::formatResult($activity->result, !$table->formatIsMachineReadable()),
+                'result' => ActivityMonitor::formatResult($activity, !$table->formatIsMachineReadable()),
             ];
             $timings = $activity->getProperty('timings', false, false) ?: [];
             foreach ($timingTypes as $timingType) {

src/Service/ActivityMonitor.php

@@ -564,15 +564,25 @@ public static function formatState($state)
     /**
      * Format a result.
      *
-     * @param string $result
-     * @param bool   $decorate
+     * @param Activity $activity
+     * @param bool     $decorate
      *
      * @return string
      */
-    public static function formatResult($result, $decorate = true)
+    public static function formatResult($activity, $decorate = true)
     {
+        $result = $activity->result;
         $name = isset(self::$resultNames[$result]) ? self::$resultNames[$result] : $result;
 
+        $commands = isset($activity->commands) ? $activity->commands : array();
+        foreach ($commands as $command) {
+            if ($command['exit_code'] > 0) {
+                $name = self::$resultNames[Activity::RESULT_FAILURE];
+                $result = Activity::RESULT_FAILURE;
+                break;
+            }
+        }
+
         return $decorate && $result === Activity::RESULT_FAILURE
             ? '<error>' . $name . '</error>'
             : $name;