From db385738a2f305fa2729a565fbff511f2add2849 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 28 May 2013 21:57:48 +0100
Subject: [PATCH] Issue #2003044 by dwieeb: Rename Views method get_plugin() to
getPlugin().
---
.../views/argument/ArgumentPluginBase.php | 26 +++++++++----------
.../Tests/Plugin/ArgumentDefaultTest.php | 2 +-
2 files changed, 14 insertions(+), 14 deletions(-)
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 3290e78f51e0..2faad8a3b14e 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
@@ -324,7 +324,7 @@ public function buildOptionsForm(&$form, &$form_state) {
// If we decide this validator is ok, add it to the list.
if ($valid) {
- $plugin = $this->get_plugin('argument_validator', $id);
+ $plugin = $this->getPlugin('argument_validator', $id);
if ($plugin) {
if ($plugin->access() || $this->options['validate']['type'] == $id) {
$form['validate']['options'][$id] = array(
@@ -373,20 +373,20 @@ public function validateOptionsForm(&$form, &$form_state) {
// Let the plugins do validation.
$default_id = $form_state['values']['options']['default_argument_type'];
- $plugin = $this->get_plugin('argument_default', $default_id);
+ $plugin = $this->getPlugin('argument_default', $default_id);
if ($plugin) {
$plugin->validateOptionsForm($form['argument_default'][$default_id], $form_state, $form_state['values']['options']['argument_default'][$default_id]);
}
// summary plugin
$summary_id = $form_state['values']['options']['summary']['format'];
- $plugin = $this->get_plugin('style', $summary_id);
+ $plugin = $this->getPlugin('style', $summary_id);
if ($plugin) {
$plugin->validateOptionsForm($form['summary']['options'][$summary_id], $form_state, $form_state['values']['options']['summary']['options'][$summary_id]);
}
$validate_id = $form_state['values']['options']['validate']['type'];
- $plugin = $this->get_plugin('argument_validator', $validate_id);
+ $plugin = $this->getPlugin('argument_validator', $validate_id);
if ($plugin) {
$plugin->validateOptionsForm($form['validate']['options'][$default_id], $form_state, $form_state['values']['options']['validate']['options'][$validate_id]);
}
@@ -400,7 +400,7 @@ public function submitOptionsForm(&$form, &$form_state) {
// Let the plugins make submit modifications if necessary.
$default_id = $form_state['values']['options']['default_argument_type'];
- $plugin = $this->get_plugin('argument_default', $default_id);
+ $plugin = $this->getPlugin('argument_default', $default_id);
if ($plugin) {
$options = &$form_state['values']['options']['argument_default'][$default_id];
$plugin->submitOptionsForm($form['argument_default'][$default_id], $form_state, $options);
@@ -410,7 +410,7 @@ public function submitOptionsForm(&$form, &$form_state) {
// summary plugin
$summary_id = $form_state['values']['options']['summary']['format'];
- $plugin = $this->get_plugin('style', $summary_id);
+ $plugin = $this->getPlugin('style', $summary_id);
if ($plugin) {
$options = &$form_state['values']['options']['summary']['options'][$summary_id];
$plugin->submitOptionsForm($form['summary']['options'][$summary_id], $form_state, $options);
@@ -419,7 +419,7 @@ public function submitOptionsForm(&$form, &$form_state) {
}
$validate_id = $form_state['values']['options']['validate']['type'];
- $plugin = $this->get_plugin('argument_validator', $validate_id);
+ $plugin = $this->getPlugin('argument_validator', $validate_id);
if ($plugin) {
$options = &$form_state['values']['options']['validate']['options'][$validate_id];
$plugin->submitOptionsForm($form['validate']['options'][$validate_id], $form_state, $options);
@@ -529,7 +529,7 @@ function default_argument_form(&$form, &$form_state) {
if (!empty($info['no_ui'])) {
continue;
}
- $plugin = $this->get_plugin('argument_default', $id);
+ $plugin = $this->getPlugin('argument_default', $id);
if ($plugin) {
if ($plugin->access() || $this->options['default_argument_type'] == $id) {
$form['argument_default']['#argument_option'] = 'default';
@@ -617,7 +617,7 @@ public function defaultSummaryForm(&$form, &$form_state) {
);
foreach ($summary_plugins as $id => $info) {
- $plugin = $this->get_plugin('style', $id);
+ $plugin = $this->getPlugin('style', $id);
if (!$plugin->usesOptions()) {
continue;
}
@@ -742,7 +742,7 @@ function hasDefaultArgument() {
* Get a default argument, if available.
*/
function get_default_argument() {
- $plugin = $this->get_plugin('argument_default');
+ $plugin = $this->getPlugin('argument_default');
if ($plugin) {
return $plugin->get_argument();
}
@@ -756,7 +756,7 @@ function get_default_argument() {
*/
function process_summary_arguments(&$args) {
if ($this->options['validate']['type'] != 'none') {
- if (isset($this->validator) || $this->validator = $this->get_plugin('argument_validator')) {
+ if (isset($this->validator) || $this->validator = $this->getPlugin('argument_validator')) {
$this->validator->process_summary_arguments($args);
}
}
@@ -949,7 +949,7 @@ public function validateArgument($arg) {
return $this->argument_validated = TRUE;
}
- $plugin = $this->get_plugin('argument_validator');
+ $plugin = $this->getPlugin('argument_validator');
return $this->argument_validated = $plugin->validate_argument($arg);
}
@@ -1031,7 +1031,7 @@ function get_value() {
/**
* Get the display or row plugin, if it exists.
*/
- function get_plugin($type = 'argument_default', $name = NULL) {
+ public function getPlugin($type = 'argument_default', $name = NULL) {
$options = array();
switch ($type) {
case 'argument_default':
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 312e5dfc6af7..32cbc47ca013 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
@@ -61,7 +61,7 @@ public function testArgumentDefaultPlugin() {
);
$id = $view->addItem('default', 'argument', 'views_test_data', 'name', $options);
$view->initHandlers();
- $plugin = $view->argument[$id]->get_plugin('argument_default');
+ $plugin = $view->argument[$id]->getPlugin('argument_default');
$this->assertTrue($plugin instanceof ArgumentDefaultTestPlugin, 'The correct argument default plugin is used.');
// Check that the value of the default argument is as expected.
--
GitLab