Issue #2926078 by lbaran: Charts API Example has issue with ModuleHandler.php...

Issue #2926078 by lbaran: Charts API Example has issue with ModuleHandler.php and issue #2926077 by lbaran: In Default chart configuration, get AttachedAssets.php notice. Also includes misc. changes to HighchartsChartsRender by andieco

modules/charts_api_example/src/Controller/ChartsApiExample.php

@@ -2,33 +2,50 @@
 
 namespace Drupal\charts_api_example\Controller;
 
-
 use Drupal\charts\Services\ChartsSettingsService;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
+/**
+ * Charts Api Example.
+ */
 class ChartsApiExample extends ControllerBase implements ContainerInjectionInterface {
+
   private $chartSettings;
 
+  /**
+   * Construct.
+   *
+   * @param \Drupal\charts\Services\ChartsSettingsService $chartSettings
+   *   Service ChartsSettingsService.
+   */
   public function __construct(ChartsSettingsService $chartSettings) {
     $this->chartSettings = $chartSettings->getChartsSettings();
   }
 
+  /**
+   * Display.
+   *
+   * @return array
+   *   Array to render.
+   */
   public function display() {
 
     $library = $this->chartSettings['library'];
-    if (!isset($library)) {
-      drupal_set_message(t('You need to first configure Charts default 
-      settings'));
+    if (empty($library)) {
+      drupal_set_message($this->t('You need to first configure Charts default settings'));
+      return [];
     }
-    $options = [];
-    $options['type'] = $this->chartSettings['type'];
-    $options['title'] = $this->t('Chart title');
-    $options['yaxis_title'] = $this->t('Y-Axis');
-    $options['yaxis_min'] = '';
-    $options['yaxis_max'] = '';
-    $options['xaxis_title'] = $this->t('X-Axis');
+    $options = [
+      'type'        => $this->chartSettings['type'],
+      'title'       => $this->t('Chart title'),
+      'xaxis_title' => $this->t('X-Axis'),
+      'yaxis_title' => $this->t('Y-Axis'),
+      'yaxis_min'   => '',
+      'yaxis_max'   => '',
+    ];
+
     // Sample data format.
     $categories = ["Category 1", "Category 2", "Category 3", "Category 4"];
     $seriesData = [
@@ -37,16 +54,18 @@ class ChartsApiExample extends ControllerBase implements ContainerInjectionInter
       ["name" => "Series 3", "color" => "#910000", "type" => "area", "data" => [0, 0, 60, 90]]
     ];
 
-    $element = [
-      '#theme' => 'charts_api_example',
-      '#library' => $this->t($library),
+    return [
+      '#theme'      => 'charts_api_example',
+      '#library'    => (string) $library,
       '#categories' => $categories,
       '#seriesData' => $seriesData,
-      '#options' => $options,
+      '#options'    => $options,
     ];
-    return $element;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('charts.settings')

modules/charts_highcharts/src/Charts/HighchartsChartsRender.php

@@ -60,16 +60,38 @@ class HighchartsChartsRender implements ChartsRenderInterface {
       }
     }
     $chart->setType($typeOptions);
-    $chart->setWidth($options['width']);
-    $chart->setHeight($options['height']);
+
+    // Set chart width.
+    if (isset($options['width'])) {
+      $chart->setWidth($options['width']);
+    }
+
+    // Set chart height.
+    if (isset($options['height'])) {
+      $chart->setHeight($options['height']);
+    }
+
+    // Set chart title.
     $chartTitle = new ChartTitle();
-    $chartTitle->setText($options['title']);
+    if (isset($options['title'])) {
+      $chartTitle->setText($options['title']);
+    }
+
     $chartXaxis = new Xaxis();
     $chartLabels = new ChartLabel();
-    $chartLabels->setRotation($options['xaxis_labels_rotation']);
+
+    // Set x-axis label rotation.
+    if (isset($options['xaxis_labels_rotation'])) {
+      $chartLabels->setRotation($options['xaxis_labels_rotation']);
+    }
+
     $chartXaxis->setCategories($categories);
+
+    // Set x-axis title.
     $xAxisTitle = new XaxisTitle();
-    $xAxisTitle->setText($options['xaxis_title']);
+    if (isset($options['xaxis_title'])) {
+      $xAxisTitle->setText($options['xaxis_title']);
+    }
     $chartXaxis->setTitle($xAxisTitle);
     $chartXaxis->setLabels($chartLabels);
     $yaxisLabels = new YaxisLabel();
@@ -87,7 +109,8 @@ class HighchartsChartsRender implements ChartsRenderInterface {
     $chartYaxis->setLabels($yaxisLabels);
     $chartYaxis->setTitle($yAxisTitle);
     array_push($yAxes, $chartYaxis);
-    // Chart libraries tend to supports only one secondary axis.
+
+    // Chart libraries tend to support only one secondary axis.
     if (!$noAttachmentDisplays && $attachmentDisplayOptions[0]['inherit_yaxis'] == 0) {
       $chartYaxisSecondary = new Yaxis();
       $yAxisTitleSecondary = new YaxisTitle();