From 45768154351b29168cfd751287afa65bd31b081a Mon Sep 17 00:00:00 2001
From: Daniel Wehner <daniel.wehner@erdfisch.de>
Date: Fri, 27 Jul 2012 10:08:31 -0500
Subject: [PATCH] use the right base class for all handlers
---
lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php | 5 +++--
.../views_handler_argument_aggregator_category_cid.inc | 4 +++-
modules/aggregator/views_handler_argument_aggregator_fid.inc | 4 +++-
modules/aggregator/views_handler_argument_aggregator_iid.inc | 4 +++-
.../aggregator/views_handler_field_aggregator_category.inc | 4 +++-
.../aggregator/views_handler_field_aggregator_title_link.inc | 4 +++-
modules/aggregator/views_handler_field_aggregator_xss.inc | 4 +++-
.../views_handler_filter_aggregator_category_cid.inc | 4 +++-
modules/aggregator/views_plugin_row_aggregator_rss.inc | 4 +++-
modules/book/views_plugin_argument_default_book_root.inc | 4 +++-
modules/comment/views_handler_field_comment.inc | 4 +++-
modules/comment/views_handler_field_node_comment.inc | 4 +++-
modules/comment/views_handler_field_node_new_comments.inc | 4 +++-
modules/comment/views_handler_filter_ncs_last_updated.inc | 4 +++-
modules/comment/views_handler_filter_node_comment.inc | 4 +++-
modules/comment/views_handler_sort_comment_thread.inc | 4 +++-
modules/comment/views_handler_sort_ncs_last_comment_name.inc | 4 +++-
modules/comment/views_handler_sort_ncs_last_updated.inc | 5 ++++-
modules/comment/views_plugin_row_comment_rss.inc | 4 +++-
modules/comment/views_plugin_row_comment_view.inc | 4 +++-
modules/field/views_handler_argument_field_list.inc | 4 +++-
modules/field/views_handler_argument_field_list_string.inc | 5 ++++-
modules/field/views_handler_field_field.inc | 4 +++-
modules/field/views_handler_filter_field_list.inc | 4 +++-
modules/field/views_handler_relationship_entity_reverse.inc | 3 ++-
modules/locale/views_handler_filter_locale_group.inc | 4 +++-
modules/locale/views_handler_filter_locale_language.inc | 4 +++-
modules/locale/views_handler_filter_locale_version.inc | 4 +++-
modules/locale/views_handler_filter_node_language.inc | 4 +++-
modules/node.views.inc | 4 ++--
modules/search/views_handler_argument_search.inc | 1 +
modules/search/views_handler_field_search_score.inc | 4 +++-
modules/search/views_handler_filter_search.inc | 3 ++-
modules/search/views_handler_sort_search_score.inc | 4 +++-
modules/search/views_plugin_row_search_view.inc | 4 +++-
modules/statistics/views_handler_field_accesslog_path.inc | 4 +++-
.../views_handler_argument_vocabulary_machine_name.inc | 4 +++-
modules/taxonomy/views_handler_argument_vocabulary_vid.inc | 4 +++-
modules/user/views_handler_argument_user_uid.inc | 4 +++-
modules/user/views_handler_argument_users_roles_rid.inc | 4 +++-
modules/user/views_handler_field_user_picture.inc | 4 +++-
modules/user/views_handler_field_user_roles.inc | 4 +++-
modules/user/views_handler_filter_user_current.inc | 4 +++-
modules/user/views_handler_filter_user_name.inc | 4 +++-
modules/user/views_handler_filter_user_permissions.inc | 4 +++-
modules/user/views_handler_filter_user_roles.inc | 4 +++-
modules/user/views_plugin_argument_default_current_user.inc | 4 +++-
modules/user/views_plugin_argument_default_user.inc | 4 +++-
modules/user/views_plugin_argument_validate_user.inc | 4 +++-
modules/user/views_plugin_row_user_view.inc | 4 +++-
50 files changed, 147 insertions(+), 51 deletions(-)
diff --git a/lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php b/lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php
index 4b31d55361dd..dddfb55d7b47 100644
--- a/lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php
@@ -8,6 +8,7 @@
namespace Drupal\views\Plugins\views\filter;
use Drupal\views\Plugins\views\Plugin;
+use Drupal\views\Plugins\views\Handler;
/**
* @defgroup views_filter_handlers Views filter handlers
@@ -35,7 +36,7 @@
*
* @ingroup views_filter_handlers
*/
-class FilterPluginBase extends Plugin {
+class FilterPluginBase extends Handler {
/**
* Contains the actual value of the field,either configured in the views ui
* or entered in the exposed filters.
@@ -723,7 +724,7 @@ function can_group() {
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_broken extends views_handler_filter {
+class views_handler_filter_broken extends FilterPluginBase {
function ui_name($short = FALSE) {
return t('Broken/missing handler');
}
diff --git a/modules/aggregator/views_handler_argument_aggregator_category_cid.inc b/modules/aggregator/views_handler_argument_aggregator_category_cid.inc
index 92ae8b7f29dd..08865175858e 100644
--- a/modules/aggregator/views_handler_argument_aggregator_category_cid.inc
+++ b/modules/aggregator/views_handler_argument_aggregator_category_cid.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_argument_aggregator_category_cid.
*/
+use Drupal\views\Plugins\views\argument\Numeric;
+
/**
* Argument handler to accept an aggregator category id.
*
* @ingroup views_argument_handlers
*/
-class views_handler_argument_aggregator_category_cid extends views_handler_argument_numeric {
+class views_handler_argument_aggregator_category_cid extends Numeric {
/**
* Override the behavior of title(). Get the title of the category.
*/
diff --git a/modules/aggregator/views_handler_argument_aggregator_fid.inc b/modules/aggregator/views_handler_argument_aggregator_fid.inc
index 4147626880f7..99a1f05c4a80 100644
--- a/modules/aggregator/views_handler_argument_aggregator_fid.inc
+++ b/modules/aggregator/views_handler_argument_aggregator_fid.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_argument_aggregator_fid.
*/
+use Drupal\views\Plugins\views\argument\Numeric;
+
/**
* Argument handler to accept an aggregator feed id.
*
* @ingroup views_argument_handlers
*/
-class views_handler_argument_aggregator_fid extends views_handler_argument_numeric {
+class views_handler_argument_aggregator_fid extends Numeric {
/**
* Override the behavior of title(). Get the title of the feed.
*/
diff --git a/modules/aggregator/views_handler_argument_aggregator_iid.inc b/modules/aggregator/views_handler_argument_aggregator_iid.inc
index d959b0424c40..659ceb633586 100644
--- a/modules/aggregator/views_handler_argument_aggregator_iid.inc
+++ b/modules/aggregator/views_handler_argument_aggregator_iid.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_argument_aggregator_iid.
*/
+use Drupal\views\Plugins\views\argument\Numeric;
+
/**
* Argument handler to accept an aggregator item id.
*
* @ingroup views_argument_handlers
*/
-class views_handler_argument_aggregator_iid extends views_handler_argument_numeric {
+class views_handler_argument_aggregator_iid extends Numeric {
/**
* Override the behavior of title(). Get the title of the category.
*/
diff --git a/modules/aggregator/views_handler_field_aggregator_category.inc b/modules/aggregator/views_handler_field_aggregator_category.inc
index 99fffa1eaa8c..6d308e32fa27 100644
--- a/modules/aggregator/views_handler_field_aggregator_category.inc
+++ b/modules/aggregator/views_handler_field_aggregator_category.inc
@@ -5,13 +5,15 @@
* Definition of views_handler_field_aggregator_category.
*/
+use Drupal\views\Plugins\views\field\FieldPluginBase;
+
/**
* Field handler to provide simple renderer that allows linking to aggregator
* category.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_aggregator_category extends views_handler_field {
+class views_handler_field_aggregator_category extends FieldPluginBase {
/**
* Constructor to provide additional field to add.
*/
diff --git a/modules/aggregator/views_handler_field_aggregator_title_link.inc b/modules/aggregator/views_handler_field_aggregator_title_link.inc
index d8bf5789bf63..bfbcc1a4c653 100644
--- a/modules/aggregator/views_handler_field_aggregator_title_link.inc
+++ b/modules/aggregator/views_handler_field_aggregator_title_link.inc
@@ -5,13 +5,15 @@
* Definition of views_handler_field_aggregator_title_link.
*/
+use Drupal\views\Plugins\views\field\FieldPluginBase;
+
/**
* Field handler that turns an item's title into a clickable link to the original
* source article.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_aggregator_title_link extends views_handler_field {
+class views_handler_field_aggregator_title_link extends FieldPluginBase {
function construct() {
parent::construct();
$this->additional_fields['link'] = 'link';
diff --git a/modules/aggregator/views_handler_field_aggregator_xss.inc b/modules/aggregator/views_handler_field_aggregator_xss.inc
index d39b1013222e..eae41b1db960 100644
--- a/modules/aggregator/views_handler_field_aggregator_xss.inc
+++ b/modules/aggregator/views_handler_field_aggregator_xss.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_field_aggregator_xss.
*/
+use Drupal\views\Plugins\views\field\FieldPluginBase;
+
/**
* Filters htmls tags from item.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_aggregator_xss extends views_handler_field {
+class views_handler_field_aggregator_xss extends FieldPluginBase {
function render($values) {
$value = $this->get_value($values);
return aggregator_filter_xss($value);
diff --git a/modules/aggregator/views_handler_filter_aggregator_category_cid.inc b/modules/aggregator/views_handler_filter_aggregator_category_cid.inc
index f9931c8f3a47..e0b5921585d5 100644
--- a/modules/aggregator/views_handler_filter_aggregator_category_cid.inc
+++ b/modules/aggregator/views_handler_filter_aggregator_category_cid.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_filter_aggregator_category_cid.
*/
+use Drupal\views\Plugins\views\filter\InOperator;
+
/**
* Filter by aggregator category cid
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_aggregator_category_cid extends views_handler_filter_in_operator {
+class views_handler_filter_aggregator_category_cid extends InOperator {
function get_value_options() {
if (isset($this->value_options)) {
return;
diff --git a/modules/aggregator/views_plugin_row_aggregator_rss.inc b/modules/aggregator/views_plugin_row_aggregator_rss.inc
index 672952e0bef0..e53781bbcaff 100644
--- a/modules/aggregator/views_plugin_row_aggregator_rss.inc
+++ b/modules/aggregator/views_plugin_row_aggregator_rss.inc
@@ -5,10 +5,12 @@
* Contains the Aggregator Item RSS row style plugin.
*/
+use Drupal\views\Plugins\views\row\RowPluginBase;
+
/**
* Plugin which loads an aggregator item and formats it as an RSS item.
*/
-class views_plugin_row_aggregator_rss extends views_plugin_row {
+class views_plugin_row_aggregator_rss extends RowPluginBase {
var $base_table = 'aggregator_item';
var $base_field = 'iid';
diff --git a/modules/book/views_plugin_argument_default_book_root.inc b/modules/book/views_plugin_argument_default_book_root.inc
index 1ce30467fa65..22e14f7a3822 100644
--- a/modules/book/views_plugin_argument_default_book_root.inc
+++ b/modules/book/views_plugin_argument_default_book_root.inc
@@ -4,10 +4,12 @@
* Contains the book root from current node argument default plugin.
*/
+use Drupal\views\Plugins\views\argument_default\Node;
+
/**
* Default argument plugin to get the current node's book root.
*/
-class views_plugin_argument_default_book_root extends views_plugin_argument_default_node {
+class views_plugin_argument_default_book_root extends Node {
function get_argument() {
// Use the argument_default_node plugin to get the nid argument.
$nid = parent::get_argument();
diff --git a/modules/comment/views_handler_field_comment.inc b/modules/comment/views_handler_field_comment.inc
index cef33e5e2a1a..17fcb264bf81 100644
--- a/modules/comment/views_handler_field_comment.inc
+++ b/modules/comment/views_handler_field_comment.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_field_comment.
*/
+use Drupal\views\Plugins\views\field\FieldPluginBase;
+
/**
* Field handler to allow linking to a comment.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_comment extends views_handler_field {
+class views_handler_field_comment extends FieldPluginBase {
/**
* Override init function to provide generic option to link to comment.
*/
diff --git a/modules/comment/views_handler_field_node_comment.inc b/modules/comment/views_handler_field_node_comment.inc
index d863c4477660..09b9f7be83a2 100644
--- a/modules/comment/views_handler_field_node_comment.inc
+++ b/modules/comment/views_handler_field_node_comment.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_field_node_comment.
*/
+use Drupal\views\Plugins\views\field\FieldPluginBase;
+
/**
* Display node comment status.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_node_comment extends views_handler_field {
+class views_handler_field_node_comment extends FieldPluginBase {
function render($values) {
$value = $this->get_value($values);
switch ($value) {
diff --git a/modules/comment/views_handler_field_node_new_comments.inc b/modules/comment/views_handler_field_node_new_comments.inc
index 620304830653..861dca826bd1 100644
--- a/modules/comment/views_handler_field_node_new_comments.inc
+++ b/modules/comment/views_handler_field_node_new_comments.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_field_node_new_comments.
*/
+use Drupal\views\Plugins\views\field\Numeric;
+
/**
* Field handler to display the number of new comments.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_node_new_comments extends views_handler_field_numeric {
+class views_handler_field_node_new_comments extends Numeric {
function init(&$view, &$options) {
parent::init($view, $options);
diff --git a/modules/comment/views_handler_filter_ncs_last_updated.inc b/modules/comment/views_handler_filter_ncs_last_updated.inc
index 2319edffd94e..45f48758f161 100644
--- a/modules/comment/views_handler_filter_ncs_last_updated.inc
+++ b/modules/comment/views_handler_filter_ncs_last_updated.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_filter_ncs_last_updated.
*/
+use Drupal\views\Plugins\views\filter\Date;
+
/**
* Filter handler for the newer of last comment / node updated.
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_ncs_last_updated extends views_handler_filter_date {
+class views_handler_filter_ncs_last_updated extends Date {
function query() {
$this->ensure_my_table();
$this->node_table = $this->query->ensure_table('node', $this->relationship);
diff --git a/modules/comment/views_handler_filter_node_comment.inc b/modules/comment/views_handler_filter_node_comment.inc
index befce107bfa9..d5a9ca3ae3eb 100644
--- a/modules/comment/views_handler_filter_node_comment.inc
+++ b/modules/comment/views_handler_filter_node_comment.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_filter_node_comment.
*/
+use Drupal\views\Plugins\views\filter\InOperator;
+
/**
* Filter based on comment node status.
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_node_comment extends views_handler_filter_in_operator {
+class views_handler_filter_node_comment extends InOperator {
function get_value_options() {
$this->value_options = array(
COMMENT_NODE_HIDDEN => t('Hidden'),
diff --git a/modules/comment/views_handler_sort_comment_thread.inc b/modules/comment/views_handler_sort_comment_thread.inc
index e513a93e8d0c..46fedc7947a3 100644
--- a/modules/comment/views_handler_sort_comment_thread.inc
+++ b/modules/comment/views_handler_sort_comment_thread.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_sort_comment_thread.
*/
+use Drupal\views\Plugins\views\sort\SortPluginBase;
+
/**
* Sort handler for ordering by thread.
*
* @ingroup views_sort_handlers
*/
-class views_handler_sort_comment_thread extends views_handler_sort {
+class views_handler_sort_comment_thread extends SortPluginBase {
function query() {
$this->ensure_my_table();
diff --git a/modules/comment/views_handler_sort_ncs_last_comment_name.inc b/modules/comment/views_handler_sort_ncs_last_comment_name.inc
index 31ea6bf66d32..38144d75fb6e 100644
--- a/modules/comment/views_handler_sort_ncs_last_comment_name.inc
+++ b/modules/comment/views_handler_sort_ncs_last_comment_name.inc
@@ -6,6 +6,8 @@
*/
use Drupal\views\Join;
+use Drupal\views\Plugins\views\sort\SortPluginBase;
+
/**
* Sort handler to sort by last comment name which might be in 2 different
@@ -13,7 +15,7 @@
*
* @ingroup views_sort_handlers
*/
-class views_handler_sort_ncs_last_comment_name extends views_handler_sort {
+class views_handler_sort_ncs_last_comment_name extends SortPluginBase {
function query() {
$this->ensure_my_table();
$join = new Join();
diff --git a/modules/comment/views_handler_sort_ncs_last_updated.inc b/modules/comment/views_handler_sort_ncs_last_updated.inc
index 83f0f5474a60..a3290a5628d0 100644
--- a/modules/comment/views_handler_sort_ncs_last_updated.inc
+++ b/modules/comment/views_handler_sort_ncs_last_updated.inc
@@ -5,12 +5,15 @@
* Definition of views_handler_sort_ncs_last_updated.
*/
+use Drupal\views\Plugins\views\sort\Date;
+
+
/**
* Sort handler for the newer of last comment / node updated.
*
* @ingroup views_sort_handlers
*/
-class views_handler_sort_ncs_last_updated extends views_handler_sort_date {
+class views_handler_sort_ncs_last_updated extends Date {
function query() {
$this->ensure_my_table();
$this->node_table = $this->query->ensure_table('node', $this->relationship);
diff --git a/modules/comment/views_plugin_row_comment_rss.inc b/modules/comment/views_plugin_row_comment_rss.inc
index 69c4cb450e43..0e096cd33dd3 100644
--- a/modules/comment/views_plugin_row_comment_rss.inc
+++ b/modules/comment/views_plugin_row_comment_rss.inc
@@ -5,10 +5,12 @@
* Contains the comment RSS row style plugin.
*/
+use Drupal\views\Plugins\views\row\RowPluginBase;
+
/**
* Plugin which formats the comments as RSS items.
*/
-class views_plugin_row_comment_rss extends views_plugin_row {
+class views_plugin_row_comment_rss extends RowPluginBase {
var $base_table = 'comment';
var $base_field = 'cid';
diff --git a/modules/comment/views_plugin_row_comment_view.inc b/modules/comment/views_plugin_row_comment_view.inc
index f78fa3667292..c53602f05171 100644
--- a/modules/comment/views_plugin_row_comment_view.inc
+++ b/modules/comment/views_plugin_row_comment_view.inc
@@ -5,10 +5,12 @@
* Contains the node RSS row style plugin.
*/
+use Drupal\views\Plugins\views\row\RowPluginBase;
+
/**
* Plugin which performs a comment_view on the resulting object.
*/
-class views_plugin_row_comment_view extends views_plugin_row {
+class views_plugin_row_comment_view extends RowPluginBase {
var $base_field = 'cid';
var $base_table = 'comment';
diff --git a/modules/field/views_handler_argument_field_list.inc b/modules/field/views_handler_argument_field_list.inc
index 965bd1857bf7..0acf14a5c99f 100644
--- a/modules/field/views_handler_argument_field_list.inc
+++ b/modules/field/views_handler_argument_field_list.inc
@@ -5,13 +5,15 @@
* Definition of views_handler_argument_field_list.
*/
+use Drupal\views\Plugins\views\argument\Numeric;
+
/**
* Argument handler for list field to show the human readable name in the
* summary.
*
* @ingroup views_argument_handlers
*/
-class views_handler_argument_field_list extends views_handler_argument_numeric {
+class views_handler_argument_field_list extends Numeric {
/**
* Stores the allowed values of this field.
*
diff --git a/modules/field/views_handler_argument_field_list_string.inc b/modules/field/views_handler_argument_field_list_string.inc
index c3537f33c159..e35e5e413196 100644
--- a/modules/field/views_handler_argument_field_list_string.inc
+++ b/modules/field/views_handler_argument_field_list_string.inc
@@ -5,13 +5,16 @@
* Definition of views_handler_argument_field_list_text.
*/
+use Drupal\views\Plugins\views\argument\String;
+
+
/**
* Argument handler for list field to show the human readable name in the
* summary.
*
* @ingroup views_argument_handlers
*/
-class views_handler_argument_field_list_string extends views_handler_argument_string {
+class views_handler_argument_field_list_string extends String {
/**
* Stores the allowed values of this field.
*
diff --git a/modules/field/views_handler_field_field.inc b/modules/field/views_handler_field_field.inc
index 0444f26e3183..038736647395 100644
--- a/modules/field/views_handler_field_field.inc
+++ b/modules/field/views_handler_field_field.inc
@@ -5,6 +5,8 @@
* Definition of views_handler_field_field.
*/
+use Drupal\views\Plugins\views\field\FieldPluginBase;
+
/**
* Helper function: Return an array of formatter options for a field type.
*
@@ -37,7 +39,7 @@ function _field_view_formatter_options($field_type = NULL) {
*
* @ingroup views_field_handlers
*/
-class views_handler_field_field extends views_handler_field {
+class views_handler_field_field extends FieldPluginBase {
/**
* An array to store field renderable arrays for use by render_items.
* @var array
diff --git a/modules/field/views_handler_filter_field_list.inc b/modules/field/views_handler_filter_field_list.inc
index b955e70f25ef..bc0130d99af4 100644
--- a/modules/field/views_handler_filter_field_list.inc
+++ b/modules/field/views_handler_filter_field_list.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_filter_field_list.
*/
+use Drupal\views\Plugins\views\filter\InOperator;
+
/**
* Filter handler which uses list-fields as options.
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_field_list extends views_handler_filter_in_operator {
+class views_handler_filter_field_list extends InOperator {
function get_value_options() {
$field = field_info_field($this->definition['field_name']);
$this->value_options = list_allowed_values($field);
diff --git a/modules/field/views_handler_relationship_entity_reverse.inc b/modules/field/views_handler_relationship_entity_reverse.inc
index 50ffcbcca3e1..90c3e02e9334 100644
--- a/modules/field/views_handler_relationship_entity_reverse.inc
+++ b/modules/field/views_handler_relationship_entity_reverse.inc
@@ -6,13 +6,14 @@
*/
use Drupal\views\Join;
+use Drupal\views\Plugins\views\relationship\RelationshipPluginBase;
/**
* A relationship handlers which reverse entity references.
*
* @ingroup views_relationship_handlers
*/
-class views_handler_relationship_entity_reverse extends views_handler_relationship {
+class views_handler_relationship_entity_reverse extends RelationshipPluginBase {
function init(&$view, &$options) {
parent::init($view, $options);
diff --git a/modules/locale/views_handler_filter_locale_group.inc b/modules/locale/views_handler_filter_locale_group.inc
index 5ec1e920bbda..ba9613223e9d 100644
--- a/modules/locale/views_handler_filter_locale_group.inc
+++ b/modules/locale/views_handler_filter_locale_group.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_filter_locale_group.
*/
+use Drupal\views\Plugins\views\filter\InOperator;
+
/**
* Filter by locale group.
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_locale_group extends views_handler_filter_in_operator {
+class views_handler_filter_locale_group extends InOperator {
function get_value_options() {
if (!isset($this->value_options)) {
$this->value_title = t('Group');
diff --git a/modules/locale/views_handler_filter_locale_language.inc b/modules/locale/views_handler_filter_locale_language.inc
index 6ad1a0385a8b..9725a3135fb1 100644
--- a/modules/locale/views_handler_filter_locale_language.inc
+++ b/modules/locale/views_handler_filter_locale_language.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_filter_locale_language.
*/
+use Drupal\views\Plugins\views\filter\InOperator;
+
/**
* Filter by language.
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_locale_language extends views_handler_filter_in_operator {
+class views_handler_filter_locale_language extends InOperator {
function get_value_options() {
if (!isset($this->value_options)) {
$this->value_title = t('Language');
diff --git a/modules/locale/views_handler_filter_locale_version.inc b/modules/locale/views_handler_filter_locale_version.inc
index 717086081946..d5c1f019b15f 100644
--- a/modules/locale/views_handler_filter_locale_version.inc
+++ b/modules/locale/views_handler_filter_locale_version.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_filter_locale_version.
*/
+use Drupal\views\Plugins\views\filter\InOperator;
+
/**
* Filter by version.
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_locale_version extends views_handler_filter_in_operator {
+class views_handler_filter_locale_version extends InOperator {
function get_value_options() {
if (!isset($this->value_options)) {
$this->value_title = t('Version');
diff --git a/modules/locale/views_handler_filter_node_language.inc b/modules/locale/views_handler_filter_node_language.inc
index aaf283c2a757..bff9f6495e8e 100644
--- a/modules/locale/views_handler_filter_node_language.inc
+++ b/modules/locale/views_handler_filter_node_language.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_filter_node_language.
*/
+use Drupal\views\Plugins\views\filter\InOperator;
+
/**
* Filter by language.
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_node_language extends views_handler_filter_in_operator {
+class views_handler_filter_node_language extends InOperator {
function get_value_options() {
if (!isset($this->value_options)) {
$this->value_title = t('Language');
diff --git a/modules/node.views.inc b/modules/node.views.inc
index 4bdbac453bc6..999cb7b63f2c 100644
--- a/modules/node.views.inc
+++ b/modules/node.views.inc
@@ -182,14 +182,14 @@ function node_views_data() {
'title' => t('Promoted to front page'),
'help' => t('Whether or not the content is promoted to the front page.'),
'field' => array(
- 'handler' => 'views_handler_field_boolean',
+ 'handler' => 'Drupal\views\Plugins\views\field\Boolean',
'click sortable' => TRUE,
'output formats' => array(
'promoted-notpromoted' => array(t('Promoted'), t('Not promoted')),
),
),
'filter' => array(
- 'handler' => 'views_handler_filter_boolean_operator',
+ 'handler' => 'Drupal\views\Plugins\views\filter\BooleanOperator',
'label' => t('Promoted to front page'),
'type' => 'yes-no',
),
diff --git a/modules/search/views_handler_argument_search.inc b/modules/search/views_handler_argument_search.inc
index 6a43595376b5..64175e500b74 100644
--- a/modules/search/views_handler_argument_search.inc
+++ b/modules/search/views_handler_argument_search.inc
@@ -6,6 +6,7 @@
*/
use Drupal\views\Join;
+use Drupal\views\Plugins\views\argument\ArgumentPluginBase;
/**
* Argument that accepts query keys for search.
diff --git a/modules/search/views_handler_field_search_score.inc b/modules/search/views_handler_field_search_score.inc
index 0feddac61cf0..97a25c0d33f8 100644
--- a/modules/search/views_handler_field_search_score.inc
+++ b/modules/search/views_handler_field_search_score.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_field_search_score.
*/
+use Drupal\views\Plugins\views\field\Numeric;
+
/**
* Field handler to provide simple renderer that allows linking to a node.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_search_score extends views_handler_field_numeric {
+class views_handler_field_search_score extends Numeric {
function option_definition() {
$options = parent::option_definition();
diff --git a/modules/search/views_handler_filter_search.inc b/modules/search/views_handler_filter_search.inc
index d9292eba42b4..5974399011ed 100644
--- a/modules/search/views_handler_filter_search.inc
+++ b/modules/search/views_handler_filter_search.inc
@@ -7,13 +7,14 @@
use Drupal\views\Join;
use Drupal\search\SearchQuery;
+use Drupal\views\Plugins\views\filter\FilterPluginBase;
/**
* Field handler to provide simple renderer that allows linking to a node.
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_search extends views_handler_filter {
+class views_handler_filter_search extends FilterPluginBase {
var $always_multiple = TRUE;
/**
diff --git a/modules/search/views_handler_sort_search_score.inc b/modules/search/views_handler_sort_search_score.inc
index d37fb6513654..92ff2b0ed8e7 100644
--- a/modules/search/views_handler_sort_search_score.inc
+++ b/modules/search/views_handler_sort_search_score.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_sort_search_score.
*/
+use Drupal\views\Plugins\views\sort\SortPluginBase;
+
/**
* Field handler to provide simple renderer that allows linking to a node.
*
* @ingroup views_sort_handlers
*/
-class views_handler_sort_search_score extends views_handler_sort {
+class views_handler_sort_search_score extends SortPluginBase {
function query() {
// Check to see if the search filter/argument added 'score' to the table.
// Our filter stores it as $handler->search_score -- and we also
diff --git a/modules/search/views_plugin_row_search_view.inc b/modules/search/views_plugin_row_search_view.inc
index e4aacdc36148..b33852aea8f2 100644
--- a/modules/search/views_plugin_row_search_view.inc
+++ b/modules/search/views_plugin_row_search_view.inc
@@ -5,10 +5,12 @@
* Definition of views_plugin_row_search_view.
*/
+use Drupal\views\Plugins\views\row\RowPluginBase;
+
/**
* Plugin which performs a node_view on the resulting object.
*/
-class views_plugin_row_search_view extends views_plugin_row {
+class views_plugin_row_search_view extends RowPluginBase {
function option_definition() {
$options = parent::option_definition();
diff --git a/modules/statistics/views_handler_field_accesslog_path.inc b/modules/statistics/views_handler_field_accesslog_path.inc
index 85b2352da27a..3ab613a51b27 100644
--- a/modules/statistics/views_handler_field_accesslog_path.inc
+++ b/modules/statistics/views_handler_field_accesslog_path.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_field_accesslog_path.
*/
+use Drupal\views\Plugins\views\field\FieldPluginBase;
+
/**
* Field handler to provide simple renderer that turns a URL into a clickable link.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_accesslog_path extends views_handler_field {
+class views_handler_field_accesslog_path extends FieldPluginBase {
/**
* Override init function to provide generic option to link to node.
*/
diff --git a/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc b/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc
index 427cf2b0bc5b..2ec835b2dce4 100644
--- a/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc
+++ b/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_argument_vocabulary_machine_name.
*/
+use Drupal\views\Plugins\views\argument\String;
+
/**
* Argument handler to accept a vocabulary machine name.
*
* @ingroup views_argument_handlers
*/
-class views_handler_argument_vocabulary_machine_name extends views_handler_argument_string {
+class views_handler_argument_vocabulary_machine_name extends String {
/**
* Override the behavior of title(). Get the name of the vocabulary..
*/
diff --git a/modules/taxonomy/views_handler_argument_vocabulary_vid.inc b/modules/taxonomy/views_handler_argument_vocabulary_vid.inc
index c6966405276d..eba45978b783 100644
--- a/modules/taxonomy/views_handler_argument_vocabulary_vid.inc
+++ b/modules/taxonomy/views_handler_argument_vocabulary_vid.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_argument_vocabulary_vid.
*/
+use Drupal\views\Plugins\views\argument\Numeric;
+
/**
* Argument handler to accept a vocabulary id.
*
* @ingroup views_argument_handlers
*/
-class views_handler_argument_vocabulary_vid extends views_handler_argument_numeric {
+class views_handler_argument_vocabulary_vid extends Numeric {
/**
* Override the behavior of title(). Get the name of the vocabulary.
*/
diff --git a/modules/user/views_handler_argument_user_uid.inc b/modules/user/views_handler_argument_user_uid.inc
index c945565b7e19..c38cd74e4503 100644
--- a/modules/user/views_handler_argument_user_uid.inc
+++ b/modules/user/views_handler_argument_user_uid.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_argument_user_uid.
*/
+use Drupal\views\Plugins\views\argument\Numeric;
+
/**
* Argument handler to accept a user id.
*
* @ingroup views_argument_handlers
*/
-class views_handler_argument_user_uid extends views_handler_argument_numeric {
+class views_handler_argument_user_uid extends Numeric {
/**
* Override the behavior of title(). Get the name of the user.
*
diff --git a/modules/user/views_handler_argument_users_roles_rid.inc b/modules/user/views_handler_argument_users_roles_rid.inc
index 31c58145193f..7502a2fe096e 100644
--- a/modules/user/views_handler_argument_users_roles_rid.inc
+++ b/modules/user/views_handler_argument_users_roles_rid.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_argument_users_roles_rid.
*/
+use Drupal\views\Plugins\views\argument\ManyToOne;
+
/**
* Allow role ID(s) as argument.
*
* @ingroup views_argument_handlers
*/
-class views_handler_argument_users_roles_rid extends views_handler_argument_many_to_one {
+class views_handler_argument_users_roles_rid extends ManyToOne {
function title_query() {
$titles = array();
diff --git a/modules/user/views_handler_field_user_picture.inc b/modules/user/views_handler_field_user_picture.inc
index 6d85d691bb25..4bc80c62b3ba 100644
--- a/modules/user/views_handler_field_user_picture.inc
+++ b/modules/user/views_handler_field_user_picture.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_field_user_picture.
*/
+use Drupal\views\Plugins\views\field\FieldPluginBase;
+
/**
* Field handler to provide simple renderer that allows using a themed user link.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_user_picture extends views_handler_field {
+class views_handler_field_user_picture extends FieldPluginBase {
function construct() {
parent::construct();
$this->additional_fields['uid'] = 'uid';
diff --git a/modules/user/views_handler_field_user_roles.inc b/modules/user/views_handler_field_user_roles.inc
index 7c5f07b09591..6ee5062ab50d 100644
--- a/modules/user/views_handler_field_user_roles.inc
+++ b/modules/user/views_handler_field_user_roles.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_field_user_roles.
*/
+use Drupal\views\Plugins\views\field\PrerenderList;
+
/**
* Field handler to provide a list of roles.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_user_roles extends views_handler_field_prerender_list {
+class views_handler_field_user_roles extends PrerenderList {
function construct() {
parent::construct();
$this->additional_fields['uid'] = array('table' => 'users', 'field' => 'uid');
diff --git a/modules/user/views_handler_filter_user_current.inc b/modules/user/views_handler_filter_user_current.inc
index 5f8fe4c80598..8ac8ba8579b2 100644
--- a/modules/user/views_handler_filter_user_current.inc
+++ b/modules/user/views_handler_filter_user_current.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_filter_user_current.
*/
+use Drupal\views\Plugins\views\filter\BooleanOperator;
+
/**
* Filter handler for the current user.
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_user_current extends views_handler_filter_boolean_operator {
+class views_handler_filter_user_current extends BooleanOperator {
function construct() {
parent::construct();
$this->value_value = t('Is the logged in user');
diff --git a/modules/user/views_handler_filter_user_name.inc b/modules/user/views_handler_filter_user_name.inc
index 300607fe3ae1..966fd96def6d 100644
--- a/modules/user/views_handler_filter_user_name.inc
+++ b/modules/user/views_handler_filter_user_name.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_filter_user_name.
*/
+use Drupal\views\Plugins\views\filter\InOperator;
+
/**
* Filter handler for usernames.
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_user_name extends views_handler_filter_in_operator {
+class views_handler_filter_user_name extends InOperator {
var $always_multiple = TRUE;
function value_form(&$form, &$form_state) {
diff --git a/modules/user/views_handler_filter_user_permissions.inc b/modules/user/views_handler_filter_user_permissions.inc
index f999045d0cdc..14c2aeaabc71 100644
--- a/modules/user/views_handler_filter_user_permissions.inc
+++ b/modules/user/views_handler_filter_user_permissions.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_filter_user_permissions.
*/
+use Drupal\views\Plugins\views\filter\ManyToOne;
+
/**
* Filter handler for user roles.
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_user_permissions extends views_handler_filter_many_to_one {
+class views_handler_filter_user_permissions extends ManyToOne {
function get_value_options() {
$module_info = system_get_info('module');
diff --git a/modules/user/views_handler_filter_user_roles.inc b/modules/user/views_handler_filter_user_roles.inc
index ab9b8a2f0113..e0f96d8e29e9 100644
--- a/modules/user/views_handler_filter_user_roles.inc
+++ b/modules/user/views_handler_filter_user_roles.inc
@@ -5,12 +5,14 @@
* Definition of views_handler_filter_user_roles.
*/
+use Drupal\views\Plugins\views\filter\ManyToOne;
+
/**
* Filter handler for user roles.
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_user_roles extends views_handler_filter_many_to_one {
+class views_handler_filter_user_roles extends ManyToOne {
function get_value_options() {
$this->value_options = user_roles(TRUE);
unset($this->value_options[DRUPAL_AUTHENTICATED_RID]);
diff --git a/modules/user/views_plugin_argument_default_current_user.inc b/modules/user/views_plugin_argument_default_current_user.inc
index e11c70223e56..0b10ec066fdd 100644
--- a/modules/user/views_plugin_argument_default_current_user.inc
+++ b/modules/user/views_plugin_argument_default_current_user.inc
@@ -5,12 +5,14 @@
* Contains the current user argument default plugin.
*/
+use Drupal\views\Plugins\views\argument_default\ArgumentDefaultPluginBase;
+
/**
* Default argument plugin to extract the global $user
*
* This plugin actually has no options so it odes not need to do a great deal.
*/
-class views_plugin_argument_default_current_user extends views_plugin_argument_default {
+class views_plugin_argument_default_current_user extends ArgumentDefaultPluginBase {
function get_argument() {
global $user;
return $user->uid;
diff --git a/modules/user/views_plugin_argument_default_user.inc b/modules/user/views_plugin_argument_default_user.inc
index bb104296c042..02764f21ff7e 100644
--- a/modules/user/views_plugin_argument_default_user.inc
+++ b/modules/user/views_plugin_argument_default_user.inc
@@ -5,10 +5,12 @@
* Contains the user from URL argument default plugin.
*/
+use Drupal\views\Plugins\views\argument_default\ArgumentDefaultPluginBase;
+
/**
* Default argument plugin to extract a user via menu_get_object.
*/
-class views_plugin_argument_default_user extends views_plugin_argument_default {
+class views_plugin_argument_default_user extends ArgumentDefaultPluginBase {
function option_definition() {
$options = parent::option_definition();
$options['user'] = array('default' => '', 'bool' => TRUE, 'translatable' => FALSE);
diff --git a/modules/user/views_plugin_argument_validate_user.inc b/modules/user/views_plugin_argument_validate_user.inc
index 99f33aabb9b9..74eb23f06420 100644
--- a/modules/user/views_plugin_argument_validate_user.inc
+++ b/modules/user/views_plugin_argument_validate_user.inc
@@ -5,6 +5,8 @@
* Definition of views_plugin_argument_validate_user.
*/
+use Drupal\views\Plugins\views\argument_validator\ArgumentValidatorPluginBase;
+
/**
* Validate whether an argument is a valid user.
*
@@ -12,7 +14,7 @@
* converts either one into the user's UID. This validator also sets the
* argument's title to the username.
*/
-class views_plugin_argument_validate_user extends views_plugin_argument_validate {
+class views_plugin_argument_validate_user extends ArgumentValidatorPluginBase {
function option_definition() {
$options = parent::option_definition();
$options['type'] = array('default' => 'uid');
diff --git a/modules/user/views_plugin_row_user_view.inc b/modules/user/views_plugin_row_user_view.inc
index b48f4596e5ae..336d4d91dacc 100644
--- a/modules/user/views_plugin_row_user_view.inc
+++ b/modules/user/views_plugin_row_user_view.inc
@@ -5,12 +5,14 @@
* Contains the user view row plugin.
*/
+use Drupal\views\Plugins\views\row\RowPluginBase;
+
/**
* A row plugin which renders a user via user_view.
*
* @ingroup views_row_plugins
*/
-class views_plugin_row_user_view extends views_plugin_row {
+class views_plugin_row_user_view extends RowPluginBase {
var $base_table = 'users';
var $base_field = 'uid';
--
GitLab