From 20953df22e953e73e09fbcf80dbd830a684fc443 Mon Sep 17 00:00:00 2001
From: Daniel Cothran <daniel@andile.co>
Date: Fri, 23 Feb 2018 09:14:18 -0500
Subject: [PATCH] Fix conflicting class names for Highcharts
---
modules/charts_highcharts/src/Plugin/chart/Highcharts.php | 4 ++--
.../Highcharts/{Highcharts.php => HighchartsOptions.php} | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
rename modules/charts_highcharts/src/Settings/Highcharts/{Highcharts.php => HighchartsOptions.php} (98%)
diff --git a/modules/charts_highcharts/src/Plugin/chart/Highcharts.php b/modules/charts_highcharts/src/Plugin/chart/Highcharts.php
index 786f864..9ab3170 100644
--- a/modules/charts_highcharts/src/Plugin/chart/Highcharts.php
+++ b/modules/charts_highcharts/src/Plugin/chart/Highcharts.php
@@ -19,7 +19,7 @@ use Drupal\charts_highcharts\Settings\Highcharts\PlotOptionsSeriesDataLabels;
use Drupal\charts_highcharts\Settings\Highcharts\Tooltip;
use Drupal\charts_highcharts\Settings\Highcharts\ChartCredits;
use Drupal\charts_highcharts\Settings\Highcharts\ChartLegend;
-use Drupal\charts_highcharts\Settings\Highcharts\Highcharts;
+use Drupal\charts_highcharts\Settings\Highcharts\HighchartsOptions;
/**
* Defines a concrete class for a Highcharts.
@@ -204,7 +204,7 @@ class Highcharts extends AbstractChart {
// Set exporting options.
$exporting = new ExportingOptions($options['exporting'] ?: []);
- $highchart = new Highcharts();
+ $highchart = new HighchartsOptions();
$highchart->setChart($chart);
$highchart->setTitle($chartTitle);
$highchart->setAxisX($chartXaxis);
diff --git a/modules/charts_highcharts/src/Settings/Highcharts/Highcharts.php b/modules/charts_highcharts/src/Settings/Highcharts/HighchartsOptions.php
similarity index 98%
rename from modules/charts_highcharts/src/Settings/Highcharts/Highcharts.php
rename to modules/charts_highcharts/src/Settings/Highcharts/HighchartsOptions.php
index a44d96b..a2a358a 100644
--- a/modules/charts_highcharts/src/Settings/Highcharts/Highcharts.php
+++ b/modules/charts_highcharts/src/Settings/Highcharts/HighchartsOptions.php
@@ -5,7 +5,7 @@ namespace Drupal\charts_highcharts\Settings\Highcharts;
/**
* Highcharts.
*/
-class Highcharts implements \JsonSerializable {
+class HighchartsOptions implements \JsonSerializable {
private $chart;
private $title;
--
GitLab