From 1621ae8b76a8e5add381ce5a959fc33a90028dc3 Mon Sep 17 00:00:00 2001 From: webchick <drupal@webchick.net> Date: Tue, 16 Dec 2014 21:12:59 -0800 Subject: [PATCH] Issue #2196977 by Eric_A, tadityar, Poornima3, jhedstrom: Drupal/filter/Annotation/Filter uses public $module instead of $provider --- core/lib/Drupal/Core/Condition/Annotation/Condition.php | 4 ++-- core/modules/filter/src/Entity/FilterFormat.php | 2 +- core/modules/filter/src/Plugin/FilterBase.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/lib/Drupal/Core/Condition/Annotation/Condition.php b/core/lib/Drupal/Core/Condition/Annotation/Condition.php index 55834d041c2f..176f3739a767 100644 --- a/core/lib/Drupal/Core/Condition/Annotation/Condition.php +++ b/core/lib/Drupal/Core/Condition/Annotation/Condition.php @@ -46,11 +46,11 @@ class Condition extends Plugin { public $label; /** - * The name of the module providing the type. + * The name of the provider that owns the filter. * * @var string */ - public $module; + public $provider; /** * An array of contextual data. diff --git a/core/modules/filter/src/Entity/FilterFormat.php b/core/modules/filter/src/Entity/FilterFormat.php index 9c37809c56ce..4d45323ef9ee 100644 --- a/core/modules/filter/src/Entity/FilterFormat.php +++ b/core/modules/filter/src/Entity/FilterFormat.php @@ -99,7 +99,7 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En * An associative array of filters assigned to the text format, keyed by the * instance ID of each filter and using the properties: * - id: The plugin ID of the filter plugin instance. - * - module: The name of the module providing the filter. + * - provider: The name of the provider that owns the filter. * - status: (optional) A Boolean indicating whether the filter is * enabled in the text format. Defaults to FALSE. * - weight: (optional) The weight of the filter in the text format. Defaults diff --git a/core/modules/filter/src/Plugin/FilterBase.php b/core/modules/filter/src/Plugin/FilterBase.php index b5394b4ddfce..59a0bb4a2e13 100644 --- a/core/modules/filter/src/Plugin/FilterBase.php +++ b/core/modules/filter/src/Plugin/FilterBase.php @@ -28,7 +28,7 @@ abstract class FilterBase extends PluginBase implements FilterInterface { protected $plugin_id; /** - * The name of the module that owns this filter. + * The name of the provider that owns this filter. * * @var string */ -- GitLab