Commit e832e1ae authored by Daniel Cothran's avatar Daniel Cothran Committed by Daniel Cothran
Browse files

Issue #3277589 by andileco: Clean up code documentation, add return types, etc.

parent 91e4ffe1

charts.module

+2 −3
Changes for charts.module: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line 
<?php



/**

 * @file

 * Charts - Module.

 * @file Charts - Module.

 */



use Drupal\views\ViewExecutable;
@@ -27,7 +26,7 @@ function charts_views_data() { 
    'title' => t('Bubble Field'),

    'help' => t('Use this field for your data field in a bubble chart.'),

    'field' => [

      'id' => 'field_charts_fields_bubble'

      'id' => 'field_charts_fields_bubble',

    ],

  ];

  $data['charts_fields']['field_exposed_chart_type'] = [

charts.post_update.php

+6 −1
Changes for charts.post_update.php: 6 added lines, 1 removed line.
Original line number Diff line number Diff line 
<?php



/**

 * @file Charts post-update file.

 */



use Drupal\Core\Serialization\Yaml;



/**
@@ -16,7 +20,8 @@ function charts_post_update_initialize_advanced_requirements_cdn(&$sandbox) { 
}



/**

 * Update the existing default config display colors to increase them from 10 to 25.

 * Update the existing default config display colors to increase them

 * from 10 to 25.

 */

function charts_post_update_existing_default_colors_to_twenty_five(&$sandbox) {

  $config = \Drupal::service('config.factory')->getEditable('charts.settings');

src/Plugin/views/style/ChartsPluginStyleChart.php

+4 −4
Changes for src/Plugin/views/style/ChartsPluginStyleChart.php: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ class ChartsPluginStyleChart extends StylePluginBase implements ContainerFactory 
              $value = $this->processNumberValueFromField($result_number, $field_key);

              $chart[$element_key]['#data'][] = $value;

              $chart[$element_key]['#mapped_data'][$xaxis_label] = $value;

              if (strpos($field_handler['id'], 'field_charts_fields_scatter') === 0) {

              if (strpos($field_handler['id'], 'field_charts_fields_scatter') === 0 || strpos($field_handler['id'], 'field_charts_fields_bubble') === 0) {

                $chart['xaxis']['#labels'] = [];

              }

            }
@@ -594,7 +594,7 @@ class ChartsPluginStyleChart extends StylePluginBase implements ContainerFactory 
   * @return \Drupal\Component\Render\MarkupInterface|float|null

   *   The value.

   */

  public function processNumberValueFromField($number, $field): float|MarkupInterface|null {

  public function processNumberValueFromField($number, $field): mixed {

    if (is_array($this->getField($number, $field))) {

      $value = $this->getField($number, $field)->__toString();

    }
@@ -604,7 +604,7 @@ class ChartsPluginStyleChart extends StylePluginBase implements ContainerFactory 
    if ($this->twig->isDebug()) {

      $value = trim(strip_tags($value));

    }

    if (strpos($field, 'field_charts_fields_scatter') === 0) {

    if (strpos($field, 'field_charts_fields_scatter') === 0 || strpos($field, 'field_charts_fields_bubble') === 0) {



      return Json::decode($value);

    }
@@ -706,7 +706,7 @@ class ChartsPluginStyleChart extends StylePluginBase implements ContainerFactory 
            continue;

          }

          $value = $this->processNumberValueFromField($result_number, $field_key);

          if (strpos($field_handler['id'], 'field_charts_fields_scatter') === 0) {

          if (strpos($field_handler['id'], 'field_charts_fields_scatter') === 0 || strpos($field_handler['id'], 'field_charts_fields_bubble') === 0) {

            $chart[$element_key]['#data'] = [];

            $chart[$element_key]['#data'][] = $value;

            $chart['xaxis'] = $original_xaxis;