diff --git a/core/modules/action/action.views_execution.inc b/core/modules/action/action.views_execution.inc deleted file mode 100644 index b9acfe9fc24492a516e8ded6ab84b316e9f95cc5..0000000000000000000000000000000000000000 --- a/core/modules/action/action.views_execution.inc +++ /dev/null @@ -1,20 +0,0 @@ -<?php - -/** - * @file - * Provides views runtime hooks for action.module. - */ - -/** - * Implements hook_views_form_substitutions(). - */ -function action_views_form_substitutions() { - $select_all = [ - '#type' => 'checkbox', - '#default_value' => FALSE, - '#attributes' => ['class' => ['action-table-select-all']], - ]; - return [ - '<!--action-bulk-form-select-all-->' => \Drupal::service('renderer')->render($select_all), - ]; -} diff --git a/core/modules/action/tests/src/Functional/ActionUninstallTest.php b/core/modules/action/tests/src/Functional/ActionUninstallTest.php index 5b01099fd216a37e4d9ba07d30c8afe57fe81b3c..76170b16699790b738d9e45217e51aeaf8999566 100644 --- a/core/modules/action/tests/src/Functional/ActionUninstallTest.php +++ b/core/modules/action/tests/src/Functional/ActionUninstallTest.php @@ -8,7 +8,8 @@ * Tests that uninstalling actions does not remove other module's actions. * * @group action - * @see \Drupal\action\Plugin\views\field\BulkForm + * @see \Drupal\views\Plugin\views\field\BulkForm + * @see \Drupal\user\Plugin\Action\BlockUser */ class ActionUninstallTest extends BrowserTestBase { diff --git a/core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml b/core/modules/views/tests/modules/action_bulk_test/action_bulk_test.info.yml similarity index 91% rename from core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml rename to core/modules/views/tests/modules/action_bulk_test/action_bulk_test.info.yml index 810e72ca3470b010be6cffeabc0179890f75b51e..e80c7504f0cbe34ae8c782b2ffdadf3be3115515 100644 --- a/core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml +++ b/core/modules/views/tests/modules/action_bulk_test/action_bulk_test.info.yml @@ -5,6 +5,5 @@ package: Testing version: VERSION core: 8.x dependencies: - - drupal:action - drupal:views - drupal:node diff --git a/core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml b/core/modules/views/tests/modules/action_bulk_test/config/install/views.view.test_bulk_form.yml similarity index 100% rename from core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml rename to core/modules/views/tests/modules/action_bulk_test/config/install/views.view.test_bulk_form.yml diff --git a/core/modules/action/tests/src/Functional/BulkFormTest.php b/core/modules/views/tests/src/Functional/BulkFormTest.php similarity index 98% rename from core/modules/action/tests/src/Functional/BulkFormTest.php rename to core/modules/views/tests/src/Functional/BulkFormTest.php index ec6ca482bca8633df00ab41662f625e09f0d2a8c..278a1ec7b9d5d887563408b8334529038ddd7380 100644 --- a/core/modules/action/tests/src/Functional/BulkFormTest.php +++ b/core/modules/views/tests/src/Functional/BulkFormTest.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Tests\action\Functional; +namespace Drupal\Tests\views\Functional; use Drupal\Tests\BrowserTestBase; use Drupal\views\Views; @@ -8,8 +8,8 @@ /** * Tests the views bulk form test. * - * @group action - * @see \Drupal\action\Plugin\views\field\BulkForm + * @group views + * @see \Drupal\views\Plugin\views\field\BulkForm */ class BulkFormTest extends BrowserTestBase { diff --git a/core/modules/views/views.views_execution.inc b/core/modules/views/views.views_execution.inc index 8b324a359bf045d5342fea73cd6efd83a8ff50a3..60b1adc04c65cde693327889e9707a0272ee277d 100644 --- a/core/modules/views/views.views_execution.inc +++ b/core/modules/views/views.views_execution.inc @@ -25,3 +25,17 @@ function views_views_query_substitutions(ViewExecutable $view) { return $substitutions; } + +/** + * Implements hook_views_form_substitutions(). + */ +function views_views_form_substitutions() { + $select_all = [ + '#type' => 'checkbox', + '#default_value' => FALSE, + '#attributes' => ['class' => ['action-table-select-all']], + ]; + return [ + '<!--action-bulk-form-select-all-->' => \Drupal::service('renderer')->render($select_all), + ]; +} diff --git a/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php b/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php index bbb3d6a5a02c7249261f791da98ccc1758f5ecbc..df57e1213e35d1a904a329bd457b5c6740cb35f5 100644 --- a/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php +++ b/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php @@ -86,7 +86,7 @@ class ResolvedLibraryDefinitionsFilesMatchTest extends KernelTestBase { /** * {@inheritdoc} */ - public static $modules = ['system']; + public static $modules = ['system', 'user']; /** * {@inheritdoc} @@ -114,6 +114,7 @@ protected function setUp() { unset($all_modules['demo_umami_content']); $this->allModules = array_keys($all_modules); $this->allModules[] = 'system'; + $this->allModules[] = 'user'; sort($this->allModules); $this->container->get('module_installer')->install($this->allModules); diff --git a/core/tests/Drupal/KernelTests/Core/Theme/StableLibraryOverrideTest.php b/core/tests/Drupal/KernelTests/Core/Theme/StableLibraryOverrideTest.php index 1976b2684c29250cba086ceb4935d9d7436fb9a3..049438b25402676e61f12ac83e0c9d83b7e8b01f 100644 --- a/core/tests/Drupal/KernelTests/Core/Theme/StableLibraryOverrideTest.php +++ b/core/tests/Drupal/KernelTests/Core/Theme/StableLibraryOverrideTest.php @@ -49,7 +49,7 @@ class StableLibraryOverrideTest extends KernelTestBase { /** * {@inheritdoc} */ - public static $modules = ['system']; + public static $modules = ['system', 'user']; /** * {@inheritdoc} @@ -71,6 +71,7 @@ protected function setUp() { }); $this->allModules = array_keys($all_modules); $this->allModules[] = 'system'; + $this->allModules[] = 'user'; sort($this->allModules); $this->container->get('module_installer')->install($this->allModules);