--- multiple-vocabularies-filter-2784233-90.patch	2020-05-07 17:28:55.781214145 +0300
+++ 2784233-9.0-101.patch	2020-05-07 17:35:03.246668485 +0300
@@ -1,8 +1,8 @@
 diff --git a/core/modules/node/src/Plugin/views/wizard/Node.php b/core/modules/node/src/Plugin/views/wizard/Node.php
-index 5f53d971b1..9816d8d60f 100644
+index 576c3158ed..0d77bb7039 100644
 --- a/core/modules/node/src/Plugin/views/wizard/Node.php
 +++ b/core/modules/node/src/Plugin/views/wizard/Node.php
-@@ -175,7 +175,7 @@ protected function defaultDisplayFiltersUser(array $form, FormStateInterface $fo
+@@ -167,7 +167,7 @@ protected function defaultDisplayFiltersUser(array $form, FormStateInterface $fo
          'table' => 'taxonomy_index',
          'field' => 'tid',
          'value' => $tids,
@@ -242,14 +242,15 @@
      foreach ($this->termStorage->loadMultiple($this->options['value']) as $term) {
        $dependencies[$term->getConfigDependencyKey()][] = $term->getConfigDependencyName();
 diff --git a/core/modules/taxonomy/taxonomy.post_update.php b/core/modules/taxonomy/taxonomy.post_update.php
-index 6b1c6bde08..b62cb24fd5 100644
+index 2e18d17ad8..9dad17d5b5 100644
 --- a/core/modules/taxonomy/taxonomy.post_update.php
 +++ b/core/modules/taxonomy/taxonomy.post_update.php
-@@ -253,3 +253,37 @@ function taxonomy_post_update_configure_status_field_widget(&$sandbox = NULL) {
-     return FALSE;
-   });
+@@ -18,3 +18,38 @@ function taxonomy_removed_post_updates() {
+     'taxonomy_post_update_configure_status_field_widget' => '9.0.0',
+   ];
  }
 +
++
 +/**
 + * Update views using taxonomy_index_tid to use vids instead of vid.
 + */
@@ -326,7 +327,7 @@
            depth: -2
            error_message: true
 diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
-index de81f8ba68..88a0b38532 100644
+index 1285404ec9..1b8eeaab0f 100644
 --- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
 +++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
 @@ -24,7 +24,10 @@ class TaxonomyIndexTidUiTest extends UITestBase {
@@ -341,23 +342,8 @@
  
    /**
     * {@inheritdoc}
-@@ -36,7 +39,13 @@ class TaxonomyIndexTidUiTest extends UITestBase {
-    *
-    * @var array
-    */
--  public static $modules = ['node', 'taxonomy', 'views', 'views_ui', 'taxonomy_test_views'];
-+  public static $modules = [
-+    'node',
-+    'taxonomy',
-+    'views',
-+    'views_ui',
-+    'taxonomy_test_views',
-+  ];
- 
-   /**
-    * A nested array of \Drupal\taxonomy\TermInterface objects.
-@@ -51,13 +60,41 @@ class TaxonomyIndexTidUiTest extends UITestBase {
-   protected function setUp($import_test_views = TRUE) {
+@@ -57,13 +60,41 @@ class TaxonomyIndexTidUiTest extends UITestBase {
+   protected function setUp($import_test_views = TRUE): void {
      parent::setUp($import_test_views);
  
 -    $this->adminUser = $this->drupalCreateUser(['administer taxonomy', 'administer views']);
@@ -401,7 +387,7 @@
  
      // Setup a hierarchy which looks like this:
      // term 0.0
-@@ -66,30 +103,30 @@ protected function setUp($import_test_views = TRUE) {
+@@ -72,30 +103,30 @@ protected function setUp($import_test_views = TRUE): void {
      // term 2.0
      // - term 2.1
      // - term 2.2
@@ -440,7 +426,7 @@
      $result = $this->xpath('//select[@id="edit-options-value"]/option');
  
      // Ensure that the expected hierarchy is available in the UI.
-@@ -131,6 +168,78 @@ public function testFilterUI() {
+@@ -137,6 +168,78 @@ public function testFilterUI() {
      $this->assertIdentical($expected, $view->calculateDependencies()->getDependencies());
    }
  
@@ -519,7 +505,7 @@
    /**
     * Tests exposed taxonomy filters.
     */
-@@ -208,7 +317,11 @@ public function testExposedFilter() {
+@@ -214,7 +317,11 @@ public function testExposedFilter() {
      ];
      $this->drupalPostForm('admin/structure/views/nojs/add-handler/test_taxonomy_term_name/default/filter', $edit, 'Add and configure filter criteria');
      // Select 'Empty Vocabulary' and 'Autocomplete' from the list of options.