Issue #2003464 by Dan Reinders, jfm2k1: Rename Views method operator_options()...

Issue #2003464 by Dan Reinders, jfm2k1: Rename Views method operator_options() to operatorOptions().

core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php

@@ -21,7 +21,7 @@
  */
 class TaxonomyIndexTidDepth extends TaxonomyIndexTid {
 
-  function operator_options($which = 'title') {
+  public function operatorOptions($which = 'title') {
     return array(
       'or' => t('Is one of'),
     );

core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php

@@ -24,7 +24,7 @@ class Equality extends FilterPluginBase {
   /**
    * Provide simple equality operator
    */
-  function operator_options() {
+  public function operatorOptions() {
     return array(
       '=' => t('Is equal to'),
       '!=' => t('Is not equal to'),

core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php

@@ -176,7 +176,7 @@ public function canExpose() { return TRUE; }
    * Only exposed filters with operators available can be converted into groups.
    */
   function can_build_group() {
-    return $this->isExposed() && (count($this->operator_options()) > 0);
+    return $this->isExposed() && (count($this->operatorOptions()) > 0);
   }
 
   /**
@@ -280,7 +280,7 @@ public function showOperatorForm(&$form, &$form_state) {
    * @see buildOptionsForm()
    */
   function operator_form(&$form, &$form_state) {
-    $options = $this->operator_options();
+    $options = $this->operatorOptions();
     if (!empty($options)) {
       $form['operator'] = array(
         '#type' => count($options) < 10 ? 'radios' : 'select',
@@ -295,7 +295,7 @@ function operator_form(&$form, &$form_state) {
    * Provide a list of options for the default operator form.
    * Should be overridden by classes that don't override operator_form
    */
-  function operator_options() { return array(); }
+  public function operatorOptions() { return array(); }
 
   /**
    * Validate the operator form.

core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php

@@ -144,7 +144,7 @@ function operators() {
   /**
    * Build strings from the operators() for 'select' options
    */
-  function operator_options($which = 'title') {
+  public function operatorOptions($which = 'title') {
     $options = array();
     foreach ($this->operators() as $id => $info) {
       $options[$id] = $info[$which];

core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php

@@ -123,7 +123,7 @@ function operators() {
   /**
    * Provide a list of all the numeric operators
    */
-  function operator_options($which = 'title') {
+  public function operatorOptions($which = 'title') {
     $options = array();
     foreach ($this->operators() as $id => $info) {
       $options[$id] = $info[$which];
@@ -287,7 +287,7 @@ public function adminSummary() {
       return t('exposed');
     }
 
-    $options = $this->operator_options('short');
+    $options = $this->operatorOptions('short');
     $output = check_plain($options[$this->operator]);
     if (in_array($this->operator, $this->operator_values(2))) {
       $output .= ' ' . t('@min and @max', array('@min' => $this->value['min'], '@max' => $this->value['max']));

core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php

@@ -146,7 +146,7 @@ function operators() {
   /**
    * Build strings from the operators() for 'select' options
    */
-  function operator_options($which = 'title') {
+  public function operatorOptions($which = 'title') {
     $options = array();
     foreach ($this->operators() as $id => $info) {
       $options[$id] = $info[$which];
@@ -163,7 +163,7 @@ public function adminSummary() {
       return t('exposed');
     }
 
-    $options = $this->operator_options('short');
+    $options = $this->operatorOptions('short');
     $output = '';
     if (!empty($options[$this->operator])) {
       $output = check_plain($options[$this->operator]);