X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FChart.php;h=ff74cf8fbfdfe6564921801b0597874e17989e43;hb=bc8a85dcf4f95a793822679ab71559ece76f28e1;hp=c8745fa0a5f0b745c958bbacea851f0311e43480;hpb=10ad75468991ba8d1c5f95a2d10ab1823c59fc25;p=civicrm-core.git

diff --git a/CRM/Utils/Chart.php b/CRM/Utils/Chart.php
index c8745fa0a5..ff74cf8fbf 100644
--- a/CRM/Utils/Chart.php
+++ b/CRM/Utils/Chart.php
@@ -21,26 +21,7 @@
 class CRM_Utils_Chart {
 
   /**
-   * Colours.
-   * @var array
-   */
-  private static $_colours = [
-    "#C3CC38",
-    "#C8B935",
-    "#CEA632",
-    "#D3932F",
-    "#D9802C",
-    "#FA6900",
-    "#DC9B57",
-    "#F78F01",
-    "#5AB56E",
-    "#6F8069",
-    "#C92200",
-    "#EB6C5C",
-  ];
-
-  /**
-   * Build The Bar Gharph.
+   * Build The Bar Graph.
    *
    * @param array $params
    *   Assoc array of name/value pairs.
@@ -145,9 +126,9 @@ class CRM_Utils_Chart {
   }
 
   /**
-   * @param $rows
-   * @param $chart
-   * @param $interval
+   * @param array $rows
+   * @param string $chart
+   * @param string $interval
    *
    * @return array
    */
@@ -205,14 +186,14 @@ class CRM_Utils_Chart {
     }
 
     // rotate the x labels.
-    $chartData['xLabelAngle'] = CRM_Utils_Array::value('xLabelAngle', $rows, 0);
+    $chartData['xLabelAngle'] = $rows['xLabelAngle'] ?? 0;
     if (!empty($rows['tip'])) {
       $chartData['tip'] = $rows['tip'];
     }
 
     // legend
-    $chartData['xname'] = CRM_Utils_Array::value('xname', $rows);
-    $chartData['yname'] = CRM_Utils_Array::value('yname', $rows);
+    $chartData['xname'] = $rows['xname'] ?? NULL;
+    $chartData['yname'] = $rows['yname'] ?? NULL;
 
     // carry some chart params if pass.
     foreach ([
@@ -229,10 +210,10 @@ class CRM_Utils_Chart {
   }
 
   /**
-   * @param $rows
-   * @param $chart
-   * @param $interval
-   * @param $chartInfo
+   * @param array $rows
+   * @param string $chart
+   * @param array $interval
+   * @param array $chartInfo
    *
    * @return array
    */
@@ -270,7 +251,7 @@ class CRM_Utils_Chart {
 
   /**
    * @param array $params
-   * @param $chart
+   * @param string $chart
    *
    * @return array
    */