diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php index 7c736e8adf..34ce858b13 100644 --- a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php +++ b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php @@ -250,7 +250,7 @@ public function id() { /** * {@inheritdoc} */ - public function preSave(EntityStorageInterface $storage, $update = TRUE) { + public function preSave(EntityStorageInterface $storage) { // Ensure that a region is set on each component. foreach ($this->getComponents() as $name => $component) { $this->handleHiddenType($name, $component); @@ -263,7 +263,7 @@ public function preSave(EntityStorageInterface $storage, $update = TRUE) { ksort($this->content); ksort($this->hidden); - parent::preSave($storage, $update); + parent::preSave($storage); } /** diff --git a/core/lib/Drupal/Core/Field/FieldItemList.php b/core/lib/Drupal/Core/Field/FieldItemList.php index 152005bcf3..52bf9c9d23 100644 --- a/core/lib/Drupal/Core/Field/FieldItemList.php +++ b/core/lib/Drupal/Core/Field/FieldItemList.php @@ -95,18 +95,6 @@ public function filterEmptyItems() { return $this; } - /** - * {@inheritdoc} - * @todo Revisit the need when all entity types are converted to NG entities. - */ - public function getValue($include_computed = FALSE) { - $values = []; - foreach ($this->list as $delta => $item) { - $values[$delta] = $item->getValue($include_computed); - } - return $values; - } - /** * {@inheritdoc} */ diff --git a/core/modules/comment/src/Plugin/Menu/LocalTask/UnapprovedComments.php b/core/modules/comment/src/Plugin/Menu/LocalTask/UnapprovedComments.php index 89542d34ff..e946bfb9f8 100644 --- a/core/modules/comment/src/Plugin/Menu/LocalTask/UnapprovedComments.php +++ b/core/modules/comment/src/Plugin/Menu/LocalTask/UnapprovedComments.php @@ -7,6 +7,7 @@ use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\HttpFoundation\Request; /** * Provides a local task that shows the amount of unapproved comments. @@ -53,7 +54,7 @@ public static function create(ContainerInterface $container, array $configuratio /** * {@inheritdoc} */ - public function getTitle() { + public function getTitle(Request $request = NULL) { return $this->t('Unapproved comments (@count)', ['@count' => $this->commentStorage->getUnapprovedCount()]); } diff --git a/core/modules/comment/src/Tests/Views/CommentTestBase.php b/core/modules/comment/src/Tests/Views/CommentTestBase.php index 3d10858351..c364e2631f 100644 --- a/core/modules/comment/src/Tests/Views/CommentTestBase.php +++ b/core/modules/comment/src/Tests/Views/CommentTestBase.php @@ -63,8 +63,8 @@ */ protected $comment; - protected function setUp() { - parent::setUp(); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); ViewTestData::createTestViews(get_class($this), ['comment_test_views']); diff --git a/core/modules/config_translation/src/Plugin/Menu/ContextualLink/ConfigTranslationContextualLink.php b/core/modules/config_translation/src/Plugin/Menu/ContextualLink/ConfigTranslationContextualLink.php index 63145a5d3b..fff82f0c72 100644 --- a/core/modules/config_translation/src/Plugin/Menu/ContextualLink/ConfigTranslationContextualLink.php +++ b/core/modules/config_translation/src/Plugin/Menu/ContextualLink/ConfigTranslationContextualLink.php @@ -5,6 +5,7 @@ use Drupal\Component\Utility\Unicode; use Drupal\Core\Menu\ContextualLinkDefault; use Drupal\Core\StringTranslation\StringTranslationTrait; +use Symfony\Component\HttpFoundation\Request; /** * Defines a contextual link plugin with a dynamic title. @@ -22,7 +23,7 @@ class ConfigTranslationContextualLink extends ContextualLinkDefault { /** * {@inheritdoc} */ - public function getTitle() { + public function getTitle(Request $request = NULL) { // Use the custom 'config_translation_plugin_id' plugin definition key to // retrieve the title. We need to retrieve a runtime title (as opposed to // storing the title on the plugin definition for the link) because it diff --git a/core/modules/config_translation/src/Plugin/Menu/LocalTask/ConfigTranslationLocalTask.php b/core/modules/config_translation/src/Plugin/Menu/LocalTask/ConfigTranslationLocalTask.php index 5a88d91d0a..0aa84d2243 100644 --- a/core/modules/config_translation/src/Plugin/Menu/LocalTask/ConfigTranslationLocalTask.php +++ b/core/modules/config_translation/src/Plugin/Menu/LocalTask/ConfigTranslationLocalTask.php @@ -5,6 +5,7 @@ use Drupal\Component\Utility\Unicode; use Drupal\Core\Menu\LocalTaskDefault; use Drupal\Core\StringTranslation\StringTranslationTrait; +use Symfony\Component\HttpFoundation\Request; /** * Defines a local task plugin with a dynamic title. @@ -22,7 +23,7 @@ class ConfigTranslationLocalTask extends LocalTaskDefault { /** * {@inheritdoc} */ - public function getTitle() { + public function getTitle(Request $request = NULL) { // Take custom 'config_translation_plugin_id' plugin definition key to // retrieve title. We need to retrieve a runtime title (as opposed to // storing the title on the plugin definition for the link) because diff --git a/core/modules/datetime/src/DateTimeComputed.php b/core/modules/datetime/src/DateTimeComputed.php index 2208ab7cb7..73fb117862 100644 --- a/core/modules/datetime/src/DateTimeComputed.php +++ b/core/modules/datetime/src/DateTimeComputed.php @@ -37,7 +37,7 @@ public function __construct(DataDefinitionInterface $definition, $name = NULL, T /** * {@inheritdoc} */ - public function getValue($langcode = NULL) { + public function getValue() { if ($this->date !== NULL) { return $this->date; } diff --git a/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php b/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php index 0f068ab9ee..854352eb5b 100644 --- a/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php +++ b/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php @@ -43,8 +43,8 @@ /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); // Add a date field to page nodes. $node_type = NodeType::create([ diff --git a/core/modules/field/src/Tests/Views/FieldTestBase.php b/core/modules/field/src/Tests/Views/FieldTestBase.php index f04e19fb9b..c01e9604cf 100644 --- a/core/modules/field/src/Tests/Views/FieldTestBase.php +++ b/core/modules/field/src/Tests/Views/FieldTestBase.php @@ -42,8 +42,8 @@ */ public $fields; - protected function setUp() { - parent::setUp(); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); // Ensure the page node type exists. NodeType::create([ diff --git a/core/modules/field/src/Tests/Views/FieldUITest.php b/core/modules/field/src/Tests/Views/FieldUITest.php index 851b7bdff9..efe768505b 100644 --- a/core/modules/field/src/Tests/Views/FieldUITest.php +++ b/core/modules/field/src/Tests/Views/FieldUITest.php @@ -38,8 +38,8 @@ class FieldUITest extends FieldTestBase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); $this->account = $this->drupalCreateUser(['administer views']); $this->drupalLogin($this->account); diff --git a/core/modules/field/src/Tests/Views/HandlerFieldFieldTest.php b/core/modules/field/src/Tests/Views/HandlerFieldFieldTest.php index dfbb89bd20..da958e90f5 100644 --- a/core/modules/field/src/Tests/Views/HandlerFieldFieldTest.php +++ b/core/modules/field/src/Tests/Views/HandlerFieldFieldTest.php @@ -41,8 +41,8 @@ class HandlerFieldFieldTest extends FieldTestBase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); // Setup basic fields. $this->setUpFieldStorages(3); diff --git a/core/modules/file/src/Tests/Views/RelationshipUserFileDataTest.php b/core/modules/file/src/Tests/Views/RelationshipUserFileDataTest.php index 6a5f53b5d3..45e016d169 100644 --- a/core/modules/file/src/Tests/Views/RelationshipUserFileDataTest.php +++ b/core/modules/file/src/Tests/Views/RelationshipUserFileDataTest.php @@ -30,8 +30,8 @@ class RelationshipUserFileDataTest extends ViewTestBase { */ public static $testViews = ['test_file_user_file_data']; - protected function setUp() { - parent::setUp(); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); // Create the user profile field and instance. FieldStorageConfig::create([ diff --git a/core/modules/forum/src/Form/Overview.php b/core/modules/forum/src/Form/Overview.php index a51446b173..efc9266418 100644 --- a/core/modules/forum/src/Form/Overview.php +++ b/core/modules/forum/src/Form/Overview.php @@ -8,6 +8,7 @@ use Drupal\Core\Url; use Drupal\taxonomy\Form\OverviewTerms; use Drupal\Core\Extension\ModuleHandlerInterface; +use Drupal\taxonomy\VocabularyInterface; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** @@ -47,7 +48,7 @@ public function getFormId() { /** * {@inheritdoc} */ - public function buildForm(array $form, FormStateInterface $form_state) { + public function buildForm(array $form, FormStateInterface $form_state, VocabularyInterface $taxonomy_vocabulary = NULL) { $forum_config = $this->config('forum.settings'); $vid = $forum_config->get('vocabulary'); $vocabulary = $this->entityManager->getStorage('taxonomy_vocabulary')->load($vid); diff --git a/core/modules/image/src/Tests/Views/RelationshipUserImageDataTest.php b/core/modules/image/src/Tests/Views/RelationshipUserImageDataTest.php index 55cecc0fc0..374981f63a 100644 --- a/core/modules/image/src/Tests/Views/RelationshipUserImageDataTest.php +++ b/core/modules/image/src/Tests/Views/RelationshipUserImageDataTest.php @@ -30,8 +30,8 @@ class RelationshipUserImageDataTest extends ViewTestBase { */ public static $testViews = ['test_image_user_image_data']; - protected function setUp() { - parent::setUp(); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); // Create the user profile field and instance. FieldStorageConfig::create([ diff --git a/core/modules/layout_builder/src/Form/UpdateBlockForm.php b/core/modules/layout_builder/src/Form/UpdateBlockForm.php index 2f2aa600e4..dfa33e04b6 100644 --- a/core/modules/layout_builder/src/Form/UpdateBlockForm.php +++ b/core/modules/layout_builder/src/Form/UpdateBlockForm.php @@ -39,7 +39,7 @@ public function getFormId() { * @return array * The form array. */ - public function buildForm(array $form, FormStateInterface $form_state, EntityInterface $entity = NULL, $delta = NULL, $region = NULL, $uuid = NULL) { + public function buildForm(array $form, FormStateInterface $form_state, EntityInterface $entity = NULL, $delta = NULL, $region = NULL, $uuid = NULL, array $configuration = []) { /** @var \Drupal\layout_builder\Field\LayoutSectionItemInterface $field */ $field = $entity->layout_builder__layout->get($delta); $block = $field->getSection()->getBlock($region, $uuid); diff --git a/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php b/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php index 80913ece8d..968c02f830 100644 --- a/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php +++ b/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php @@ -38,8 +38,8 @@ class LinkViewsTokensTest extends ViewTestBase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); ViewTestData::createTestViews(get_class($this), ['link_test_views']); // Create Basic page node type. diff --git a/core/modules/migrate/src/Plugin/migrate/source/EmbeddedDataSource.php b/core/modules/migrate/src/Plugin/migrate/source/EmbeddedDataSource.php index 8cee6ddbe4..11f32cf563 100644 --- a/core/modules/migrate/src/Plugin/migrate/source/EmbeddedDataSource.php +++ b/core/modules/migrate/src/Plugin/migrate/source/EmbeddedDataSource.php @@ -108,7 +108,7 @@ public function getIds() { /** * {@inheritdoc} */ - public function count() { + public function count($refresh = FALSE) { return count($this->dataRows); } diff --git a/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php b/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php index 5f44035e25..09f8a95792 100644 --- a/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php +++ b/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php @@ -58,7 +58,7 @@ public function getIds() { /** * {@inheritdoc} */ - public function count() { + public function count($refresh = FALSE) { return 1; } diff --git a/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php b/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php index a98e718696..653eac38e4 100644 --- a/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php +++ b/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php @@ -37,9 +37,9 @@ public function delete() { /** * {@inheritdoc} */ - public function getValue($include_computed = FALSE) { + public function getValue() { $this->ensureLoaded(); - return parent::getValue($include_computed); + return parent::getValue(); } /** diff --git a/core/modules/statistics/src/Tests/Views/IntegrationTest.php b/core/modules/statistics/src/Tests/Views/IntegrationTest.php index 18f5581587..740ecf5e53 100644 --- a/core/modules/statistics/src/Tests/Views/IntegrationTest.php +++ b/core/modules/statistics/src/Tests/Views/IntegrationTest.php @@ -42,8 +42,8 @@ class IntegrationTest extends ViewTestBase { */ public static $testViews = ['test_statistics_integration']; - protected function setUp() { - parent::setUp(); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); ViewTestData::createTestViews(get_class($this), ['statistics_test_views']); diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/ContextualLink/TestContextualLink.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/ContextualLink/TestContextualLink.php index 271922936e..8257d32232 100644 --- a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/ContextualLink/TestContextualLink.php +++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/ContextualLink/TestContextualLink.php @@ -3,6 +3,7 @@ namespace Drupal\menu_test\Plugin\Menu\ContextualLink; use Drupal\Core\Menu\ContextualLinkDefault; +use Symfony\Component\HttpFoundation\Request; /** * Defines a contextual link plugin with a dynamic title from user input. @@ -12,7 +13,7 @@ class TestContextualLink extends ContextualLinkDefault { /** * {@inheritdoc} */ - public function getTitle() { + public function getTitle(Request $request = NULL) { return ""; } diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction.php index 4b9289eef1..13f2e5a023 100644 --- a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction.php +++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction.php @@ -3,6 +3,7 @@ namespace Drupal\menu_test\Plugin\Menu\LocalAction; use Drupal\Core\Menu\LocalActionDefault; +use Symfony\Component\HttpFoundation\Request; /** * Defines a test local action plugin class. @@ -12,7 +13,7 @@ class TestLocalAction extends LocalActionDefault { /** * {@inheritdoc} */ - public function getTitle() { + public function getTitle(Request $request = NULL) { return 'Title override'; } diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction4.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction4.php index 1f8300a4ba..eb8b1893c5 100644 --- a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction4.php +++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction4.php @@ -4,6 +4,7 @@ use Drupal\Core\Menu\LocalActionDefault; use Drupal\Core\StringTranslation\StringTranslationTrait; +use Symfony\Component\HttpFoundation\Request; /** * Defines a local action plugin with a dynamic title. @@ -15,7 +16,7 @@ class TestLocalAction4 extends LocalActionDefault { /** * {@inheritdoc} */ - public function getTitle() { + public function getTitle(Request $request = NULL) { return $this->t('My @arg action', ['@arg' => 'dynamic-title']); } diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction5.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction5.php index 0bd7fc3875..e960e26613 100644 --- a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction5.php +++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction5.php @@ -3,6 +3,7 @@ namespace Drupal\menu_test\Plugin\Menu\LocalAction; use Drupal\Core\Menu\LocalActionDefault; +use Symfony\Component\HttpFoundation\Request; /** * Defines a local action plugin with a dynamic title from user input. @@ -12,7 +13,7 @@ class TestLocalAction5 extends LocalActionDefault { /** * {@inheritdoc} */ - public function getTitle() { + public function getTitle(Request $request = NULL) { return ""; } diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalActionWithConfig.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalActionWithConfig.php index 54a2f42246..4f56977e86 100644 --- a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalActionWithConfig.php +++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalActionWithConfig.php @@ -6,6 +6,7 @@ use Drupal\Core\Menu\LocalActionDefault; use Drupal\Core\Routing\RouteProviderInterface; use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\HttpFoundation\Request; /** * Defines a test local action plugin class. @@ -20,7 +21,7 @@ class TestLocalActionWithConfig extends LocalActionDefault { /** * {@inheritdoc} */ - public function getTitle() { + public function getTitle(Request $request = NULL) { return $this->config->get('title'); } diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php index 7ba7548846..61ac9705a0 100644 --- a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php +++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php @@ -4,6 +4,7 @@ use Drupal\Core\Menu\LocalTaskDefault; use Drupal\Core\StringTranslation\StringTranslationTrait; +use Symfony\Component\HttpFoundation\Request; class TestTasksSettingsSub1 extends LocalTaskDefault { @@ -12,7 +13,7 @@ class TestTasksSettingsSub1 extends LocalTaskDefault { /** * {@inheritdoc} */ - public function getTitle() { + public function getTitle(Request $request = NULL) { return $this->t('Dynamic title for @class', ['@class' => 'TestTasksSettingsSub1']); } diff --git a/core/modules/tracker/src/Tests/Views/TrackerTestBase.php b/core/modules/tracker/src/Tests/Views/TrackerTestBase.php index 9746a22a51..4dfaab03bc 100644 --- a/core/modules/tracker/src/Tests/Views/TrackerTestBase.php +++ b/core/modules/tracker/src/Tests/Views/TrackerTestBase.php @@ -41,8 +41,8 @@ */ protected $comment; - protected function setUp() { - parent::setUp(); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); ViewTestData::createTestViews(get_class($this), ['tracker_test_views']); diff --git a/core/modules/views/src/Tests/FieldApiDataTest.php b/core/modules/views/src/Tests/FieldApiDataTest.php index f6d5159dd8..d2d035cfcc 100644 --- a/core/modules/views/src/Tests/FieldApiDataTest.php +++ b/core/modules/views/src/Tests/FieldApiDataTest.php @@ -35,8 +35,8 @@ class FieldApiDataTest extends FieldTestBase { */ protected $translationNodes; - protected function setUp() { - parent::setUp(FALSE); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); $field_names = $this->setUpFieldStorages(4); diff --git a/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php b/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php index e8d2549176..04ba4cab99 100644 --- a/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php +++ b/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php @@ -26,8 +26,8 @@ class DisplayFeedTest extends PluginTestBase { */ public static $modules = ['block', 'node', 'views']; - protected function setUp() { - parent::setUp(); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); $this->enableViewsTestModule(); diff --git a/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php b/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php index 4e84433dca..66a8bc826b 100644 --- a/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php +++ b/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php @@ -27,8 +27,8 @@ class StyleOpmlTest extends PluginTestBase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); $this->enableViewsTestModule(); diff --git a/core/modules/views/src/Tests/ViewAjaxTest.php b/core/modules/views/src/Tests/ViewAjaxTest.php index 5a966a8f76..820d9e2bc0 100644 --- a/core/modules/views/src/Tests/ViewAjaxTest.php +++ b/core/modules/views/src/Tests/ViewAjaxTest.php @@ -19,8 +19,8 @@ class ViewAjaxTest extends ViewTestBase { */ public static $testViews = ['test_ajax_view', 'test_view']; - protected function setUp() { - parent::setUp(); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); $this->enableViewsTestModule(); } diff --git a/core/modules/views/src/Tests/Wizard/WizardTestBase.php b/core/modules/views/src/Tests/Wizard/WizardTestBase.php index ba7509c865..29b96d38c1 100644 --- a/core/modules/views/src/Tests/Wizard/WizardTestBase.php +++ b/core/modules/views/src/Tests/Wizard/WizardTestBase.php @@ -21,8 +21,8 @@ */ public static $modules = ['node', 'views_ui', 'block', 'rest']; - protected function setUp() { - parent::setUp(); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); // Create and log in a user with administer views permission. $views_admin = $this->drupalCreateUser(['administer views', 'administer blocks', 'bypass node access', 'access user profiles', 'view all revisions']); diff --git a/core/modules/views_ui/src/Tests/UITestBase.php b/core/modules/views_ui/src/Tests/UITestBase.php index 83f2f85980..752be6e339 100644 --- a/core/modules/views_ui/src/Tests/UITestBase.php +++ b/core/modules/views_ui/src/Tests/UITestBase.php @@ -36,8 +36,8 @@ /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function setUp($import_test_views = TRUE) { + parent::setUp($import_test_views); $this->enableViewsTestModule();