--- 1812.diff	2022-02-20 20:11:22.025211900 +0100
+++ 1852.diff	2022-02-20 20:11:18.074863200 +0100
@@ -563,31 +563,31 @@
      'block_content',
      'comment',
 diff --git a/core/modules/block_content/tests/src/Functional/Views/BlockContentFieldFilterTest.php b/core/modules/block_content/tests/src/Functional/Views/BlockContentFieldFilterTest.php
-index 60249e60e47f4fbb5b1493e42fe9d9eab4faaba4..bf250d0e02c360d2202765323a420d08d2fa61a2 100644
+index 2946c9cadb97050b1919dd4b73829d9b891d5f0a..40e30f3b5a8314a4087e4afcce31faa2fc257ebf 100644
 --- a/core/modules/block_content/tests/src/Functional/Views/BlockContentFieldFilterTest.php
 +++ b/core/modules/block_content/tests/src/Functional/Views/BlockContentFieldFilterTest.php
 @@ -39,8 +39,8 @@ class BlockContentFieldFilterTest extends BlockContentTestBase {
    /**
     * {@inheritdoc}
     */
--  public function setUp($import_test_views = TRUE): void {
+-  protected function setUp($import_test_views = TRUE): void {
 -    parent::setUp($import_test_views);
-+  public function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
++  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
 +    parent::setUp($import_test_views, $test_views_module);
  
      // Add two new languages.
      ConfigurableLanguage::createFromLangcode('fr')->save();
 diff --git a/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php b/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php
-index 766e43fb780c076cc59212ca69290e06d6cd2307..d2e7c233c22880aa24ce16601829a7a10f08a90e 100644
+index 04b270f7a9d13d638fde8c6e8fe8f25a2e103911..54bef5a21b7713a0c321459529162390b6528776 100644
 --- a/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php
 +++ b/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php
 @@ -40,8 +40,8 @@ abstract class BlockContentTestBase extends ViewTestBase {
      'block_content_test_views',
    ];
  
--  protected function setUp($import_test_views = TRUE) {
+-  protected function setUp($import_test_views = TRUE): void {
 -    parent::setUp($import_test_views);
-+  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']) {
++  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
 +    parent::setUp($import_test_views, $test_views_module);
      // Ensure the basic bundle exists. This is provided by the standard profile.
      $this->createBlockContentType(['id' => 'basic']);
@@ -711,16 +711,16 @@
  
      // Add a date field to page nodes.
 diff --git a/core/modules/field/tests/src/Functional/Views/FieldTestBase.php b/core/modules/field/tests/src/Functional/Views/FieldTestBase.php
-index 7a47b4140f71db52cbb8065bdd9901f9d025f2af..1b82ad01a10af40602a6420f77c084067ba5d78f 100644
+index 5bda2f24da83ba1b89741ae0638ac5b4fcbbd66f..213da2c6e16e5a7327c104db43b3097e8d909d94 100644
 --- a/core/modules/field/tests/src/Functional/Views/FieldTestBase.php
 +++ b/core/modules/field/tests/src/Functional/Views/FieldTestBase.php
 @@ -42,8 +42,8 @@ abstract class FieldTestBase extends ViewTestBase {
     */
    public $fields;
  
--  protected function setUp($import_test_views = TRUE) {
+-  protected function setUp($import_test_views = TRUE): void {
 -    parent::setUp($import_test_views);
-+  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']) {
++  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
 +    parent::setUp($import_test_views, $test_views_module);
  
      // Ensure the page node type exists.
@@ -942,16 +942,16 @@
      // Create Page content type.
      if ($this->profile != 'standard') {
 diff --git a/core/modules/node/tests/src/Functional/Views/NodeTestBase.php b/core/modules/node/tests/src/Functional/Views/NodeTestBase.php
-index 9e3062e6c854cbc7c589da2068defe69068d1815..f937a4e6daaf7ef14c7d8ef02d7d38c8efd0a24a 100644
+index 0bbeef888e1d2343f745ee44e75076a4492aa8d2..a380948794c6426af1e651d35f5102288fb238da 100644
 --- a/core/modules/node/tests/src/Functional/Views/NodeTestBase.php
 +++ b/core/modules/node/tests/src/Functional/Views/NodeTestBase.php
 @@ -18,8 +18,8 @@ abstract class NodeTestBase extends ViewTestBase {
    /**
     * {@inheritdoc}
     */
--  protected function setUp($import_test_views = TRUE) {
+-  protected function setUp($import_test_views = TRUE): void {
 -    parent::setUp($import_test_views);
-+  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']) {
++  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
 +    parent::setUp($import_test_views, $test_views_module);
  
      if ($import_test_views) {
@@ -1032,16 +1032,16 @@
      ViewTestData::createTestViews(static::class, ['rest_test_views']);
  
 diff --git a/core/modules/rest/tests/src/Functional/Views/RestExportAuthTest.php b/core/modules/rest/tests/src/Functional/Views/RestExportAuthTest.php
-index 5f371ccfde94a68c4953b8fcaf85c385c1b29436..f528abf16834308bb371b9ad4d17b7d048f40319 100644
+index dfc3595aa6d2eb3425d686bc5e6af737d404ccf3..006d917fa13df05526522e9cc2f3b3f725a3df92 100644
 --- a/core/modules/rest/tests/src/Functional/Views/RestExportAuthTest.php
 +++ b/core/modules/rest/tests/src/Functional/Views/RestExportAuthTest.php
 @@ -25,8 +25,8 @@ class RestExportAuthTest extends ViewTestBase {
    /**
     * {@inheritdoc}
     */
--  public function setUp($import_test_views = TRUE): void {
+-  protected function setUp($import_test_views = TRUE): void {
 -    parent::setUp($import_test_views);
-+  public function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
++  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
 +    parent::setUp($import_test_views, $test_views_module);
  
      $this->drupalLogin($this->drupalCreateUser(['administer views']));
@@ -1077,16 +1077,16 @@
      ViewTestData::createTestViews(static::class, ['statistics_test_views']);
  
 diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php
-index 2f47bae8fb7245b7073bec5ae91a1a4fc726dbef..2c89a683a50e09df6edc6c3930f813e4ad81a64d 100644
+index 74b24df599aa235adc9757d634a0310f21521918..6f8853670a6eb62ca2957d923ed2e8636eb8f085 100644
 --- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php
 +++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php
 @@ -57,8 +57,8 @@ class TaxonomyFieldFilterTest extends ViewTestBase {
     */
    public $termNames = [];
  
--  public function setUp($import_test_views = TRUE): void {
+-  protected function setUp($import_test_views = TRUE): void {
 -    parent::setUp($import_test_views);
-+  public function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
++  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
 +    parent::setUp($import_test_views, $test_views_module);
  
      // Add two new languages.
@@ -1182,16 +1182,16 @@
      // Create an administrative user.
      $this->adminUser = $this->drupalCreateUser([
 diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTestBase.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTestBase.php
-index 5a8c22cf5fa76ac614fb4a6b1ea5bc41f7d77157..e4a5065ac4e66c2ddcb662a188dcda73b9c0b6e4 100644
+index 083ee9e6c411eb2559bacd9c13ded205514c4007..6465886330decd3ce659df5d101b25632d3384ad 100644
 --- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTestBase.php
 +++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTestBase.php
 @@ -55,8 +55,8 @@ abstract class TaxonomyTestBase extends ViewTestBase {
    /**
     * {@inheritdoc}
     */
--  protected function setUp($import_test_views = TRUE) {
+-  protected function setUp($import_test_views = TRUE): void {
 -    parent::setUp($import_test_views);
-+  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']) {
++  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
 +    parent::setUp($import_test_views, $test_views_module);
      $this->mockStandardInstall();
  
@@ -1246,16 +1246,16 @@
      // Ensure that selecting '- None -' removes the admin role.
      $edit = [];
 diff --git a/core/modules/user/tests/src/Functional/Views/AccessTestBase.php b/core/modules/user/tests/src/Functional/Views/AccessTestBase.php
-index 2f302af3736bb2c6ff0d0673b79d5a9cfc49cae6..49dde1e08010b8bca66c08aa82864b79e64221d2 100644
+index 93c6bfb1a7ebfda3a10be2f408d1d07896132062..0876340443436054029f5d2d6a5f21dae6f252ee 100644
 --- a/core/modules/user/tests/src/Functional/Views/AccessTestBase.php
 +++ b/core/modules/user/tests/src/Functional/Views/AccessTestBase.php
 @@ -45,8 +45,8 @@ abstract class AccessTestBase extends UserTestBase {
    /**
     * {@inheritdoc}
     */
--  protected function setUp($import_test_views = TRUE) {
+-  protected function setUp($import_test_views = TRUE): void {
 -    parent::setUp($import_test_views);
-+  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']) {
++  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
 +    parent::setUp($import_test_views, $test_views_module);
      $this->drupalPlaceBlock('system_breadcrumb_block');
  
@@ -1306,16 +1306,16 @@
      ViewTestData::createTestViews(static::class, ['user_test_views']);
  
 diff --git a/core/modules/user/tests/src/Functional/Views/UserTestBase.php b/core/modules/user/tests/src/Functional/Views/UserTestBase.php
-index 0760b1b43dd8836d4bc09a27a16a823bb33492e4..438a9b9db660b3b6661dae96e4eea195242aa6b1 100644
+index efc2a8ab1392524ae5e1df970bb144be2f622e3d..21b7806cfa7c1feab209bbcabce03540a5b064ab 100644
 --- a/core/modules/user/tests/src/Functional/Views/UserTestBase.php
 +++ b/core/modules/user/tests/src/Functional/Views/UserTestBase.php
 @@ -32,8 +32,8 @@ abstract class UserTestBase extends ViewTestBase {
     */
    protected $nodes = [];
  
--  protected function setUp($import_test_views = TRUE) {
+-  protected function setUp($import_test_views = TRUE): void {
 -    parent::setUp($import_test_views);
-+  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']) {
++  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
 +    parent::setUp($import_test_views, $test_views_module);
  
      ViewTestData::createTestViews(static::class, ['user_test_views']);
@@ -1813,16 +1813,16 @@
      $this->drupalCreateContentType(['type' => 'page']);
      // Create a bunch of test nodes.
 diff --git a/core/modules/views/tests/src/Functional/Plugin/MonthDatePluginTest.php b/core/modules/views/tests/src/Functional/Plugin/MonthDatePluginTest.php
-index 3f3f2abfd2535af5d2c968e001fb699f5c33861d..21585a20b0f36b48b2d385175b7c099b1b036e5c 100644
+index 031a34526658c276d6f10edd536aa3f4be7bcb08..8e10a6f86a9d7807cc1949a747ddcb286c90a467 100644
 --- a/core/modules/views/tests/src/Functional/Plugin/MonthDatePluginTest.php
 +++ b/core/modules/views/tests/src/Functional/Plugin/MonthDatePluginTest.php
 @@ -48,8 +48,8 @@ class MonthDatePluginTest extends ViewTestBase {
    /**
     * {@inheritdoc}
     */
--  public function setUp($import_test_views = TRUE): void {
+-  protected function setUp($import_test_views = TRUE): void {
 -    parent::setUp($import_test_views);
-+  public function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
++  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
 +    parent::setUp($import_test_views, $test_views_module);
      $utc = new \DateTimeZone('UTC');
      $format = 'Y-m-d h:i:s';
@@ -1873,16 +1873,16 @@
      $this->enableViewsTestModule();
    }
 diff --git a/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php b/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php
-index edabcb016605f673f3c32cc044803194ed6e0416..9cc0612839594ba26f35495c3471e30ecee8be06 100644
+index 9550cfdceb8946d3f04a5d7bcca7233813cb018c..6f50b5ae2f0f8013be7b1177009c6c3cf74dc71b 100644
 --- a/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php
 +++ b/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php
 @@ -30,8 +30,8 @@ class ViewsBulkTest extends ViewTestBase {
     */
    protected $defaultTheme = 'stark';
  
--  public function setUp($import_test_views = TRUE): void {
+-  protected function setUp($import_test_views = TRUE): void {
 -    parent::setUp($import_test_views);
-+  public function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
++  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
 +    parent::setUp($import_test_views, $test_views_module);
  
      $this->drupalCreateContentType(['type' => 'page']);
@@ -1948,15 +1948,15 @@
      $this->enableViewsTestModule();
    }
 diff --git a/core/modules/views/tests/src/Functional/ViewTestBase.php b/core/modules/views/tests/src/Functional/ViewTestBase.php
-index beebadba2fe5bbe002356d431dfa656414ea518e..f6c3174e431363b22ec3d374668d150fd6a0ff34 100644
+index 30889ef254132217a3ea9a47431399566f2e4ad8..79947d59dec24536bc8f87d4c9edc451df09972e 100644
 --- a/core/modules/views/tests/src/Functional/ViewTestBase.php
 +++ b/core/modules/views/tests/src/Functional/ViewTestBase.php
 @@ -29,10 +29,10 @@ abstract class ViewTestBase extends BrowserTestBase {
     */
    protected static $modules = ['views', 'views_test_config'];
  
--  protected function setUp($import_test_views = TRUE) {
-+  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']) {
+-  protected function setUp($import_test_views = TRUE): void {
++  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
      parent::setUp();
      if ($import_test_views) {
 -      ViewTestData::createTestViews(static::class, ['views_test_config']);
@@ -1965,16 +1965,16 @@
    }
  
 diff --git a/core/modules/views/tests/src/Functional/ViewTranslationTest.php b/core/modules/views/tests/src/Functional/ViewTranslationTest.php
-index 6e6cb88a8714a3a3b1c5595e2346016a8cd56f08..1923d56d499c5242b506f56c16b0ca039ee1889a 100644
+index 9df3ea7e1d2a145d3b8ae05f8567d3959724286e..4d09b99c9a07e2f3b0e24465f56b17069dbae901 100644
 --- a/core/modules/views/tests/src/Functional/ViewTranslationTest.php
 +++ b/core/modules/views/tests/src/Functional/ViewTranslationTest.php
 @@ -31,8 +31,8 @@ class ViewTranslationTest extends ViewTestBase {
    /**
     * {@inheritdoc}
     */
--  public function setUp($import_test_views = TRUE): void {
+-  protected function setUp($import_test_views = TRUE): void {
 -    parent::setUp($import_test_views);
-+  public function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
++  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
 +    parent::setUp($import_test_views, $test_views_module);
  
      $this->enableViewsTestModule();
@@ -2100,16 +2100,16 @@
      // Create two content types. One will have an autocomplete tagging field,
      // and one won't.
 diff --git a/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php b/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php
-index bc1dd3243c447a1cb75247b7905f6cec4ffc61b9..a8104a7b501f41d4caf87523904a23da35e0aa07 100644
+index 41812b72b3cc77c8e5bd4a88ea6eb03d7b976169..a426d0f7ed2251cfb25b423a7e4e05323ff9883f 100644
 --- a/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php
 +++ b/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php
 @@ -16,8 +16,8 @@ abstract class WizardTestBase extends ViewTestBase {
     */
    protected static $modules = ['node', 'views_ui', 'block', 'rest'];
  
--  protected function setUp($import_test_views = TRUE) {
+-  protected function setUp($import_test_views = TRUE): void {
 -    parent::setUp($import_test_views);
-+  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']) {
++  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
 +    parent::setUp($import_test_views, $test_views_module);
  
      // Create and log in a user with administer views permission.
@@ -2302,16 +2302,16 @@
      $permissions = [
        'administer site configuration',
 diff --git a/core/modules/views_ui/tests/src/Functional/UITestBase.php b/core/modules/views_ui/tests/src/Functional/UITestBase.php
-index 784796eaa721580b84b0f2ce063cea344ec1a640..0e46d2815c81f84b2e7af2a9c41a182ac10e626e 100644
+index c15877fbf9b6cea95b8b767d0885541370370a83..74ce41b2be60a2173fa0314c0c73b59c24a5adfc 100644
 --- a/core/modules/views_ui/tests/src/Functional/UITestBase.php
 +++ b/core/modules/views_ui/tests/src/Functional/UITestBase.php
 @@ -33,8 +33,8 @@ abstract class UITestBase extends ViewTestBase {
    /**
     * {@inheritdoc}
     */
--  protected function setUp($import_test_views = TRUE) {
+-  protected function setUp($import_test_views = TRUE): void {
 -    parent::setUp($import_test_views);
-+  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']) {
++  protected function setUp($import_test_views = TRUE, $test_views_module = ['views_test_config']): void {
 +    parent::setUp($import_test_views, $test_views_module);
  
      $this->enableViewsTestModule();