diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php index 4da5800..a13d679 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php @@ -2531,11 +2531,11 @@ public function preExecute() { $this->view->initHandlers(); if ($this->usesExposed()) { $exposed_form = $this->getPlugin('exposed_form'); - $exposed_form->pre_execute(); + $exposed_form->preExecute(); } foreach ($this->extender as $extender) { - $extender->pre_execute(); + $extender->preExecute(); } $this->view->setShowAdminLinks($this->getOption('show_admin_links')); diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php index 02e030e..de7dc8b 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php @@ -41,7 +41,7 @@ public function submitOptionsForm(&$form, &$form_state) { } /** * Set up any variables on the view prior to execution. */ - public function pre_execute() { } + public function preExecute() { } /** * Inject anything into the query that the display_extender handler needs. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php index 0255179..e7fc991 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php @@ -178,7 +178,7 @@ function pre_render($values) { } function post_render(&$output) { } - function pre_execute() { } + public function preExecute() { } public function postExecute() { } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php index 49ef067..0f2e0e3 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php @@ -205,7 +205,7 @@ public function query() { } /** * Perform any needed actions just prior to the query executing. */ - function pre_execute(&$query) { } + public function preExecute(&$query) { } /** * Perform any needed actions just after the query executing. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php index 3f7c8bd..d8e39c7 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php @@ -1482,7 +1482,7 @@ function execute(ViewExecutable $view) { } // Let the pager modify the query to add limits. - $view->pager->pre_execute($query); + $view->pager->preExecute($query); if (!empty($this->limit) || !empty($this->offset)) { // We can't have an offset without a limit, so provide a very large limit instead. diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayExtenderTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayExtenderTest.php index 3ab1a9b..5d9e69c 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayExtenderTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayExtenderTest.php @@ -53,7 +53,7 @@ public function testDisplayExtenders() { $this->assertTrue($display_extender instanceof \Drupal\views_test_data\Plugin\views\display_extender\DisplayExtenderTest, 'Make sure the right class got initialized.'); $view->preExecute(); - $this->assertTrue($display_extender->testState['pre_execute'], 'Make sure the display extender was able to react on preExecute.'); + $this->assertTrue($display_extender->testState['preExecute'], 'Make sure the display extender was able to react on preExecute.'); $view->execute(); $this->assertTrue($display_extender->testState['query'], 'Make sure the display extender was able to react on query.'); } diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php index 82a212d..248526b 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php @@ -102,10 +102,10 @@ public function query() { } /** - * Overrides Drupal\views\Plugin\views\display\DisplayExtenderPluginBase::pre_execute(). + * Overrides Drupal\views\Plugin\views\display\DisplayExtenderPluginBase::preExecute(). */ - public function pre_execute() { - $this->testState['pre_execute'] = TRUE; + public function preExecute() { + $this->testState['preExecute'] = TRUE; } }