diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php index eda9ca4..e9143ae 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php @@ -64,8 +64,8 @@ public function buildOptionsForm(&$form, &$form_state) { function render_link($data, $values) { if (!empty($this->options['link_to_comment'])) { $this->options['alter']['make_link'] = TRUE; - $nid = $this->get_value($values, 'nid'); - $cid = $this->get_value($values, 'cid'); + $nid = $this->getValue($values, 'nid'); + $cid = $this->getValue($values, 'cid'); if (!empty($cid)) { $this->options['alter']['path'] = "comment/" . $cid; $this->options['alter']['fragment'] = "comment-" . $cid; @@ -80,7 +80,7 @@ function render_link($data, $values) { } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); return $this->render_link($this->sanitizeValue($value), $values); } diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php index 5bb7405..08b9d8d 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php @@ -23,7 +23,7 @@ class Depth extends FieldPluginBase { * Work out the depth of this comment */ function render($values) { - $comment_thread = $this->get_value($values); + $comment_thread = $this->getValue($values); return count(explode('.', $comment_thread)) - 1; } diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php index 35cbfec..5b2c61d 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php @@ -31,7 +31,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o } function render($values) { - $comment_count = $this->get_value($values, 'comment_count'); + $comment_count = $this->getValue($values, 'comment_count'); if (empty($this->options['empty_zero']) || $comment_count) { return parent::render($values); } diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php index d546946..49bcb58 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php @@ -24,7 +24,7 @@ public function access() { } function render_link($data, $values) { - $status = $this->get_value($values, 'status'); + $status = $this->getValue($values, 'status'); // Don't show an approve link on published nodes. if ($status == COMMENT_PUBLISHED) { @@ -32,7 +32,7 @@ function render_link($data, $values) { } $text = !empty($this->options['text']) ? $this->options['text'] : t('approve'); - $cid = $this->get_value($values, 'cid'); + $cid = $this->getValue($values, 'cid'); $this->options['alter']['make_link'] = TRUE; $this->options['alter']['path'] = "comment/" . $cid . "/approve"; diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php index 38b79da..fb46718 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php @@ -25,7 +25,7 @@ public function access() { function render_link($data, $values) { $text = !empty($this->options['text']) ? $this->options['text'] : t('delete'); - $cid = $this->get_value($values, 'cid'); + $cid = $this->getValue($values, 'cid'); $this->options['alter']['make_link'] = TRUE; $this->options['alter']['path'] = "comment/" . $cid . "/delete"; diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php index e0196ae..a32b112 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php @@ -40,7 +40,7 @@ public function buildOptionsForm(&$form, &$form_state) { function render_link($data, $values) { parent::render_link($data, $values); // ensure user has access to edit this comment. - $comment = $this->get_value($values); + $comment = $this->getValue($values); if (!$comment->access('update')) { return; } diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php index 2167c6b..ad0d5bf 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php @@ -25,8 +25,8 @@ public function access() { function render_link($data, $values) { $text = !empty($this->options['text']) ? $this->options['text'] : t('reply'); - $nid = $this->get_value($values, 'nid'); - $cid = $this->get_value($values, 'cid'); + $nid = $this->getValue($values, 'nid'); + $cid = $this->getValue($values, 'cid'); $this->options['alter']['make_link'] = TRUE; $this->options['alter']['path'] = "comment/reply/" . $nid . '/' . $cid; diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php index db5bba9..6287811 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php @@ -60,14 +60,14 @@ protected function defineOptions() { function render($values) { if (!empty($this->options['link_to_user'])) { $account = entity_create('user', array()); - $account->name = $this->get_value($values); + $account->name = $this->getValue($values); $account->uid = $values->{$this->uid}; return theme('username', array( 'account' => $account )); } else { - return $this->sanitizeValue($this->get_value($values)); + return $this->sanitizeValue($this->getValue($values)); } } diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php index de113f0..55c366b 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php @@ -20,7 +20,7 @@ class NodeComment extends FieldPluginBase { function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); switch ($value) { case COMMENT_NODE_HIDDEN: default: diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php index 3f3f903..c2f5ff1 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php @@ -97,12 +97,12 @@ function pre_render(&$values) { function render_link($data, $values) { if (!empty($this->options['link_to_comment']) && $data !== NULL && $data !== '') { $node = entity_create('node', array( - 'nid' => $this->get_value($values, 'nid'), - 'type' => $this->get_value($values, 'type'), + 'nid' => $this->getValue($values, 'nid'), + 'type' => $this->getValue($values, 'type'), )); $this->options['alter']['make_link'] = TRUE; $this->options['alter']['path'] = 'node/' . $node->nid; - $this->options['alter']['query'] = comment_new_page_count($this->get_value($values, 'comment_count'), $this->get_value($values), $node); + $this->options['alter']['query'] = comment_new_page_count($this->getValue($values, 'comment_count'), $this->getValue($values), $node); $this->options['alter']['fragment'] = 'new'; } @@ -110,7 +110,7 @@ function render_link($data, $values) { } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); if (!empty($value)) { return $this->render_link(parent::render($values), $values); } diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php index 05ceb8f..df362d9 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php @@ -51,9 +51,9 @@ public function buildOptionsForm(&$form, &$form_state) { function render_link($data, $values) { if (!empty($this->options['link_to_user'])) { $account = entity_create('user', array()); - $account->uid = $this->get_value($values, 'uid'); - $account->name = $this->get_value($values); - $account->homepage = $this->get_value($values, 'homepage'); + $account->uid = $this->getValue($values, 'uid'); + $account->name = $this->getValue($values); + $account->homepage = $this->getValue($values, 'homepage'); return theme('username', array( 'account' => $account @@ -65,7 +65,7 @@ function render_link($data, $values) { } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); return $this->render_link($this->sanitizeValue($value), $values); } diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php index e3bd6d9..50f6050 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php @@ -42,7 +42,7 @@ public function buildOptionsForm(&$form, &$form_state) { } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); if (!$this->options['extension_detect_tar']) { if (preg_match('/\.([^\.]+)$/', $value, $match)) { return $this->sanitizeValue($match[1]); diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php index a64e857..22376c3 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php @@ -59,14 +59,14 @@ public function buildOptionsForm(&$form, &$form_state) { function render_link($data, $values) { if (!empty($this->options['link_to_file']) && $data !== NULL && $data !== '') { $this->options['alter']['make_link'] = TRUE; - $this->options['alter']['path'] = file_create_url($this->get_value($values, 'uri')); + $this->options['alter']['path'] = file_create_url($this->getValue($values, 'uri')); } return $data; } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); return $this->render_link($this->sanitizeValue($value), $values); } diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php index 883602d..719f4d6 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php @@ -20,7 +20,7 @@ class Status extends FieldPluginBase { function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); return _views_file_status($value); } diff --git a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php index 950fcf7..4465dac 100644 --- a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php +++ b/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php @@ -76,10 +76,10 @@ function render($values) { $mark = MARK_READ; global $user; if ($user->uid) { - $last_read = $this->get_value($values); - $changed = $this->get_value($values, 'changed'); + $last_read = $this->getValue($values); + $changed = $this->getValue($values, 'changed'); - $last_comment = module_exists('comment') && !empty($this->options['comments']) ? $this->get_value($values, 'last_comment') : 0; + $last_comment = module_exists('comment') && !empty($this->options['comments']) ? $this->getValue($values, 'last_comment') : 0; if (!$last_read && $changed > HISTORY_READ_LIMIT) { $mark = MARK_NEW; diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php b/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php index bd10ef5..62bcaef 100644 --- a/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php +++ b/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php @@ -39,7 +39,7 @@ public function buildOptionsForm(&$form, &$form_state) { function render($values) { // @todo: Drupal Core dropped native language until config translation is // ready, see http://drupal.org/node/1616594. - $value = $this->get_value($values); + $value = $this->getValue($values); $language = language_load($value); return $language ? $language->name : ''; } diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php index 4fd253a..d76e41c 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php @@ -39,7 +39,7 @@ public function buildOptionsForm(&$form, &$form_state) { function render($values) { // @todo: Drupal Core dropped native language until config translation is // ready, see http://drupal.org/node/1616594. - $value = $this->get_value($values); + $value = $this->getValue($values); $language = language_load($value); $value = $language ? $language->name : ''; return $this->render_link($value, $values); diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php index 124d9c8..b446ed2 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php @@ -67,10 +67,10 @@ function render_link($data, $values) { if (!empty($this->options['link_to_node']) && !empty($this->additional_fields['nid'])) { if ($data !== NULL && $data !== '') { $this->options['alter']['make_link'] = TRUE; - $this->options['alter']['path'] = "node/" . $this->get_value($values, 'nid'); + $this->options['alter']['path'] = "node/" . $this->getValue($values, 'nid'); if (isset($this->aliases['langcode'])) { $languages = language_list(); - $langcode = $this->get_value($values, 'langcode'); + $langcode = $this->getValue($values, 'langcode'); if (isset($languages[$langcode])) { $this->options['alter']['language'] = $languages[$langcode]; } @@ -87,7 +87,7 @@ function render_link($data, $values) { } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); return $this->render_link($this->sanitizeValue($value), $values); } diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php index 3e41bc7..543698f 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php @@ -54,7 +54,7 @@ public function query() { } function render($values) { - $nid = $this->get_value($values, 'nid'); + $nid = $this->getValue($values, 'nid'); return url("node/$nid", array('absolute' => $this->options['absolute'])); } diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php index 8d9d285..410b2e0 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php @@ -62,11 +62,11 @@ public function buildOptionsForm(&$form, &$form_state) { function render_link($data, $values) { if (!empty($this->options['link_to_node_revision']) && $data !== NULL && $data !== '') { $this->options['alter']['make_link'] = TRUE; - $nid = $this->get_value($values, 'nid'); - $vid = $this->get_value($values, 'vid'); + $nid = $this->getValue($values, 'nid'); + $vid = $this->getValue($values, 'vid'); $this->options['alter']['path'] = "node/" . $nid . '/revisions/' . $vid . '/view'; if (module_exists('translation')) { - $langcode = $this->get_value($values, 'langcode'); + $langcode = $this->getValue($values, 'langcode'); $languages = language_list(); if (isset($languages[$langcode])) { $this->options['alter']['langcode'] = $languages[$langcode]; diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php index 1f4bba2..066742b 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php @@ -66,7 +66,7 @@ function render_link($data, $values) { * revision ID for this row. */ function get_revision_entity($values, $op) { - $vid = $this->get_value($values, 'node_vid'); + $vid = $this->getValue($values, 'node_vid'); $node = $this->get_entity($values); // Unpublished nodes ignore access control. $node->status = 1; diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php index f29135d..5a6c25f 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php @@ -51,7 +51,7 @@ function render_name($data, $values) { } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); return $this->render_link($this->render_name($value, $values), $values); } diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php b/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php index 756f9a4..2020486 100644 --- a/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php +++ b/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php @@ -140,7 +140,7 @@ public function render($row) { // If this is not unknown and the raw output option has been set, just get // the raw value. if (($field->field_alias != 'unknown') && !empty($this->rawOutputOptions[$id])) { - $value = $field->sanitizeValue($field->get_value($row), 'xss_admin'); + $value = $field->sanitizeValue($field->getValue($row), 'xss_admin'); } // Otherwise, pass this through the field render() method. else { diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php index 7131fef..e6d9997 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php @@ -20,7 +20,7 @@ class Language extends Taxonomy { * Overrides Drupal\taxonomy\Plugin\views\field\Taxonomy::render(). */ public function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); $language = language_load($value); $value = $language ? $language->name : ''; diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php index 64225c0..77f55f8 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php @@ -55,7 +55,7 @@ public function query() { function render($values) { // Check there is an actual value, as on a relationship there may not be. - if ($tid = $this->get_value($values, 'tid')) { + if ($tid = $this->getValue($values, 'tid')) { // Mock a term object for taxonomy_term_access(). Use machine name and // vid to ensure compatibility with vid based and machine name based // access checks. See http://drupal.org/node/995156 diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php index 9d04648..793c8de 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php @@ -69,11 +69,11 @@ public function buildOptionsForm(&$form, &$form_state) { * Data should be made XSS safe prior to calling this function. */ function render_link($data, $values) { - $tid = $this->get_value($values, 'tid'); + $tid = $this->getValue($values, 'tid'); if (!empty($this->options['link_to_taxonomy']) && !empty($tid) && $data !== NULL && $data !== '') { $term = entity_create('taxonomy_term', array( 'tid' => $tid, - 'vid' => $this->get_value($values, 'vid'), + 'vid' => $this->getValue($values, 'vid'), )); $this->options['alter']['make_link'] = TRUE; $uri = $term->uri(); @@ -88,7 +88,7 @@ function render_link($data, $values) { } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); return $this->render_link($this->sanitizeValue($value), $values); } diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php index ced49f0..6fe5c35 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php @@ -19,9 +19,9 @@ class Language extends User { function render_link($data, $values) { - $uid = $this->get_value($values, 'uid'); + $uid = $this->getValue($values, 'uid'); if (!empty($this->options['link_to_user'])) { - $uid = $this->get_value($values, 'uid'); + $uid = $this->getValue($values, 'uid'); if (user_access('access user profiles') && $uid) { $this->options['alter']['make_link'] = TRUE; $this->options['alter']['path'] = 'user/' . $uid; @@ -39,7 +39,7 @@ function render_link($data, $values) { } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); return $this->render_link($this->sanitizeValue($value), $values); } diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php index 33e274c..d36f618 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php @@ -76,15 +76,15 @@ public function buildOptionsForm(&$form, &$form_state) { function render_link($data, $values) { $account = entity_create('user', array()); - $account->uid = $this->get_value($values, 'uid'); - $account->name = $this->get_value($values); + $account->uid = $this->getValue($values, 'uid'); + $account->name = $this->getValue($values); if (!empty($this->options['link_to_user']) || !empty($this->options['overwrite_anonymous'])) { if (!empty($this->options['overwrite_anonymous']) && !$account->uid) { // This is an anonymous user, and we're overriting the text. return check_plain($this->options['anonymous_text']); } elseif (!empty($this->options['link_to_user'])) { - $account->name = $this->get_value($values); + $account->name = $this->getValue($values); return theme('username', array('account' => $account)); } } diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php index a14f625..6e08a29 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php @@ -40,7 +40,7 @@ function pre_render(&$values) { $this->items = array(); foreach ($values as $result) { - $uids[] = $this->get_value($result); + $uids[] = $this->getValue($result); } if ($uids) { diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php index 4fa6811..7787123 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php @@ -40,7 +40,7 @@ function pre_render(&$values) { $this->items = array(); foreach ($values as $result) { - $uids[] = $this->get_value($result); + $uids[] = $this->getValue($result); } if ($uids) { diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php index 614d201..b94bdbe 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php @@ -61,7 +61,7 @@ function render_link($data, $values) { } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); return $this->render_link($this->sanitizeValue($value), $values); } diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php index 06b352f..fe3c6e6 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php @@ -78,7 +78,7 @@ public function buildOptionsForm(&$form, &$form_state) { * Overrides \Drupal\views\Plugin\views\field\FieldPluginBase::render(). */ function render($values) { - $uid = $this->get_value($values); + $uid = $this->getValue($values); $data = $this->userData->get($this->options['module'], $uid, $this->options['name']); // Don't sanitize if no value was found. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php index 2f83540..c124e04 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php @@ -991,7 +991,7 @@ public function setArgument($arg) { /** * Get the value of this argument. */ - function get_value() { + public function getValue() { // If we already processed this argument, we're done. if (isset($this->argument)) { return $this->argument; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php index a2b8dc2..f70df25 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php @@ -101,7 +101,7 @@ public function buildOptionsForm(&$form, &$form_state) { } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); if (!empty($this->options['not'])) { $value = !$value; } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php index e0d932c..cb95ed5 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php @@ -41,9 +41,9 @@ public function query() { } /** - * Overrides Drupal\views\Plugin\views\field\FieldPluginBas::get_value() + * Overrides Drupal\views\Plugin\views\field\FieldPluginBas::getValue() */ - public function get_value($values, $field = NULL) { + public function getValue($values, $field = NULL) { // Note: 1 is subtracted from the counter start value below because the // counter value is incremented by 1 at the end of this function. $count = is_numeric($this->options['counter_start']) ? $this->options['counter_start'] - 1 : 0; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php index 9fa6d62..a19c50b 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php @@ -80,7 +80,7 @@ public function buildOptionsForm(&$form, &$form_state) { } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); $format = $this->options['date_format']; if (in_array($format, array('custom', 'raw time ago', 'time ago', 'raw time hence', 'time hence', 'raw time span', 'time span', 'raw time span', 'inverse time span', 'time span'))) { $custom_format = $this->options['custom_date_format']; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php index e4501f8..af43c4a 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php @@ -388,7 +388,7 @@ public function get_entity(\stdClass $values) { * @param $field * Optional name of the field where the value is stored. */ - function get_value($values, $field = NULL) { + public function getValue($values, $field = NULL) { $alias = isset($field) ? $this->aliases[$field] : $this->field_alias; if (isset($values->{$alias})) { return $values->{$alias}; @@ -1098,7 +1098,7 @@ function pre_render(&$values) { } * The values retrieved from the database. */ function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); return $this->sanitizeValue($value); } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php index 1bfa5ea..98e1991 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php @@ -39,7 +39,7 @@ public function buildOptionsForm(&$form, &$form_state) { } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); if ($value) { switch ($this->options['file_size_display']) { case 'bytes': diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php index 1222fa4..6e19dfd 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php @@ -41,9 +41,9 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); if (is_array($this->format)) { - $format = $this->get_value($values, 'format'); + $format = $this->getValue($values, 'format'); } else { $format = $this->format; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php index 42a36e7..8687a2c 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php @@ -125,7 +125,7 @@ public function buildOptionsForm(&$form, &$form_state) { } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); if (!empty($this->options['set_precision'])) { $value = number_format($value, $this->options['precision'], $this->options['decimal'], $this->options['separator']); } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php index 056a958..c222d1b 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php @@ -100,7 +100,7 @@ function render_items($items) { * should also be in this array. */ function get_items($values) { - $field = $this->get_value($values); + $field = $this->getValue($values); if (!empty($this->items[$field])) { return $this->items[$field]; } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php index 3539d6f..4399d59 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php @@ -39,7 +39,7 @@ public function buildOptionsForm(&$form, &$form_state) { } function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); if (!empty($this->options['display_as_link'])) { return l($this->sanitizeValue($value), $value, array('html' => TRUE)); } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php index 4bf8a43..572e709 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php @@ -20,7 +20,7 @@ class Xss extends FieldPluginBase { function render($values) { - $value = $this->get_value($values); + $value = $this->getValue($values); return $this->sanitizeValue($value, 'xss'); } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php index e1b2016..d9f46a5 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php @@ -676,7 +676,7 @@ public function get_field($index, $field) { */ protected function getFieldValue($index, $field) { $this->view->row_index = $index; - $value = $this->view->field[$field]->get_value($this->view->result[$index]); + $value = $this->view->field[$field]->getValue($this->view->result[$index]); unset($this->view->row_index); return $value; } diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php index e1ed866..e483f16 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php @@ -47,13 +47,13 @@ function testGlossary() { $count_field = 'nid'; foreach ($view->result as &$row) { - if (strpos($view->field['title']->get_value($row), 'a') === 0) { + if (strpos($view->field['title']->getValue($row), 'a') === 0) { $this->assertEqual(1, $row->{$count_field}); } - if (strpos($view->field['title']->get_value($row), 'b') === 0) { + if (strpos($view->field['title']->getValue($row), 'b') === 0) { $this->assertEqual(2, $row->{$count_field}); } - if (strpos($view->field['title']->get_value($row), 'c') === 0) { + if (strpos($view->field['title']->getValue($row), 'c') === 0) { $this->assertEqual(3, $row->{$count_field}); } } diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php index d5f2eac..a800adf 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php @@ -85,13 +85,13 @@ public function testQuery() { $this->assertEqual($id_field->aliases['created_test'], 'views_test_data_created'); $this->executeView($view); - // Tests the get_value method with and without a field aliases. + // Tests the getValue method with and without a field aliases. foreach ($this->dataSet() as $key => $row) { $id = $key + 1; $result = $view->result[$key]; - $this->assertEqual($id_field->get_value($result), $id); - $this->assertEqual($id_field->get_value($result, 'job'), $row['job']); - $this->assertEqual($id_field->get_value($result, 'created_test'), $row['created']); + $this->assertEqual($id_field->getValue($result), $id); + $this->assertEqual($id_field->getValue($result, 'job'), $row['job']); + $this->assertEqual($id_field->getValue($result, 'created_test'), $row['created']); } } diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php index 32cbc47..aa8b1da 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php @@ -69,14 +69,14 @@ public function testArgumentDefaultPlugin() { // Don't pass in a value for the default argument and make sure the query // just returns John. $this->executeView($view); - $this->assertEqual($view->argument[$id]->get_value(), 'John', 'The correct argument value is used.'); + $this->assertEqual($view->argument[$id]->getValue(), 'John', 'The correct argument value is used.'); $expected_result = array(array('name' => 'John')); $this->assertIdenticalResultset($view, $expected_result, array('views_test_data_name' => 'name')); // Pass in value as argument to be sure that not the default value is used. $view->destroy(); $this->executeView($view, array('George')); - $this->assertEqual($view->argument[$id]->get_value(), 'George', 'The correct argument value is used.'); + $this->assertEqual($view->argument[$id]->getValue(), 'George', 'The correct argument value is used.'); $expected_result = array(array('name' => 'George')); $this->assertIdenticalResultset($view, $expected_result, array('views_test_data_name' => 'name')); } diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php index 9793810..e0a3495 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php @@ -238,7 +238,7 @@ function testCustomRowClasses() { $this->assertTrue(strpos($class, $random_name) !== FALSE, 'Take sure that a custom css class is added to the output.'); // Check token replacement. - $name = $view->field['name']->get_value($view->result[$count]); + $name = $view->field['name']->getValue($view->result[$count]); $this->assertTrue(strpos($class, "test-token-$name") !== FALSE, 'Take sure that a token in custom css class is replaced.'); $count++;