From 3b3e139cf8f2baf40d71928cfbe344e6b22f42ed Mon Sep 17 00:00:00 2001 From: aspilicious Date: Mon, 17 Sep 2012 10:58:13 +0200 Subject: [PATCH] Issue #1776686 by aspilicious, tim.plunkett: Merge __construct() and construct(). --- lib/Drupal/views/Plugin/views/PluginBase.php | 9 --------- .../Plugin/views/argument/ArgumentPluginBase.php | 7 ++++--- .../views/Plugin/views/argument/Formula.php | 7 ++++--- .../views/Plugin/views/field/FieldPluginBase.php | 7 ++++--- .../views/Plugin/views/filter/BooleanOperator.php | 9 +++++++-- .../views/Plugin/views/filter/InOperator.php | 9 +++++++-- .../Plugin/views/wizard/WizardPluginBase.php | 10 +++++----- .../aggregator/Plugin/views/field/Category.php | 7 ++++--- .../aggregator/Plugin/views/field/TitleLink.php | 9 +++++++-- .../comment/Plugin/views/field/LastTimestamp.php | 9 +++++++-- .../Plugin/views/field/NodeNewComments.php | 9 +++++++-- .../filter/Plugin/views/field/FormatName.php | 9 +++++++-- lib/Views/locale/Plugin/views/field/LinkEdit.php | 9 +++++++-- .../node/Plugin/views/argument/CreatedDay.php | 8 +++++--- .../Plugin/views/argument/CreatedFullDate.php | 8 +++++--- .../node/Plugin/views/argument/CreatedMonth.php | 8 +++++--- .../node/Plugin/views/argument/CreatedWeek.php | 8 +++++--- .../node/Plugin/views/argument/CreatedYear.php | 8 +++++--- .../Plugin/views/argument/CreatedYearMonth.php | 8 +++++--- lib/Views/node/Plugin/views/argument/Type.php | 4 ---- lib/Views/node/Plugin/views/field/Path.php | 15 ++++++++++----- .../node/Plugin/views/field/RevisionLink.php | 9 +++++++-- .../taxonomy/Plugin/views/field/LinkEdit.php | 9 +++++++-- .../taxonomy/Plugin/views/field/Taxonomy.php | 8 +++++--- .../Plugin/views/field/NodeTranslationLink.php | 9 +++++++-- lib/Views/user/Plugin/views/field/Link.php | 9 +++++++-- lib/Views/user/Plugin/views/field/Permissions.php | 9 +++++++-- lib/Views/user/Plugin/views/field/Picture.php | 9 +++++++-- lib/Views/user/Plugin/views/field/Roles.php | 9 +++++++-- lib/Views/user/Plugin/views/filter/Current.php | 9 +++++++-- 30 files changed, 171 insertions(+), 86 deletions(-) diff --git a/lib/Drupal/views/Plugin/views/PluginBase.php b/lib/Drupal/views/Plugin/views/PluginBase.php index ba56409768..8262412797 100644 --- a/lib/Drupal/views/Plugin/views/PluginBase.php +++ b/lib/Drupal/views/Plugin/views/PluginBase.php @@ -47,8 +47,6 @@ public function __construct(array $configuration, $plugin_id, DiscoveryInterface parent::__construct($configuration, $plugin_id, $discovery); $this->definition = $this->discovery->getDefinition($plugin_id) + $configuration; - - $this->construct(); } /** @@ -69,13 +67,6 @@ public function __construct(array $configuration, $plugin_id, DiscoveryInterface */ protected function defineOptions() { return array(); } - /** - * Views handlers use a special construct function so that we can more - * easily construct them with variable arguments. - */ - public function construct() { - } - protected function setOptionDefaults(&$storage, $options, $level = 0) { foreach ($options as $option => $definition) { if (isset($definition['contains']) && is_array($definition['contains'])) { diff --git a/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php index b8f00a1cad..d4964f7595 100644 --- a/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php +++ b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php @@ -9,6 +9,7 @@ use Drupal\views\Plugin\views\PluginBase; use Drupal\views\Plugin\views\HandlerBase; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * @defgroup views_argument_handlers Views argument handlers @@ -61,10 +62,10 @@ abstract class ArgumentPluginBase extends HandlerBase { var $name_field; /** - * Constructor + * Constructs a ArgumentPluginBase object. */ - public function construct() { - parent::construct(); + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); if (!empty($this->definition['name field'])) { $this->name_field = $this->definition['name field']; diff --git a/lib/Drupal/views/Plugin/views/argument/Formula.php b/lib/Drupal/views/Plugin/views/argument/Formula.php index 746477373c..bdc065bd6a 100644 --- a/lib/Drupal/views/Plugin/views/argument/Formula.php +++ b/lib/Drupal/views/Plugin/views/argument/Formula.php @@ -8,6 +8,7 @@ namespace Drupal\views\Plugin\views\argument; use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Abstract argument handler for simple formulae. @@ -28,10 +29,10 @@ class Formula extends ArgumentPluginBase { var $formula = NULL; /** - * Constructor + * Constructs a Formula object. */ - public function construct() { - parent::construct(); + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); if (!empty($this->definition['formula'])) { $this->formula = $this->definition['formula']; diff --git a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php index 1c83039a3d..0726c28c90 100644 --- a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php +++ b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php @@ -9,6 +9,7 @@ use Drupal\views\Plugin\views\HandlerBase; use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * @defgroup views_field_handlers Views field handlers @@ -67,10 +68,10 @@ abstract class FieldPluginBase extends HandlerBase { var $additional_fields = array(); /** - * Construct a new field handler. + * Constructs a FieldPluginBase object. */ - public function construct() { - parent::construct(); + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); $this->additional_fields = array(); if (!empty($this->definition['additional fields'])) { diff --git a/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php b/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php index d924a84445..de3cdf05a2 100644 --- a/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php +++ b/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php @@ -8,6 +8,7 @@ namespace Drupal\views\Plugin\views\filter; use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Simple filter to handle matching of boolean values @@ -38,7 +39,12 @@ class BooleanOperator extends FilterPluginBase { // Whether to accept NULL as a false value or not var $accept_null = FALSE; - public function construct() { + /** + * Constructs a BooleanOperator object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->value_value = t('True'); if (isset($this->definition['label'])) { $this->value_value = $this->definition['label']; @@ -50,7 +56,6 @@ public function construct() { $this->accept_null = (bool) $this->definition['accept_null']; } $this->value_options = NULL; - parent::construct(); } /** diff --git a/lib/Drupal/views/Plugin/views/filter/InOperator.php b/lib/Drupal/views/Plugin/views/filter/InOperator.php index 929b719645..f622373fb5 100644 --- a/lib/Drupal/views/Plugin/views/filter/InOperator.php +++ b/lib/Drupal/views/Plugin/views/filter/InOperator.php @@ -8,6 +8,7 @@ namespace Drupal\views\Plugin\views\filter; use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Simple filter to handle matching of multiple options selectable via checkboxes @@ -32,8 +33,12 @@ class InOperator extends FilterPluginBase { */ var $value_options = NULL; - public function construct() { - parent::construct(); + /** + * Constructs a BooleanOperator object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->value_title = t('Options'); $this->value_options = NULL; } diff --git a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php index d0deb5edd3..6949f483d5 100644 --- a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php +++ b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php @@ -11,6 +11,7 @@ use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\Plugin\views\PluginBase; use Drupal\views\Plugin\views\wizard\WizardInterface; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Provides the interface and base class for Views Wizard plugins. @@ -108,12 +109,11 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface { ); /** - * Constructs the WizardPluginBase object. - * - * @param array $definition - * The information stored in the annotation definition. + * Constructs a WizardPluginBase object. */ - function construct() { + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->base_table = $this->definition['base_table']; $entities = entity_get_info(); diff --git a/lib/Views/aggregator/Plugin/views/field/Category.php b/lib/Views/aggregator/Plugin/views/field/Category.php index 493e3065ae..211c1e8a95 100644 --- a/lib/Views/aggregator/Plugin/views/field/Category.php +++ b/lib/Views/aggregator/Plugin/views/field/Category.php @@ -24,10 +24,11 @@ class Category extends FieldPluginBase { /** - * Constructor to provide additional field to add. + * Constructs a Category object. */ - public function construct() { - parent::construct(); + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->additional_fields['cid'] = 'cid'; } diff --git a/lib/Views/aggregator/Plugin/views/field/TitleLink.php b/lib/Views/aggregator/Plugin/views/field/TitleLink.php index 10e19ef694..f38fe15ea7 100644 --- a/lib/Views/aggregator/Plugin/views/field/TitleLink.php +++ b/lib/Views/aggregator/Plugin/views/field/TitleLink.php @@ -9,6 +9,7 @@ use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Field handler that turns an item's title into a clickable link to the original @@ -23,8 +24,12 @@ */ class TitleLink extends FieldPluginBase { - public function construct() { - parent::construct(); + /** + * Constructs a Category object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->additional_fields['link'] = 'link'; } diff --git a/lib/Views/comment/Plugin/views/field/LastTimestamp.php b/lib/Views/comment/Plugin/views/field/LastTimestamp.php index 18bb0f61ac..a64bceff59 100644 --- a/lib/Views/comment/Plugin/views/field/LastTimestamp.php +++ b/lib/Views/comment/Plugin/views/field/LastTimestamp.php @@ -9,6 +9,7 @@ use Drupal\views\Plugin\views\field\Date; use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Field handler to display the timestamp of a comment with the count of comments. @@ -22,8 +23,12 @@ */ class LastTimestamp extends Date { - public function construct() { - parent::construct(); + /** + * Constructs a LastTimestamp object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->additional_fields['comment_count'] = 'comment_count'; } diff --git a/lib/Views/comment/Plugin/views/field/NodeNewComments.php b/lib/Views/comment/Plugin/views/field/NodeNewComments.php index 813979ece8..fc0cad678f 100644 --- a/lib/Views/comment/Plugin/views/field/NodeNewComments.php +++ b/lib/Views/comment/Plugin/views/field/NodeNewComments.php @@ -9,6 +9,7 @@ use Drupal\views\Plugin\views\field\Numeric; use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Field handler to display the number of new comments. @@ -22,8 +23,12 @@ */ class NodeNewComments extends Numeric { - public function construct() { - parent::construct(); + /** + * Constructs a NodeNewComments object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->additional_fields['nid'] = 'nid'; $this->additional_fields['type'] = 'type'; $this->additional_fields['comment_count'] = array('table' => 'node_comment_statistics', 'field' => 'comment_count'); diff --git a/lib/Views/filter/Plugin/views/field/FormatName.php b/lib/Views/filter/Plugin/views/field/FormatName.php index 0c26092fd5..18c1afbe98 100644 --- a/lib/Views/filter/Plugin/views/field/FormatName.php +++ b/lib/Views/filter/Plugin/views/field/FormatName.php @@ -9,6 +9,7 @@ use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Field handler to output the name of an input format. @@ -22,8 +23,12 @@ */ class FormatName extends FieldPluginBase { - public function construct() { - parent::construct(); + /** + * Constructs a FormatName object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + // Be explicit about the table we are using. $this->additional_fields['name'] = array('table' => 'filter_formats', 'field' => 'name'); } diff --git a/lib/Views/locale/Plugin/views/field/LinkEdit.php b/lib/Views/locale/Plugin/views/field/LinkEdit.php index 2fe9a7aa4b..afc3eeb882 100644 --- a/lib/Views/locale/Plugin/views/field/LinkEdit.php +++ b/lib/Views/locale/Plugin/views/field/LinkEdit.php @@ -9,6 +9,7 @@ use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Field handler to present a link to edit a translation. @@ -22,8 +23,12 @@ */ class LinkEdit extends FieldPluginBase { - public function construct() { - parent::construct(); + /** + * Constructs a LinkEdit object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->additional_fields['lid'] = 'lid'; } diff --git a/lib/Views/node/Plugin/views/argument/CreatedDay.php b/lib/Views/node/Plugin/views/argument/CreatedDay.php index 4dee19c8ef..2d2b7cc884 100644 --- a/lib/Views/node/Plugin/views/argument/CreatedDay.php +++ b/lib/Views/node/Plugin/views/argument/CreatedDay.php @@ -9,6 +9,7 @@ use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Argument handler for a day (DD) @@ -21,10 +22,11 @@ class CreatedDay extends Date { /** - * Constructor implementation + * Constructs a CreatedDay object. */ - public function construct() { - parent::construct(); + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->formula = views_date_sql_extract('DAY', "***table***.$this->realField"); $this->format = 'j'; $this->arg_format = 'd'; diff --git a/lib/Views/node/Plugin/views/argument/CreatedFullDate.php b/lib/Views/node/Plugin/views/argument/CreatedFullDate.php index 57caafb896..934b67ea9b 100644 --- a/lib/Views/node/Plugin/views/argument/CreatedFullDate.php +++ b/lib/Views/node/Plugin/views/argument/CreatedFullDate.php @@ -9,6 +9,7 @@ use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Argument handler for a full date (CCYYMMDD) @@ -21,10 +22,11 @@ class CreatedFullDate extends Date { /** - * Constructor implementation + * Constructs a CreatedFullDate object. */ - public function construct() { - parent::construct(); + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->format = 'F j, Y'; $this->arg_format = 'Ymd'; $this->formula = views_date_sql_format($this->arg_format, "***table***.$this->realField"); diff --git a/lib/Views/node/Plugin/views/argument/CreatedMonth.php b/lib/Views/node/Plugin/views/argument/CreatedMonth.php index 3eb5b9dddb..ed51d20807 100644 --- a/lib/Views/node/Plugin/views/argument/CreatedMonth.php +++ b/lib/Views/node/Plugin/views/argument/CreatedMonth.php @@ -9,6 +9,7 @@ use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Argument handler for a month (MM) @@ -21,10 +22,11 @@ class CreatedMonth extends Date { /** - * Constructor implementation + * Constructs a CreatedMonth object. */ - public function construct() { - parent::construct(); + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->formula = views_date_sql_extract('MONTH', "***table***.$this->realField"); $this->format = 'F'; $this->arg_format = 'm'; diff --git a/lib/Views/node/Plugin/views/argument/CreatedWeek.php b/lib/Views/node/Plugin/views/argument/CreatedWeek.php index 9e1f4656f6..9e5475848e 100644 --- a/lib/Views/node/Plugin/views/argument/CreatedWeek.php +++ b/lib/Views/node/Plugin/views/argument/CreatedWeek.php @@ -9,6 +9,7 @@ use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Argument handler for a week. @@ -21,10 +22,11 @@ class CreatedWeek extends Date { /** - * Constructor implementation + * Constructs a CreatedWeek object. */ - public function construct() { - parent::construct(); + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->arg_format = 'w'; $this->formula = views_date_sql_extract('WEEK', "***table***.$this->realField"); } diff --git a/lib/Views/node/Plugin/views/argument/CreatedYear.php b/lib/Views/node/Plugin/views/argument/CreatedYear.php index fc0b56450d..55d4cf7790 100644 --- a/lib/Views/node/Plugin/views/argument/CreatedYear.php +++ b/lib/Views/node/Plugin/views/argument/CreatedYear.php @@ -9,6 +9,7 @@ use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Argument handler for a year (CCYY) @@ -21,10 +22,11 @@ class CreatedYear extends Date { /** - * Constructor implementation + * Constructs a CreatedYear object. */ - public function construct() { - parent::construct(); + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->arg_format = 'Y'; $this->formula = views_date_sql_extract('YEAR', "***table***.$this->realField"); } diff --git a/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php b/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php index 79aa3a4b02..758f3d78b2 100644 --- a/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php +++ b/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php @@ -9,6 +9,7 @@ use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Argument handler for a year plus month (CCYYMM) @@ -21,10 +22,11 @@ class CreatedYearMonth extends Date { /** - * Constructor implementation + * Constructs a CreatedYearMonth object. */ - public function construct() { - parent::construct(); + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->format = 'F Y'; $this->arg_format = 'Ym'; $this->formula = views_date_sql_format($this->arg_format, "***table***.$this->realField"); diff --git a/lib/Views/node/Plugin/views/argument/Type.php b/lib/Views/node/Plugin/views/argument/Type.php index 370fa0206f..092bb23387 100644 --- a/lib/Views/node/Plugin/views/argument/Type.php +++ b/lib/Views/node/Plugin/views/argument/Type.php @@ -20,10 +20,6 @@ */ class Type extends String { - public function construct() { - parent::construct('type'); - } - /** * Override the behavior of summary_name(). Get the user friendly version * of the node type. diff --git a/lib/Views/node/Plugin/views/field/Path.php b/lib/Views/node/Plugin/views/field/Path.php index 3f95eb38d2..8cb2bf666c 100644 --- a/lib/Views/node/Plugin/views/field/Path.php +++ b/lib/Views/node/Plugin/views/field/Path.php @@ -9,6 +9,7 @@ use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Field handler to present the path to the node. @@ -22,6 +23,15 @@ */ class Path extends FieldPluginBase { + /** + * Constructs a Path object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + + $this->additional_fields['nid'] = 'nid'; + } + protected function defineOptions() { $options = parent::defineOptions(); $options['absolute'] = array('default' => FALSE, 'bool' => TRUE); @@ -29,11 +39,6 @@ protected function defineOptions() { return $options; } - public function construct() { - parent::construct(); - $this->additional_fields['nid'] = 'nid'; - } - public function buildOptionsForm(&$form, &$form_state) { parent::buildOptionsForm($form, $form_state); $form['absolute'] = array( diff --git a/lib/Views/node/Plugin/views/field/RevisionLink.php b/lib/Views/node/Plugin/views/field/RevisionLink.php index bd892df982..a8aaceb989 100644 --- a/lib/Views/node/Plugin/views/field/RevisionLink.php +++ b/lib/Views/node/Plugin/views/field/RevisionLink.php @@ -9,6 +9,7 @@ use Views\node\Plugin\views\field\Link; use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Field handler to present a link to a node revision. @@ -22,8 +23,12 @@ */ class RevisionLink extends Link { - public function construct() { - parent::construct(); + /** + * Constructs a RevisionLink object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->additional_fields['node_vid'] = array('table' => 'node_revision', 'field' => 'vid'); } diff --git a/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php b/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php index e6ddf1db1f..a6b3c4079f 100644 --- a/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php +++ b/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php @@ -9,6 +9,7 @@ use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Field handler to present a term edit link. @@ -22,8 +23,12 @@ */ class LinkEdit extends FieldPluginBase { - public function construct() { - parent::construct(); + /** + * Constructs a LinkEdit object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->additional_fields['tid'] = 'tid'; $this->additional_fields['vid'] = 'vid'; $this->additional_fields['vocabulary_machine_name'] = array( diff --git a/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php b/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php index e5595f135f..74f8552881 100644 --- a/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php +++ b/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php @@ -9,6 +9,7 @@ use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface;; /** * Field handler to provide simple renderer that allows linking to a taxonomy @@ -26,13 +27,14 @@ class Taxonomy extends FieldPluginBase { /** - * Constructor to provide additional field to add. + * Constructs a Taxonomy object. * * This constructer assumes the taxonomy_term_data table. If using another * table, we'll need to be more specific. */ - public function construct() { - parent::construct(); + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->additional_fields['vid'] = 'vid'; $this->additional_fields['tid'] = 'tid'; $this->additional_fields['vocabulary_machine_name'] = array( diff --git a/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php b/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php index ac82893d74..4ecd288666 100644 --- a/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php +++ b/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php @@ -9,6 +9,7 @@ use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Field handler to present a link to the node. @@ -22,8 +23,12 @@ */ class NodeTranslationLink extends FieldPluginBase { - public function construct() { - parent::construct(); + /** + * Constructs a NodeTranslationLink object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->additional_fields['nid'] = 'nid'; $this->additional_fields['tnid'] = 'tnid'; $this->additional_fields['title'] = 'title'; diff --git a/lib/Views/user/Plugin/views/field/Link.php b/lib/Views/user/Plugin/views/field/Link.php index ea42fe67f9..c310e9155e 100644 --- a/lib/Views/user/Plugin/views/field/Link.php +++ b/lib/Views/user/Plugin/views/field/Link.php @@ -9,6 +9,7 @@ use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Field handler to present a link to the user. @@ -22,8 +23,12 @@ */ class Link extends FieldPluginBase { - public function construct() { - parent::construct(); + /** + * Constructs a Link object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->additional_fields['uid'] = 'uid'; } diff --git a/lib/Views/user/Plugin/views/field/Permissions.php b/lib/Views/user/Plugin/views/field/Permissions.php index 08ab1332d4..4036520d33 100644 --- a/lib/Views/user/Plugin/views/field/Permissions.php +++ b/lib/Views/user/Plugin/views/field/Permissions.php @@ -9,6 +9,7 @@ use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\field\PrerenderList; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Field handler to provide a list of permissions. @@ -22,8 +23,12 @@ */ class Permissions extends PrerenderList { - public function construct() { - parent::construct(); + /** + * Constructs a Permissions object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->additional_fields['uid'] = array('table' => 'users', 'field' => 'uid'); } diff --git a/lib/Views/user/Plugin/views/field/Picture.php b/lib/Views/user/Plugin/views/field/Picture.php index 9242f00552..764f1d7a78 100644 --- a/lib/Views/user/Plugin/views/field/Picture.php +++ b/lib/Views/user/Plugin/views/field/Picture.php @@ -9,6 +9,7 @@ use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\field\FieldPluginBase; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Field handler to provide simple renderer that allows using a themed user link. @@ -22,8 +23,12 @@ */ class Picture extends FieldPluginBase { - public function construct() { - parent::construct(); + /** + * Constructs a Picture object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->additional_fields['uid'] = 'uid'; $this->additional_fields['name'] = 'name'; $this->additional_fields['mail'] = 'mail'; diff --git a/lib/Views/user/Plugin/views/field/Roles.php b/lib/Views/user/Plugin/views/field/Roles.php index 058bb60186..95afc28864 100644 --- a/lib/Views/user/Plugin/views/field/Roles.php +++ b/lib/Views/user/Plugin/views/field/Roles.php @@ -9,6 +9,7 @@ use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\field\PrerenderList; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Field handler to provide a list of roles. @@ -22,8 +23,12 @@ */ class Roles extends PrerenderList { - public function construct() { - parent::construct(); + /** + * Constructs a Roles object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->additional_fields['uid'] = array('table' => 'users', 'field' => 'uid'); } diff --git a/lib/Views/user/Plugin/views/filter/Current.php b/lib/Views/user/Plugin/views/filter/Current.php index fc9fe68dc9..48ffcaf891 100644 --- a/lib/Views/user/Plugin/views/filter/Current.php +++ b/lib/Views/user/Plugin/views/filter/Current.php @@ -9,6 +9,7 @@ use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\filter\BooleanOperator; +use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** * Filter handler for the current user. @@ -22,8 +23,12 @@ */ class Current extends BooleanOperator { - public function construct() { - parent::construct(); + /** + * Constructs a Current object. + */ + public function __construct(array $configuration, $plugin_id, DiscoveryInterface $discovery) { + parent::__construct($configuration, $plugin_id, $discovery); + $this->value_value = t('Is the logged in user'); } -- GitLab