Skip to content
Snippets Groups Projects
Commit 93a29942 authored by Daniel Cothran's avatar Daniel Cothran
Browse files

Issue #3462637: Uncaught PHP exception with 5.0.15 on Drupal < 10.3.x

parent f2d815fc
No related branches found
Tags 5.0.16
2 merge requests!106Resolve #3463862 "51x ",!103Update 14 files
Pipeline #231495 passed with warnings
Showing with 20 additions and 20 deletions
...@@ -2,5 +2,5 @@ name: Charts ...@@ -2,5 +2,5 @@ name: Charts
type: module type: module
description: 'A charting API for Drupal that provides chart elements and integration with Views.' description: 'A charting API for Drupal that provides chart elements and integration with Views.'
package: Charts package: Charts
core_version_requirement: ^9.2 || ^10 || ^11 core_version_requirement: ^9.2 || ^10
configure: charts.settings configure: charts.settings
name: 'Charts API Example' name: 'Charts API Example'
type: module type: module
description: 'Demonstrates how to use the Charts module without Views.' description: 'Demonstrates how to use the Charts module without Views.'
core_version_requirement: ^9.2 || ^10 || ^11 core_version_requirement: ^9.2 || ^10
package: Examples package: Examples
dependencies: dependencies:
- 'charts:charts' - 'charts:charts'
...@@ -2,6 +2,6 @@ name: 'Billboard.js Charts' ...@@ -2,6 +2,6 @@ name: 'Billboard.js Charts'
type: module type: module
description: 'Charts module integration with Billboard.js Charts.' description: 'Charts module integration with Billboard.js Charts.'
package: Charts package: Charts
core_version_requirement: ^9.2 || ^10 || ^11 core_version_requirement: ^9.2 || ^10
dependencies: dependencies:
- 'charts:charts' - 'charts:charts'
name: Charts Blocks name: Charts Blocks
type: module type: module
description: Create Charts blocks without the need for Views. description: Create Charts blocks without the need for Views.
core_version_requirement: ^9.2 || ^10 || ^11 core_version_requirement: ^9.2 || ^10
package: Charts package: Charts
dependencies: dependencies:
- drupal:charts - drupal:charts
...@@ -2,6 +2,6 @@ name: 'C3.js Charts' ...@@ -2,6 +2,6 @@ name: 'C3.js Charts'
type: module type: module
description: 'Charts module integration with C3.js Charts.' description: 'Charts module integration with C3.js Charts.'
package: Charts package: Charts
core_version_requirement: ^9.2 || ^10 || ^11 core_version_requirement: ^9.2 || ^10
dependencies: dependencies:
- 'charts:charts' - 'charts:charts'
...@@ -2,6 +2,6 @@ name: 'Chart.js Charts' ...@@ -2,6 +2,6 @@ name: 'Chart.js Charts'
type: module type: module
description: 'Charts module integration with Chart.js.' description: 'Charts module integration with Chart.js.'
package: Charts package: Charts
core_version_requirement: ^9.2 || ^10 || ^11 core_version_requirement: ^9.2 || ^10
dependencies: dependencies:
- 'charts:charts' - 'charts:charts'
...@@ -2,6 +2,6 @@ name: 'Google Charts' ...@@ -2,6 +2,6 @@ name: 'Google Charts'
type: module type: module
description: 'Charts module integration with Google Charts.' description: 'Charts module integration with Google Charts.'
package: Charts package: Charts
core_version_requirement: ^9.2 || ^10 || ^11 core_version_requirement: ^9.2 || ^10
dependencies: dependencies:
- 'charts:charts' - 'charts:charts'
...@@ -2,6 +2,6 @@ name: Highcharts ...@@ -2,6 +2,6 @@ name: Highcharts
type: module type: module
description: 'Charts module integration with Highcharts library.' description: 'Charts module integration with Highcharts library.'
package: Charts package: Charts
core_version_requirement: ^9.2 || ^10 || ^11 core_version_requirement: ^9.2 || ^10
dependencies: dependencies:
- charts:charts - charts:charts
...@@ -9,7 +9,7 @@ use Drupal\Core\Entity\EntityTypeInterface; ...@@ -9,7 +9,7 @@ use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Element; use Drupal\Core\Render\Element;
use Drupal\Core\Render\Element\FormElementBase; use Drupal\Core\Render\Element\FormElement;
use Drupal\Core\StringTranslation\TranslatableMarkup; use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\views\Views; use Drupal\views\Views;
...@@ -36,7 +36,7 @@ use Drupal\views\Views; ...@@ -36,7 +36,7 @@ use Drupal\views\Views;
* *
* @FormElement("charts_settings") * @FormElement("charts_settings")
*/ */
class BaseSettings extends FormElementBase { class BaseSettings extends FormElement {
use ColorHelperTrait; use ColorHelperTrait;
use ElementFormStateTrait; use ElementFormStateTrait;
......
...@@ -11,7 +11,7 @@ use Drupal\Core\Config\ConfigFactoryInterface; ...@@ -11,7 +11,7 @@ use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Render\Element; use Drupal\Core\Render\Element;
use Drupal\Core\Render\Element\RenderElementBase; use Drupal\Core\Render\Element\RenderElement;
use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\Core\StringTranslation\StringTranslationTrait;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
...@@ -20,7 +20,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; ...@@ -20,7 +20,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
* *
* @RenderElement("chart") * @RenderElement("chart")
*/ */
class Chart extends RenderElementBase implements ContainerFactoryPluginInterface { class Chart extends RenderElement implements ContainerFactoryPluginInterface {
use StringTranslationTrait; use StringTranslationTrait;
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
namespace Drupal\charts\Element; namespace Drupal\charts\Element;
use Drupal\Core\Render\Element\RenderElementBase; use Drupal\Core\Render\Element\RenderElement;
/** /**
* Provides a chart render element. * Provides a chart render element.
*/ */
abstract class ChartAxisBase extends RenderElementBase { abstract class ChartAxisBase extends RenderElement {
/** /**
* {@inheritdoc} * {@inheritdoc}
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
namespace Drupal\charts\Element; namespace Drupal\charts\Element;
use Drupal\Core\Render\Element\RenderElementBase; use Drupal\Core\Render\Element\RenderElement;
/** /**
* Provides a chart data render element. * Provides a chart data render element.
* *
* @RenderElement("chart_data") * @RenderElement("chart_data")
*/ */
class ChartData extends RenderElementBase { class ChartData extends RenderElement {
/** /**
* {@inheritdoc} * {@inheritdoc}
......
...@@ -9,14 +9,14 @@ use Drupal\Component\Utility\Html; ...@@ -9,14 +9,14 @@ use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\NestedArray; use Drupal\Component\Utility\NestedArray;
use Drupal\Component\Utility\Unicode; use Drupal\Component\Utility\Unicode;
use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Element\FormElementBase; use Drupal\Core\Render\Element\FormElement;
/** /**
* Provides a chart data collector table form element. * Provides a chart data collector table form element.
* *
* @FormElement("chart_data_collector_table") * @FormElement("chart_data_collector_table")
*/ */
class ChartDataCollectorTable extends FormElementBase { class ChartDataCollectorTable extends FormElement {
use ColorHelperTrait; use ColorHelperTrait;
use ElementFormStateTrait; use ElementFormStateTrait;
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
namespace Drupal\charts\Element; namespace Drupal\charts\Element;
use Drupal\Core\Render\Element\RenderElementBase; use Drupal\Core\Render\Element\RenderElement;
/** /**
* Provides a chart data item render element. * Provides a chart data item render element.
* *
* @RenderElement("chart_data_item") * @RenderElement("chart_data_item")
*/ */
class ChartDataItem extends RenderElementBase { class ChartDataItem extends RenderElement {
/** /**
* {@inheritdoc} * {@inheritdoc}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment