Skip to content
Snippets Groups Projects
Commit cbe8fcca authored by Nikita Remizov's avatar Nikita Remizov
Browse files

Update due to D8 Core changes: Various classes/interfaces renamed to support...

Update due to D8 Core changes: Various classes/interfaces renamed to support PHP 7 (https://www.drupal.org/node/2457593)
parent 82561e7c
Branches 8.x-1.x
No related merge requests found
......@@ -8,7 +8,7 @@ namespace Drupal\visualization\Plugin\views\style;
use Drupal\views\Plugin\views\style\StylePluginBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\SafeMarkup;
/** Style plugin uses views ui to configure views data for rendering charts.
*
......@@ -60,7 +60,7 @@ class Visualization extends StylePluginBase {
/**
* Set default options.
*/
public function defineOptions() {
protected function defineOptions() {
$options = parent::defineOptions();
$options['type'] = array('default' => 'line');
......@@ -106,7 +106,7 @@ class Visualization extends StylePluginBase {
$form['fields'][$field] = array(
'#type' => 'details',
'#title' => String::checkPlain($field),
'#title' => SafeMarkup::checkPlain($field),
'#collapsible' => TRUE,
'#collapsed' => empty($this->options['fields'][$field]),
);
......
......@@ -6,7 +6,7 @@
namespace Drupal\visualization\Plugin\visualization\handler;
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
use Drupal\visualization\VisualizationHandlerInterface;
......@@ -66,12 +66,12 @@ class GoogleVisualizationAPIHandler implements VisualizationHandlerInterface {
$table_row = array();
if (!empty($options['xAxis']['labelField'])) {
$table_row[] = String::checkPlain(strip_tags((string) $row[$options['xAxis']['labelField']]));
$table_row[] = SafeMarkup::checkPlain(strip_tags((string) $row[$options['xAxis']['labelField']]));
}
foreach ($options['fields'] as $name => $column) {
if (!empty($column['enabled'])) {
$value = is_null($row[$name]) ? NULL : (float) $row[$name];
$value = is_null($row[$name]) ? NULL : (float) $row[$name]->__toString();
$table_row[] = $value;
}
......
......@@ -6,7 +6,7 @@
namespace Drupal\visualization\Plugin\visualization\handler;
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
use Drupal\visualization\VisualizationHandlerInterface;
......@@ -59,7 +59,7 @@ class HighchartsHandler implements VisualizationHandlerInterface {
$x_axis = array();
if (!empty($options['xAxis']['labelField'])) {
foreach ($data as $row) {
$x_axis[] = String::checkPlain(strip_tags((string) $row[$options['xAxis']['labelField']]));
$x_axis[] = SafeMarkup::checkPlain(strip_tags((string) $row[$options['xAxis']['labelField']]));
}
}
......@@ -90,7 +90,7 @@ class HighchartsHandler implements VisualizationHandlerInterface {
$value = (int) $row[$name];
if (!empty($column['enabled'])) {
$serie->data[] = (object) array('name' => String::checkPlain(strip_tags($row[$options['xAxis']['labelField']])), 'y' => $value);
$serie->data[] = (object) array('name' => SafeMarkup::checkPlain(strip_tags($row[$options['xAxis']['labelField']])), 'y' => $value);
}
else {
$serie->data[] = $value;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment