diff --git a/core/modules/views/config/views.view.archive.yml b/core/modules/views/config/views.view.archive.yml index 3cba318..03d1307 100644 --- a/core/modules/views/config/views.view.archive.yml +++ b/core/modules/views/config/views.view.archive.yml @@ -80,7 +80,7 @@ display: default_argument_type: fixed summary: sort_order: desc - format: default_summary + format: defaultSummary summary_options: override: '1' items_per_page: '30' @@ -148,7 +148,7 @@ display: title: '%1' default_argument_type: fixed summary: - format: default_summary + format: defaultSummary summary_options: items_per_page: '30' specify_validation: '1' diff --git a/core/modules/views/config/views.view.backlinks.yml b/core/modules/views/config/views.view.backlinks.yml index 311d5f5..d1c3d03 100644 --- a/core/modules/views/config/views.view.backlinks.yml +++ b/core/modules/views/config/views.view.backlinks.yml @@ -126,7 +126,7 @@ display: title: 'Pages that link to %1' default_argument_type: fixed summary: - format: default_summary + format: defaultSummary specify_validation: '1' validate: type: node @@ -203,7 +203,7 @@ display: title: 'What links here' default_argument_type: node summary: - format: default_summary + format: defaultSummary specify_validation: '1' validate: type: node diff --git a/core/modules/views/config/views.view.glossary.yml b/core/modules/views/config/views.view.glossary.yml index 8237f1f..c5e3374 100644 --- a/core/modules/views/config/views.view.glossary.yml +++ b/core/modules/views/config/views.view.glossary.yml @@ -221,7 +221,7 @@ display: default_argument_options: argument: a summary: - format: default_summary + format: defaultSummary specify_validation: '1' glossary: '1' limit: '1' diff --git a/core/modules/views/config/views.view.taxonomy_term.yml b/core/modules/views/config/views.view.taxonomy_term.yml index 850909b..0146907 100644 --- a/core/modules/views/config/views.view.taxonomy_term.yml +++ b/core/modules/views/config/views.view.taxonomy_term.yml @@ -90,7 +90,7 @@ display: title: '%1' default_argument_type: fixed summary: - format: default_summary + format: defaultSummary specify_validation: '1' validate: type: taxonomy_term @@ -116,7 +116,7 @@ display: title_enable: '1' default_argument_type: fixed summary: - format: default_summary + format: defaultSummary specify_validation: '1' plugin_id: taxonomy_index_tid_depth_modifier relationship: none diff --git a/core/modules/views/config/views.view.tracker.yml b/core/modules/views/config/views.view.tracker.yml index 1e245016..50d7323 100644 --- a/core/modules/views/config/views.view.tracker.yml +++ b/core/modules/views/config/views.view.tracker.yml @@ -463,7 +463,7 @@ display: title: 'Recent posts for %1' default_argument_type: fixed summary: - format: default_summary + format: defaultSummary specify_validation: '1' plugin_id: argument_comment_user_uid relationship: none diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php index 81f6e85..fe5a499 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php @@ -59,7 +59,7 @@ public function buildOptionsForm(&$form, &$form_state) { */ function render($empty = FALSE) { // Must have options and does not work on summaries. - if (!isset($this->options['content']) || $this->view->plugin_name == 'default_summary') { + if (!isset($this->options['content']) || $this->view->plugin_name == 'defaultSummary') { return array(); } $output = ''; 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 117ade9..7e56568 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 @@ -145,7 +145,7 @@ protected function defineOptions() { 'contains' => array( 'sort_order' => array('default' => 'asc'), 'number_of_records' => array('default' => 0), - 'format' => array('default' => 'default_summary'), + 'format' => array('default' => 'defaultSummary'), ), ); $options['specify_validation'] = array('default' => FALSE, 'bool' => TRUE); @@ -462,8 +462,8 @@ function default_actions($which = NULL) { ), 'summary' => array( 'title' => t('Display a summary'), - 'method' => 'default_summary', - 'form method' => 'default_summary_form', + 'method' => 'defaultSummary', + 'form method' => 'defaultSummary_form', 'style plugin' => TRUE, 'breadcrumb' => TRUE, // generate a breadcrumb to here ), @@ -562,7 +562,7 @@ function default_argument_form(&$form, &$form_state) { * Provide a form for selecting further summary options when the * default action is set to display one. */ - function default_summary_form(&$form, &$form_state) { + function defaultSummary_form(&$form, &$form_state) { $style_plugins = Views::pluginManager('style')->getDefinitions(); $summary_plugins = array(); $format_options = array(); @@ -768,7 +768,7 @@ function process_summary_arguments(&$args) { * If an argument was expected and was not given, in this case, display * a summary query. */ - function default_summary() { + function defaultSummary() { $this->view->build_info['summary'] = TRUE; $this->view->build_info['summary_level'] = $this->options['id']; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php index 3d28046..631a8d3 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php @@ -17,7 +17,7 @@ * @ingroup views_style_plugins * * @Plugin( - * id = "default_summary", + * id = "defaultSummary", * title = @Translation("List"), * help = @Translation("Displays the default summary as a list."), * theme = "views_view_summary", diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewElementTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewElementTest.php index 3d9371b..fd4a3f5 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ViewElementTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/ViewElementTest.php @@ -87,7 +87,7 @@ public function testViewElement() { $view->displayHandlers->get('default')->overrideOption('arguments', array( 'age' => array( 'default_action' => 'ignore', - 'style_plugin' => 'default_summary', + 'style_plugin' => 'defaultSummary', 'style_options' => array(), 'wildcard' => 'all', 'wildcard_substitution' => 'All', diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php index a8a8dd2..d530195 100644 --- a/core/modules/views/lib/Drupal/views/ViewExecutable.php +++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php @@ -353,7 +353,7 @@ class ViewExecutable { /** * The options used by the style plugin of this running view. * - * @todo To be able to remove it, Drupal\views\Plugin\views\argument\ArgumentPluginBase::default_summary() + * @todo To be able to remove it, Drupal\views\Plugin\views\argument\ArgumentPluginBase::defaultSummary() * should instantiate the style plugin. * @var array */ diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_aggregate_count.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_aggregate_count.yml index 0526e68..55054c2 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_aggregate_count.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_aggregate_count.yml @@ -14,7 +14,7 @@ display: field: type id: type summary: - format: default_summary + format: defaultSummary table: node plugin_id: node_type cache: diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_fixed.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_fixed.yml index 333899e..464bb2d 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_fixed.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_fixed.yml @@ -14,7 +14,7 @@ display: field: 'null' id: 'null' must_not_be: '0' - style_plugin: default_summary + style_plugin: defaultSummary table: views plugin_id: 'null' cache: diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml index 8342fc0..04aee61 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml @@ -34,21 +34,21 @@ display: default_argument_type: fixed field: created_day id: created_day - style_plugin: default_summary + style_plugin: defaultSummary table: node plugin_id: date_day created_fulldate: default_argument_type: fixed field: created_fulldate id: created_fulldate - style_plugin: default_summary + style_plugin: defaultSummary table: node plugin_id: date_fulldate created_month: default_argument_type: fixed field: created_month id: created_month - style_plugin: default_summary + style_plugin: defaultSummary table: node plugin_id: date_month cache: diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_glossary.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_glossary.yml index 7054d2f..d6d8d24 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_glossary.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_glossary.yml @@ -15,7 +15,7 @@ display: id: title limit: '1' summary: - format: default_summary + format: defaultSummary number_of_records: '0' summary_options: items_per_page: '25' diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_simple_argument.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_simple_argument.yml index 16cec76..1c266f2 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_simple_argument.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_simple_argument.yml @@ -42,7 +42,7 @@ display: arguments: age: default_action: ignore - style_plugin: default_summary + style_plugin: defaultSummary style_options: { } wildcard: all wildcard_substitution: All diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml index 192746d..2efdd5f 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml @@ -13,7 +13,7 @@ display: field: 'null' id: 'null' must_not_be: '0' - style_plugin: default_summary + style_plugin: defaultSummary table: views validate: type: numeric diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_php.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_php.yml index 11dd632..c3f0097 100644 --- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_php.yml +++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_php.yml @@ -13,7 +13,7 @@ display: field: 'null' id: 'null' must_not_be: '0' - style_plugin: default_summary + style_plugin: defaultSummary table: views validate: type: php