diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php index e49c116..05c95a4 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php @@ -19,7 +19,7 @@ */ class NodeComment extends InOperator { - function get_value_options() { + public function getValueOptions() { $this->value_options = array( COMMENT_NODE_HIDDEN => t('Hidden'), COMMENT_NODE_CLOSED => t('Closed'), diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php b/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php index 17e143b..cfd2f6c 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php +++ b/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php @@ -19,7 +19,7 @@ */ class FieldList extends ManyToOne { - function get_value_options() { + public function getValueOptions() { $field = field_info_field($this->definition['field_name']); $this->value_options = list_allowed_values($field); } diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php b/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php index 20439fe..3da51b3 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php @@ -19,7 +19,7 @@ */ class Status extends InOperator { - function get_value_options() { + public function getValueOptions() { if (!isset($this->value_options)) { $this->value_options = _views_file_status(); } diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php b/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php index 45311ed..3bf59c9 100644 --- a/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php +++ b/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php @@ -19,7 +19,7 @@ */ class LanguageFilter extends InOperator { - function get_value_options() { + public function getValueOptions() { if (!isset($this->value_options)) { $this->value_title = t('Language'); $languages = array( diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php index f485ac6..2df9d05 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php @@ -37,7 +37,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o public function hasExtraOptions() { return TRUE; } - function get_value_options() { /* don't overwrite the value options */ } + public function getValueOptions() { /* don't overwrite the value options */ } protected function defineOptions() { $options = parent::defineOptions(); diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php index 8c5104c..3e379a4 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php @@ -146,7 +146,7 @@ function value_submit($form, &$form_state) { } // Override to do nothing. - function get_value_options() { } + public function getValueOptions() { } public function adminSummary() { // set up $this->value_options for the parent summary diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php index 54f24f8..0f625c4 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php @@ -19,7 +19,7 @@ */ class Permissions extends ManyToOne { - function get_value_options() { + public function getValueOptions() { $module_info = system_get_info('module'); // Get a list of all the modules implementing a hook_permission() and sort by diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php index 4aa9d53..ffc22f9 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php @@ -19,7 +19,7 @@ */ class Roles extends ManyToOne { - function get_value_options() { + public function getValueOptions() { $this->value_options = user_role_names(TRUE); unset($this->value_options[DRUPAL_AUTHENTICATED_RID]); } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php index 29b2658..86d8d02 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php @@ -26,7 +26,7 @@ class MachineName extends FieldPluginBase { */ var $value_options; - function get_value_options() { + public function getValueOptions() { if (isset($this->value_options)) { return; } @@ -63,7 +63,7 @@ public function buildOptionsForm(&$form, &$form_state) { } function pre_render(&$values) { - $this->get_value_options(); + $this->getValueOptions(); } function render($values) { diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php index e5327f1..480d2cb 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php @@ -69,7 +69,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o * dynamic for some reason, child classes should use a guard to reduce * database hits as much as possible. */ - function get_value_options() { + public function getValueOptions() { if (isset($this->definition['type'])) { if ($this->definition['type'] == 'yes-no') { $this->value_options = array(1 => t('Yes'), 0 => t('No')); @@ -103,7 +103,7 @@ function operator_form(&$form, &$form_state) { function value_form(&$form, &$form_state) { if (empty($this->value_options)) { // Initialize the array of possible values for this filter. - $this->get_value_options(); + $this->getValueOptions(); } if (!empty($form_state['exposed'])) { // Exposed filter: use a select box to save space. @@ -149,7 +149,7 @@ public function adminSummary() { return t('exposed'); } if (empty($this->value_options)) { - $this->get_value_options(); + $this->getValueOptions(); } // Now that we have the valid options for this filter, just return the // human-readable label based on the current value. The value_options diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php index 1ce3e95..3c1f54f 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php @@ -46,9 +46,9 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o } /** - * Overrides \Drupal\views\Plugin\views\filter\InOperator::get_value_options(). + * Overrides \Drupal\views\Plugin\views\filter\InOperator::getValueOptions(). */ - public function get_value_options() { + public function getValueOptions() { if (!isset($this->value_options)) { $types = entity_get_bundles($this->entityType); $this->value_title = t('@entity types', array('@entity' => $this->entityInfo['label'])); diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php index dfe89ea..f9f20f3 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php @@ -53,7 +53,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o * @return * Return the stored values in $this->value_options if someone expects it. */ - function get_value_options() { + public function getValueOptions() { if (isset($this->value_options)) { return; } @@ -173,7 +173,7 @@ function value_form(&$form, &$form_state) { $options = array('all' => t('Select all')); } - $this->get_value_options(); + $this->getValueOptions(); $options += $this->value_options; $default_value = (array) $this->value; @@ -316,7 +316,7 @@ public function adminSummary() { } $info = $this->operators(); - $this->get_value_options(); + $this->getValueOptions(); if (!is_array($this->value)) { return; @@ -400,7 +400,7 @@ function op_empty() { } public function validate() { - $this->get_value_options(); + $this->getValueOptions(); $errors = array(); // If the operator is an operator which doesn't require a value, there is diff --git a/core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php b/core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php index 29d55dd..e41a960 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php @@ -93,7 +93,7 @@ public function testFilterEntity() { foreach ($this->entityBundles as $key => $info) { $expected[$key] = $info['label']; } - $this->assertIdentical($view->filter['type']->get_value_options(), $expected); + $this->assertIdentical($view->filter['type']->getValueOptions(), $expected); $view->destroy();