Allow Metric instances to be stored in Report::$metrics. (#14414)

1 files changed, 13 insertions, 3 deletions

diff --git a/core/Plugin/Report.php b/core/Plugin/Report.php
index 04145a2d40..05bc731ca0 100644
--- a/core/Plugin/Report.php
+++ b/core/Plugin/Report.php
@@ -485,8 +485,18 @@ class Report
         $documentation = array();
 
         foreach ($this->metrics as $metric) {
-            if (!empty($translations[$metric])) {
+            if (is_string($metric) && !empty($translations[$metric])) {
                 $documentation[$metric] = $translations[$metric];
+            } elseif ($metric instanceof Metric) {
+                $name = $metric->getName();
+                $metricDocs = $metric->getDocumentation();
+                if (empty($metricDocs)) {
+                    $metricDocs = @$translations[$name];
+                }
+
+                if (!empty($metricDocs)) {
+                    $documentation[$name] = $metricDocs;
+                }
             }
         }
 
@@ -494,7 +504,7 @@ class Report
         foreach ($processedMetrics as $processedMetric) {
             if (is_string($processedMetric) && !empty($translations[$processedMetric])) {
                 $documentation[$processedMetric] = $translations[$processedMetric];
-            } elseif ($processedMetric instanceof ProcessedMetric) {
+            } elseif ($processedMetric instanceof Metric) {
                 $name = $processedMetric->getName();
                 $metricDocs = $processedMetric->getDocumentation();
                 if (empty($metricDocs)) {
@@ -502,7 +512,7 @@ class Report
                 }
 
                 if (!empty($metricDocs)) {
-                    $documentation[$processedMetric->getName()] = $metricDocs;
+                    $documentation[$name] = $metricDocs;
                 }
             }
         }