Issue #2267453 by alexpott, dawehner, damiankloip: Fixed Views plugins do not store additional dependencies.

core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml

@@ -71,7 +71,6 @@ display:
           empty_zero: false
           link_to_node: true
           plugin_id: node
-          provider: node
         node_bulk_form:
           id: node_bulk_form
           table: node
@@ -121,7 +120,6 @@ display:
           empty_zero: false
           hide_alter_empty: true
           plugin_id: node_bulk_form
-          provider: node
       filters:
         status:
           value: true
@@ -132,7 +130,6 @@ display:
             operator: ''
           group: 1
           plugin_id: boolean
-          provider: views
       sorts:
         created:
           id: created
@@ -140,7 +137,6 @@ display:
           field: created
           order: DESC
           plugin_id: date
-          provider: views
       title: form
   page_1:
     display_plugin: page
@@ -169,7 +165,6 @@ display:
           empty: true
           content: 'This view is empty.'
           plugin_id: text_custom
-          provider: views
 base_field: nid
 status: true
 module: views

core/modules/aggregator/config/install/views.view.aggregator_rss_feed.yml

@@ -13,11 +13,9 @@ display:
       access:
         type: none
         options: {  }
-        provider: views
       cache:
         type: none
         options: {  }
-        provider: views
       query:
         type: views_query
         options:
@@ -26,7 +24,6 @@ display:
           replica: false
           query_comment: false
           query_tags: {  }
-        provider: views
       exposed_form:
         type: basic
         options:
@@ -37,7 +34,6 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
       pager:
         type: full
         options:
@@ -59,13 +55,10 @@ display:
             first: '« first'
             last: 'last »'
           quantity: 9
-        provider: views
       style:
         type: default
-        provider: views
       row:
         type: 'entity:aggregator_item'
-        provider: views
       fields:
         iid:
           table: aggregator_item

core/modules/aggregator/config/install/views.view.aggregator_sources.yml

@@ -17,17 +17,14 @@ display:
     id: default
     display_title: Master
     position: 0
-    provider: views
     display_options:
       access:
         type: perm
         options:
           perm: 'access news feeds'
-        provider: null
       cache:
         type: none
         options: {  }
-        provider: views
       query:
         type: views_query
         options:
@@ -36,7 +33,6 @@ display:
           replica: false
           query_comment: false
           query_tags: {  }
-        provider: views
       exposed_form:
         type: basic
         options:
@@ -47,7 +43,6 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
       pager:
         type: full
         options:
@@ -82,11 +77,9 @@ display:
           field: fid
           id: fid
           plugin_id: numeric
-          provider: views
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies: {  }
           label: ''
           exclude: false
           alter:
@@ -152,7 +145,6 @@ display:
     id: page_1
     display_title: Page
     position: 1
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -169,7 +161,6 @@ display:
     id: feed_1
     display_title: Feed
     position: 2
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -177,7 +168,6 @@ display:
         type: opml
         options:
           grouping: {  }
-        provider: views
       path: aggregator/opml
       fields:
         title:
@@ -187,9 +177,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - aggregator
           label: ''
           exclude: false
           alter:
@@ -233,7 +220,6 @@ display:
           hide_alter_empty: true
           display_as_link: false
           plugin_id: aggregator_title_link
-          provider: aggregator
         url:
           id: url
           table: aggregator_feed
@@ -241,9 +227,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           label: ''
           exclude: false
           alter:
@@ -287,7 +270,6 @@ display:
           hide_alter_empty: true
           display_as_link: false
           plugin_id: url
-          provider: views
         description:
           id: description
           table: aggregator_feed
@@ -295,9 +277,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           label: ''
           exclude: false
           alter:
@@ -340,7 +319,6 @@ display:
           empty_zero: false
           hide_alter_empty: true
           plugin_id: xss
-          provider: views
         link:
           id: link
           table: aggregator_feed
@@ -348,9 +326,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           label: ''
           exclude: false
           alter:
@@ -394,7 +369,6 @@ display:
           hide_alter_empty: true
           display_as_link: false
           plugin_id: url
-          provider: views
       defaults:
         fields: false
         title: false
@@ -409,7 +383,6 @@ display:
           language_field: ''
           xml_url_field: url
           url_field: ''
-        provider: views
       displays:
         page_1: page_1
         default: '0'

core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml

@@ -31,14 +31,12 @@ display:
           id: name
           table: views_test_data
           field: name
-          provider: views_test_data
       title: test_view_block
   block_1:
     display_plugin: block
     id: block_1
     display_title: Block
     position: null
-    provider: views
     display_options:
       field:
         title:

core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml

@@ -31,10 +31,8 @@ display:
           id: name
           table: views_test_data
           field: name
-          provider: views_test_data
       title: test_view_block2
   block_1:
-    provider: views
     display_plugin: block
     id: block_1
     display_title: Block
@@ -44,7 +42,6 @@ display:
         title:
           link_to_node: true
   block_2:
-    provider: views
     display_plugin: block
     id: block_2
     display_title: Block
@@ -54,7 +51,6 @@ display:
         title:
           link_to_node: true
   block_3:
-    provider: views
     display_plugin: block
     id: block_3
     display_title: Block

core/modules/comment/config/install/views.view.comments_recent.yml

@@ -22,22 +22,17 @@ display:
         type: perm
         options:
           perm: 'access comments'
-        provider: user
       cache:
         type: none
-        provider: views
       query:
         type: views_query
-        provider: views
       exposed_form:
         type: basic
-        provider: views
       pager:
         type: some
         options:
           items_per_page: 10
           offset: 0
-        provider: views
       style:
         type: html_list
         options:
@@ -47,7 +42,6 @@ display:
           type: ul
           wrapper_class: item-list
           class: ''
-        provider: views
       row:
         type: fields
         options:
@@ -57,7 +51,6 @@ display:
             changed: changed
           separator: ' '
           hide_empty: false
-        provider: views
       relationships:
         node:
           field: node
@@ -231,7 +224,6 @@ display:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
   block_1:
-    provider: views
     display_plugin: block
     id: block_1
     display_title: Block

core/modules/comment/src/Plugin/views/wizard/Comment.php

@@ -141,7 +141,6 @@ class Comment extends WizardPluginBase {
 
     // Add permission-based access control.
     $display_options['access']['type'] = 'perm';
-    $display_options['access']['provider'] = 'user';
 
     // Add a relationship to nodes.
     $display_options['relationships']['node']['id'] = 'node';
@@ -149,7 +148,6 @@ class Comment extends WizardPluginBase {
     $display_options['relationships']['node']['field'] = 'node';
     $display_options['relationships']['node']['required'] = 1;
     $display_options['relationships']['node']['plugin_id'] = 'standard';
-    $display_options['relationships']['node']['provider'] = 'views';
 
     // Remove the default fields, since we are customizing them here.
     unset($display_options['fields']);
@@ -158,7 +156,6 @@ class Comment extends WizardPluginBase {
     $display_options['fields']['subject']['id'] = 'subject';
     $display_options['fields']['subject']['table'] = 'comment_field_data';
     $display_options['fields']['subject']['field'] = 'subject';
-    $display_options['fields']['subject']['provider'] = 'comment';
     $display_options['fields']['subject']['label'] = '';
     $display_options['fields']['subject']['alter']['alter_text'] = 0;
     $display_options['fields']['subject']['alter']['make_link'] = 0;

core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml

@@ -37,7 +37,6 @@ display:
           id: node
           required: true
           table: comment_field_data
-          provider: views
       fields:
         subject:
           id: subject
@@ -57,7 +56,6 @@ display:
           hide_empty: false
           empty_zero: false
           link_to_comment: true
-          provider: comment
       filters: {  }
       sorts: {  }
 label: test_comment_rss

core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml

@@ -20,7 +20,6 @@ display:
             items_per_page: 25
           table: node_field_data
           plugin_id: argument_comment_user_uid
-          provider: comment
       cache:
         type: none
       exposed_form:
@@ -31,7 +30,6 @@ display:
           id: nid
           table: node
           plugin_id: node
-          provider: node
       pager:
         type: full
       query:

core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml

@@ -18,19 +18,14 @@ display:
     id: default
     display_title: Master
     position: 0
-    provider: views
     display_options:
       access:
         type: perm
         options:
           perm: 'access content'
-        provider: user
-        dependencies: {  }
       cache:
         type: none
         options: {  }
-        provider: views
-        dependencies: {  }
       query:
         type: views_query
         options:
@@ -39,8 +34,6 @@ display:
           replica: false
           query_comment: false
           query_tags: {  }
-        provider: views
-        dependencies: {  }
       exposed_form:
         type: basic
         options:
@@ -51,8 +44,6 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
-        dependencies: {  }
       pager:
         type: none
         options:
@@ -72,17 +63,14 @@ display:
           field: node
           required: true
           plugin_id: standard
-          provider: views
           relationship: none
           group_type: group
           admin_label: Content
-          dependencies: {  }
       fields:
         subject:
           id: subject
           table: comment_field_data
           field: subject
-          provider: comment
           label: ''
           alter:
             alter_text: false
@@ -99,7 +87,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies: {  }
           exclude: false
           element_type: ''
           element_class: ''
@@ -120,9 +107,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           operator: contains
           value: Comida
           group: 1
@@ -152,7 +136,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-          provider: views
       sorts: {  }
       title: 'Title filter page'
       header: {  }
@@ -166,7 +149,6 @@ display:
     id: page_tc
     display_title: 'Title Comida'
     position: 1
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -177,7 +159,6 @@ display:
     id: page_bp
     display_title: 'Body Paris'
     position: 1
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -191,9 +172,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           operator: contains
           value: Paris
           group: 1
@@ -223,7 +201,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-          provider: views
       defaults:
         filters: false
         filter_groups: false
@@ -238,7 +215,6 @@ display:
     id: page_tp
     display_title: 'Title Paris'
     position: 1
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -252,10 +228,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
-              - views
           operator: contains
           value: Paris
           group: 1
@@ -285,7 +257,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-          provider: views
       defaults:
         filters: false
         filter_groups: false
@@ -298,7 +269,6 @@ display:
     id: page_bf
     display_title: 'Body Comida'
     position: 1
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -312,10 +282,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
-              - views
           operator: contains
           value: Comida
           group: 1
@@ -345,7 +311,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-          provider: views
       defaults:
         filters: false
         filter_groups: false

core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml

@@ -44,7 +44,6 @@ display:
           link_to_user: true
           format_username: true
           plugin_id: user_name
-          provider: user
         translation_link:
           id: translation_link
           table: users
@@ -72,7 +71,6 @@ display:
           group: true
           exposed: false
           plugin_id: numeric
-          provider: views
       sorts:
         created:
           id: created
@@ -80,7 +78,6 @@ display:
           field: created
           order: DESC
           plugin_id: date
-          provider: views
       title: People
       empty:
         area:
@@ -91,7 +88,6 @@ display:
           content: 'No people available.'
           format: plain_text
           plugin_id: text
-          provider: views
   page_1:
     display_plugin: page
     id: page_1

core/modules/entity_reference/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml

@@ -9,7 +9,6 @@ display:
     id: entity_reference_1
     display_title: EntityReference
     position: null
-    provider: entity_reference
     display_options:
       style:
         type: entity_reference
@@ -92,7 +91,6 @@ display:
           hide_alter_empty: true
           link_to_node: true
           plugin_id: node
-          provider: node
       filters:
         status:
           value: true
@@ -103,7 +101,6 @@ display:
             operator: ''
           group: 1
           plugin_id: boolean
-          provider: views
       sorts:
         created:
           id: created
@@ -111,7 +108,6 @@ display:
           field: created
           order: DESC
           plugin_id: date
-          provider: views
 label: 'Entity reference'
 module: entity_reference_test
 id: test_entity_reference

core/modules/field/src/Plugin/views/field/Field.php

@@ -938,7 +938,7 @@ class Field extends FieldPluginBase implements CacheablePluginInterface {
   /**
    * {@inheritdoc}
    */
-  public function getDependencies() {
+  public function calculateDependencies() {
     // Add the module providing the configured field storage as a dependency.
     return array('config' => array($this->getFieldStorageConfig()->getConfigDependencyName()));
   }

core/modules/field/src/Tests/Views/FieldUITest.php

@@ -83,6 +83,10 @@ class FieldUITest extends FieldTestBase {
     $view->initHandlers();
     $this->assertEqual($view->field['field_name_0']->options['type'], 'text_trimmed');
     $this->assertEqual($view->field['field_name_0']->options['settings']['trim_length'], $random_number);
+
+    // Ensure that the view depends on the field storage.
+    $dependencies = \Drupal::service('config.manager')->findConfigEntityDependents('config', [$this->fieldStorages[0]->getConfigDependencyName()]);
+    $this->assertTrue(isset($dependencies['views.view.test_view_fieldapi']), 'The view is dependent on the field storage.');
   }
 
   /**

core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml

@@ -13,19 +13,16 @@ display:
           id: nid
           table: node
           plugin_id: node
-          provider: node
         field_name_0:
           id: field_name_0
           table: node__field_name_0
           field: field_name_0
           plugin_id: field
-          provider: field
         field_name_5:
           id: field_name_5
           table: node__field_name_5
           field: field_name_5
           plugin_id: field
-          provider: field
       cache:
         type: none
       exposed_form:

core/modules/file/config/install/views.view.files.yml

@@ -14,11 +14,9 @@ display:
         type: perm
         options:
           perm: 'access files overview'
-        provider: views
       cache:
         type: none
         options: {  }
-        provider: views
       query:
         type: views_query
         options:
@@ -27,7 +25,6 @@ display:
           replica: false
           query_comment: false
           query_tags: {  }
-        provider: views
       exposed_form:
         type: basic
         options:
@@ -38,7 +35,6 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
       pager:
         type: mini
         options:
@@ -57,7 +53,6 @@ display:
             items_per_page_options_all_label: '- All -'
             offset: false
             offset_label: Offset
-        provider: views
       style:
         type: table
         options:
@@ -137,10 +132,8 @@ display:
               responsive: priority-medium
           default: 'changed'
           empty_table: true
-        provider: views
       row:
         type: fields
-        provider: views
       fields:
         fid:
           id: fid
@@ -726,7 +719,6 @@ display:
             items_per_page_options_all_label: '- All -'
             offset: false
             offset_label: Offset
-        provider: views
       pager_options: false
       filters: {  }
       filter_groups:
@@ -783,7 +775,6 @@ display:
           hide_alter_empty: true
           link_to_entity: true
           plugin_id: entity_label
-          provider: views
         type:
           id: type
           table: file_usage
@@ -833,7 +824,6 @@ display:
           empty_zero: false
           hide_alter_empty: true
           plugin_id: standard
-          provider: views
         module:
           id: module
           table: file_usage
@@ -883,7 +873,6 @@ display:
           empty_zero: false
           hide_alter_empty: true
           plugin_id: standard
-          provider: views
         count:
           id: count
           table: file_usage
@@ -942,7 +931,6 @@ display:
           prefix: ''
           suffix: ''
           plugin_id: numeric
-          provider: views
       group_by: false
       title: 'File usage'
       arguments:
@@ -981,7 +969,6 @@ display:
           break_phrase: false
           not: false
           plugin_id: file_fid
-          provider: file
       style:
         type: table
         options:
@@ -1029,11 +1016,9 @@ display:
               responsive: ''
           default: entity_label
           empty_table: true
-        provider: views
       row:
         type: fields
         options: {  }
-        provider: views
       relationships:
         fid:
           id: fid

core/modules/file/src/Plugin/views/wizard/File.php

@@ -44,7 +44,6 @@ class File extends WizardPluginBase {
 
     // Add permission-based access control.
     $display_options['access']['type'] = 'perm';
-    $display_options['access']['provider'] = 'user';
 
     // Remove the default fields, since we are customizing them here.
     unset($display_options['fields']);
@@ -53,7 +52,6 @@ class File extends WizardPluginBase {
     $display_options['fields']['filename']['id'] = 'filename';
     $display_options['fields']['filename']['table'] = 'file_managed';
     $display_options['fields']['filename']['field'] = 'filename';
-    $display_options['fields']['filename']['provider'] = 'file';
     $display_options['fields']['filename']['label'] = '';
     $display_options['fields']['filename']['alter']['alter_text'] = 0;
     $display_options['fields']['filename']['alter']['make_link'] = 0;

core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml

@@ -17,21 +17,18 @@ display:
           relationship: none
           table: views_test_data
           plugin_id: numeric
-          provider: views_test_data
         id:
           field: id
           id: id
           relationship: none
           table: views_test_data
           plugin_id: numeric
-          provider: views_test_data
         name:
           field: name
           id: file_extension
           relationship: none
           table: views_test_data
           plugin_id: string
-          provider: views_test_data
       pager:
         options:
           offset: '0'
@@ -45,7 +42,6 @@ display:
           relationship: none
           table: views_test_data
           plugin_id: numeric
-          provider: views_test_data
     display_plugin: default
     display_title: Master
     id: default

core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml

@@ -29,7 +29,6 @@ display:
           table: forum_index
           field: nid
           id: nid
-          provider: views
         sticky:
           id: sticky
           table: forum_index
@@ -83,7 +82,6 @@ display:
           type_custom_false: ''
           not: false
           plugin_id: boolean
-          provider: views
         comment_count:
           id: comment_count
           table: forum_index
@@ -142,7 +140,6 @@ display:
           prefix: ''
           suffix: ''
           plugin_id: numeric
-          provider: views
       filters: {  }
       sorts: {  }
 label: test_forum_index

core/modules/node/config/install/views.view.archive.yml

@@ -26,16 +26,13 @@ display:
           distinct: false
           replica: false
           query_tags: {  }
-        provider: views
       title: 'Monthly archive'
       access:
         type: none
         options: {  }
-        provider: views
       cache:
         type: none
         options: {  }
-        provider: views
       exposed_form:
         type: basic
         options:
@@ -46,7 +43,6 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
       pager:
         type: mini
         options:
@@ -65,7 +61,6 @@ display:
           tags:
             previous: ‹‹
             next: ››
-        provider: views
       sorts:
         created:
           id: created
@@ -80,7 +75,6 @@ display:
           expose:
             label: ''
           granularity: second
-          provider: views
       arguments:
         created_year_month:
           id: created_year_month
@@ -100,7 +94,6 @@ display:
             items_per_page: 30
           specify_validation: true
           plugin_id: date_year_month
-          provider: views
       filters:
         status:
           id: status
@@ -111,7 +104,6 @@ display:
           expose:
             operator: '0'
           plugin_id: boolean
-          provider: views
         langcode:
           id: langcode
           table: node_field_data
@@ -119,9 +111,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           operator: in
           value:
             '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
@@ -153,7 +142,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: language
-          provider: views
       style:
         type: default
         options:
@@ -161,13 +149,11 @@ display:
           row_class: ''
           default_row_class: true
           uses_fields: false
-        provider: views
       row:
         type: 'entity:node'
         options:
           view_mode: teaser
           comments: false
-        provider: node
       header: {  }
       footer: {  }
       empty: {  }
@@ -180,12 +166,10 @@ display:
     display_title: Block
     display_plugin: block
     position: 1
-    provider: views
     display_options:
       query:
         type: views_query
         options: {  }
-        provider: views
       defaults:
         arguments: false
       arguments:
@@ -205,7 +189,6 @@ display:
             items_per_page: 30
           specify_validation: true
           plugin_id: date_year_month
-          provider: views
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
   page_1:
@@ -217,7 +200,6 @@ display:
       query:
         type: views_query
         options: {  }
-        provider: views
       path: archive
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null

core/modules/node/config/install/views.view.content.yml

@@ -20,13 +20,10 @@ display:
         type: perm
         options:
           perm: 'access content overview'
-        provider: user
       cache:
         type: none
-        provider: views
       query:
         type: views_query
-        provider: views
       exposed_form:
         type: basic
         options:
@@ -37,12 +34,10 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
       pager:
         type: full
         options:
           items_per_page: 50
-        provider: views
       style:
         type: table
         options:
@@ -136,10 +131,8 @@ display:
               responsive: ''
           default: changed
           empty_table: true
-        provider: views
       row:
         type: fields
-        provider: views
       fields:
         node_bulk_form:
           id: node_bulk_form
@@ -156,7 +149,6 @@ display:
           empty_zero: false
           hide_alter_empty: true
           plugin_id: node_bulk_form
-          provider: node
         title:
           id: title
           table: node_field_data
@@ -173,7 +165,6 @@ display:
           hide_alter_empty: true
           link_to_node: true
           plugin_id: node
-          provider: node
         type:
           id: type
           table: node_field_data
@@ -191,7 +182,6 @@ display:
           link_to_node: false
           machine_name: ''
           plugin_id: node_type
-          provider: node
         name:
           id: name
           table: users_field_data
@@ -212,7 +202,6 @@ display:
           anonymous_text: ''
           format_username: true
           plugin_id: user_name
-          provider: user
         status:
           id: status
           table: node_field_data
@@ -232,7 +221,6 @@ display:
           type_custom_false: ''
           not: ''
           plugin_id: boolean
-          provider: views
         changed:
           id: changed
           table: node_field_data
@@ -251,7 +239,6 @@ display:
           custom_date_format: ''
           timezone: ''
           plugin_id: date
-          provider: views
         edit_node:
           id: edit_node
           table: node
@@ -260,7 +247,6 @@ display:
           exclude: true
           text: Edit
           plugin_id: node_link_edit
-          provider: node
         delete_node:
           id: delete_node
           table: node
@@ -269,7 +255,6 @@ display:
           exclude: true
           text: Delete
           plugin_id: node_link_delete
-          provider: node
         dropbutton:
           id: dropbutton
           table: views
@@ -280,7 +265,6 @@ display:
             delete_node: delete_node
           destination: true
           plugin_id: dropbutton
-          provider: views
       filters:
         status_extra:
           id: status_extra
@@ -289,7 +273,6 @@ display:
           operator: '='
           value: false
           plugin_id: node_status
-          provider: node
           group: 1
         status:
           id: status
@@ -335,7 +318,6 @@ display:
                 operator: '='
                 value: '0'
           plugin_id: boolean
-          provider: views
         type:
           id: type
           table: node_field_data
@@ -375,7 +357,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: bundle
-          provider: views
         title:
           id: title
           table: node_field_data
@@ -414,7 +395,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-          provider: views
         langcode:
           id: langcode
           table: node_field_data
@@ -422,9 +402,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           operator: in
           value: {  }
           group: 1
@@ -457,7 +434,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: language
-          provider: views
       sorts: {  }
       title: Content
       empty:
@@ -468,7 +444,6 @@ display:
           empty: true
           content: 'No content available.'
           plugin_id: text_custom
-          provider: views
       arguments: {  }
       relationships:
         uid:
@@ -478,7 +453,6 @@ display:
           admin_label: author
           required: true
           plugin_id: standard
-          provider: views
       show_admin_links: false
       filter_groups:
         operator: AND

core/modules/node/config/install/views.view.content_recent.yml

@@ -24,11 +24,9 @@ display:
         type: perm
         options:
           perm: 'access content'
-        provider: user
       cache:
         type: none
         options: {  }
-        provider: views
       query:
         type: views_query
         options:
@@ -37,7 +35,6 @@ display:
           replica: false
           query_comment: false
           query_tags: {  }
-        provider: views
       exposed_form:
         type: basic
         options:
@@ -48,13 +45,11 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
       pager:
         type: some
         options:
           items_per_page: 10
           offset: 0
-        provider: views
       style:
         type: table
         options:
@@ -110,10 +105,8 @@ display:
               responsive: ''
           default: '-1'
           empty_table: false
-        provider: views
       row:
         type: fields
-        provider: views
       fields:
         title:
           id: title
@@ -165,7 +158,6 @@ display:
           hide_alter_empty: true
           link_to_node: true
           plugin_id: node
-          provider: node
         name:
           id: name
           table: users_field_data
@@ -219,7 +211,6 @@ display:
           anonymous_text: ''
           format_username: true
           plugin_id: user_name
-          provider: user
         edit_node:
           id: edit_node
           table: node
@@ -270,7 +261,6 @@ display:
           hide_alter_empty: true
           text: edit
           plugin_id: node_link_edit
-          provider: node
         delete_node:
           id: delete_node
           table: node
@@ -321,7 +311,6 @@ display:
           hide_alter_empty: true
           text: delete
           plugin_id: node_link_delete
-          provider: node
       filters:
         status_extra:
           id: status_extra
@@ -359,7 +348,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: node_status
-          provider: node
         langcode:
           id: langcode
           table: node_field_data
@@ -367,9 +355,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           operator: in
           value:
             '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
@@ -401,7 +386,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: language
-          provider: views
       sorts:
         changed:
           id: changed
@@ -416,7 +400,6 @@ display:
             label: ''
           granularity: second
           plugin_id: date
-          provider: views
       title: 'Recent content'
       header: {  }
       footer: {  }
@@ -432,7 +415,6 @@ display:
           tokenize: false
           content: 'No content available.'
           plugin_id: text_custom
-          provider: views
       relationships:
         uid:
           id: uid
@@ -443,7 +425,6 @@ display:
           admin_label: author
           required: true
           plugin_id: standard
-          provider: views
       arguments: {  }
       filter_groups:
         operator: AND
@@ -464,4 +445,3 @@ display:
       block_category: 'Lists (Views)'
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
-    provider: views

core/modules/node/config/install/views.view.frontpage.yml

@@ -18,11 +18,9 @@ display:
         type: perm
         options:
           perm: 'access content'
-        provider: user
       cache:
         type: none
         options: {  }
-        provider: views
       empty:
         area_text_custom:
           admin_label: ''
@@ -36,7 +34,6 @@ display:
           table: views
           tokenize: false
           plugin_id: text
-          provider: views
         node_listing_empty:
           admin_label: ''
           empty: true
@@ -47,7 +44,6 @@ display:
           relationship: none
           table: node
           plugin_id: node_listing_empty
-          provider: node
         title:
           id: title
           table: views
@@ -59,7 +55,6 @@ display:
           empty: true
           title: 'Welcome to [site:name]'
           plugin_id: title
-          provider: views
       exposed_form:
         type: basic
         options:
@@ -107,7 +102,6 @@ display:
           table: node_field_data
           value: true
           plugin_id: boolean
-          provider: views
         status:
           expose:
             operator: ''
@@ -117,7 +111,6 @@ display:
           table: node_field_data
           value: true
           plugin_id: boolean
-          provider: views
         langcode:
           id: langcode
           table: node_field_data
@@ -125,9 +118,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           operator: in
           value:
             '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
@@ -159,7 +149,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: language
-          provider: views
       pager:
         type: full
         options:
@@ -181,7 +170,6 @@ display:
             first: '« first'
             last: 'last »'
           quantity: 9
-        provider: views
       query:
         type: views_query
         options:
@@ -190,14 +178,12 @@ display:
           replica: false
           query_comment: false
           query_tags: {  }
-        provider: views
       row:
         type: 'entity:node'
         options:
           build_mode: teaser
           comments: false
           view_mode: teaser
-        provider: views
       sorts:
         sticky:
           admin_label: ''
@@ -211,7 +197,6 @@ display:
           relationship: none
           table: node_field_data
           plugin_id: boolean
-          provider: views
         created:
           field: created
           id: created
@@ -225,7 +210,6 @@ display:
           expose:
             label: ''
           granularity: second
-          provider: views
       style:
         type: default
         options:
@@ -270,19 +254,16 @@ display:
         options:
           items_per_page: 10
           offset: 0
-        provider: views
       style:
         type: rss
         options:
           description: ''
           grouping: {  }
           uses_fields: false
-        provider: views
       row:
         type: node_rss
         options:
           relationship: none
           view_mode: rss
-        provider: views
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null

core/modules/node/config/install/views.view.glossary.yml

@@ -27,16 +27,13 @@ display:
           distinct: false
           replica: false
           query_tags: {  }
-        provider: views
       use_ajax: true
       access:
         type: none
         options: {  }
-        provider: views
       cache:
         type: none
         options: {  }
-        provider: views
       exposed_form:
         type: basic
         options:
@@ -47,7 +44,6 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
       pager:
         type: mini
         options:
@@ -66,7 +62,6 @@ display:
           tags:
             previous: ‹‹
             next: ››
-        provider: views
       fields:
         title:
           id: title
@@ -118,7 +113,6 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          provider: node
         name:
           id: name
           table: users_field_data
@@ -172,7 +166,6 @@ display:
           overwrite_anonymous: false
           anonymous_text: ''
           format_username: true
-          provider: user
         changed:
           id: changed
           table: node_field_data
@@ -225,7 +218,6 @@ display:
           hide_alter_empty: true
           custom_date_format: ''
           timezone: ''
-          provider: views
       arguments:
         title:
           id: title
@@ -258,7 +250,6 @@ display:
             fail: 'not found'
           validate_options: {  }
           break_phrase: false
-          provider: views
       relationships:
         uid:
           id: uid
@@ -269,7 +260,6 @@ display:
           group_type: group
           admin_label: author
           required: false
-          provider: views
       style:
         type: table
         options:
@@ -297,7 +287,6 @@ display:
           order: asc
           summary: ''
           empty_table: false
-        provider: views
       row:
         type: fields
         options:
@@ -305,7 +294,6 @@ display:
           separator: ''
           hide_empty: false
           default_field_elements: true
-        provider: views
       header: {  }
       footer: {  }
       empty: {  }
@@ -320,9 +308,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           operator: in
           value:
             '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
@@ -354,7 +339,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: language
-          provider: views
   page_1:
     id: page_1
     display_title: Page
@@ -382,13 +366,11 @@ display:
       query:
         type: views_query
         options: {  }
-        provider: views
       pager:
         type: none
         options:
           offset: 0
           items_per_page: 0
-        provider: views
       defaults:
         arguments: false
       arguments:
@@ -426,7 +408,6 @@ display:
             fail: 'not found'
           validate_options: {  }
           break_phrase: false
-          provider: views
       displays:
         default: default
         page_1: page_1

core/modules/node/src/Plugin/views/wizard/Node.php

@@ -126,7 +126,6 @@ class Node extends WizardPluginBase {
 
     // Add permission-based access control.
     $display_options['access']['type'] = 'perm';
-    $display_options['access']['provider'] = 'user';
 
     // Remove the default fields, since we are customizing them here.
     unset($display_options['fields']);
@@ -137,7 +136,6 @@ class Node extends WizardPluginBase {
     $display_options['fields']['title']['id'] = 'title';
     $display_options['fields']['title']['table'] = 'node_field_data';
     $display_options['fields']['title']['field'] = 'title';
-    $display_options['fields']['title']['provider'] = 'node';
     $display_options['fields']['title']['label'] = '';
     $display_options['fields']['title']['alter']['alter_text'] = 0;
     $display_options['fields']['title']['alter']['make_link'] = 0;

core/modules/node/src/Plugin/views/wizard/NodeRevision.php

@@ -88,7 +88,6 @@ class NodeRevision extends WizardPluginBase {
 
     // Add permission-based access control.
     $display_options['access']['type'] = 'perm';
-    $display_options['access']['provider'] = 'user';
     $display_options['access']['perm'] = 'view revisions';
 
     // Remove the default fields, since we are customizing them here.
@@ -98,7 +97,6 @@ class NodeRevision extends WizardPluginBase {
     $display_options['fields']['changed']['id'] = 'changed';
     $display_options['fields']['changed']['table'] = 'node_field_revision';
     $display_options['fields']['changed']['field'] = 'changed';
-    $display_options['fields']['changed']['provider'] = 'node';
     $display_options['fields']['changed']['alter']['alter_text'] = FALSE;
     $display_options['fields']['changed']['alter']['make_link'] = FALSE;
     $display_options['fields']['changed']['alter']['absolute'] = FALSE;
@@ -114,7 +112,6 @@ class NodeRevision extends WizardPluginBase {
     $display_options['fields']['title']['id'] = 'title';
     $display_options['fields']['title']['table'] = 'node_field_revision';
     $display_options['fields']['title']['field'] = 'title';
-    $display_options['fields']['title']['provider'] = 'node';
     $display_options['fields']['title']['label'] = '';
     $display_options['fields']['title']['alter']['alter_text'] = 0;
     $display_options['fields']['title']['alter']['make_link'] = 0;

core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml

@@ -77,7 +77,6 @@ display:
           relationship: none
           table: node
           plugin_id: numeric
-          provider: views
       menu:
         type: tab
         title: 'Test contextual link'

core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml

@@ -18,19 +18,14 @@ display:
     id: default
     display_title: Master
     position: 0
-    provider: views
     display_options:
       access:
         type: perm
         options:
           perm: 'access content'
-        provider: user
-        dependencies: {  }
       cache:
         type: none
         options: {  }
-        provider: views
-        dependencies: {  }
       query:
         type: views_query
         options:
@@ -39,8 +34,6 @@ display:
           replica: false
           query_comment: false
           query_tags: {  }
-        provider: views
-        dependencies: {  }
       exposed_form:
         type: basic
         options:
@@ -51,8 +44,6 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
-        dependencies: {  }
       pager:
         type: none
         options:
@@ -72,7 +63,6 @@ display:
           id: title
           table: node_field_data
           field: title
-          provider: node
           label: ''
           alter:
             alter_text: false
@@ -89,7 +79,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies: {  }
           exclude: false
           element_type: ''
           element_class: ''
@@ -106,7 +95,6 @@ display:
           value: true
           table: node_field_data
           field: status
-          provider: node
           id: status
           expose:
             operator: ''
@@ -118,11 +106,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
-              - views
-              - views
           operator: contains
           value: Paris
           group: 1
@@ -152,7 +135,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-          provider: views
       sorts:
         created:
           id: created
@@ -162,7 +144,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies: {  }
           exposed: false
           expose:
             label: ''
@@ -180,7 +161,6 @@ display:
     id: page_tf
     display_title: 'Title filter page'
     position: 1
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -196,7 +176,6 @@ display:
           value: true
           table: node_field_data
           field: status
-          provider: node
           id: status
           expose:
             operator: ''
@@ -208,12 +187,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
-              - views
-              - views
-              - views
           operator: contains
           value: Comida
           group: 1
@@ -243,7 +216,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-          provider: views
       filter_groups:
         operator: AND
         groups:
@@ -253,7 +225,6 @@ display:
     id: page_bf
     display_title: 'Body filter page'
     position: 1
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -269,7 +240,6 @@ display:
           value: true
           table: node_field_data
           field: status
-          provider: node
           id: status
           expose:
             operator: ''
@@ -281,10 +251,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
-              - views
           operator: contains
           value: Comida
           group: 1
@@ -314,7 +280,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-          provider: views
       filter_groups:
         operator: AND
         groups:
@@ -324,7 +289,6 @@ display:
     id: page_bfp
     display_title: 'Body filter page Paris'
     position: 1
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -340,7 +304,6 @@ display:
           value: true
           table: node_field_data
           field: status
-          provider: node
           id: status
           expose:
             operator: ''
@@ -352,11 +315,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
-              - views
-              - views
           operator: contains
           value: Paris
           group: 1
@@ -386,7 +344,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-          provider: views
       filter_groups:
         operator: AND
         groups:
@@ -396,7 +353,6 @@ display:
     id: page_tfp
     display_title: 'Title filter page Paris'
     position: 1
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null

core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml

@@ -11,7 +11,6 @@ display:
           id: type
           table: node_field_data
           plugin_id: node_type
-          provider: node
     display_plugin: default
     display_title: Master
     id: default

core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml

@@ -17,7 +17,6 @@ display:
           table: node
           field: nid
           plugin_id: node
-          provider: node
       filter_groups:
         groups:
           1: AND
@@ -34,7 +33,6 @@ display:
           value:
             - '1'
           plugin_id: node_uid_revision
-          provider: node
       sorts:
         nid:
           id: nid
@@ -43,7 +41,6 @@ display:
           order: ASC
           plugin_id: standard
           relationship: none
-          provider: views
       pager:
         type: full
       query:

core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml

@@ -18,19 +18,14 @@ display:
     id: default
     display_title: Master
     position: 0
-    provider: views
     display_options:
       access:
         type: perm
         options:
           perm: 'access content'
-        provider: user
-        dependencies: {  }
       cache:
         type: none
         options: {  }
-        provider: views
-        dependencies: {  }
       query:
         type: views_query
         options:
@@ -39,8 +34,6 @@ display:
           replica: false
           query_comment: false
           query_tags: {  }
-        provider: views
-        dependencies: {  }
       exposed_form:
         type: basic
         options:
@@ -51,8 +44,6 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
-        dependencies: {  }
       pager:
         type: none
         options:
@@ -67,7 +58,6 @@ display:
           inline: {  }
           separator: ''
           hide_empty: false
-        provider: views
       fields:
         title:
           id: title
@@ -76,9 +66,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - node
           label: ''
           exclude: false
           alter:
@@ -121,7 +108,6 @@ display:
           empty_zero: false
           hide_alter_empty: true
           link_to_node: 0
-          provider: node
         langcode:
           id: langcode
           table: node_field_data
@@ -129,9 +115,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - node
           label: Language
           exclude: false
           alter:
@@ -176,13 +159,11 @@ display:
           link_to_node: false
           native_language: 0
           plugin_id: node_language
-          provider: node
       filters:
         status:
           value: true
           table: node_field_data
           field: status
-          provider: node
           id: status
           expose:
             operator: ''
@@ -200,12 +181,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
-              - views
-              - views
-              - views
           operator: in
           value:
             fr: fr
@@ -238,7 +213,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: language
-          provider: views
       sorts:
         langcode:
           id: langcode
@@ -247,16 +221,11 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
-              - views
           order: ASC
           exposed: false
           expose:
             label: ''
           plugin_id: standard
-          provider: views
       title: 'Language filter test'
       header: {  }
       footer: {  }
@@ -270,9 +239,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           default_action: ignore
           exception:
             value: all
@@ -299,7 +265,6 @@ display:
             fail: 'not found'
           validate_options: {  }
           plugin_id: language
-          provider: views
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
   page_1:
@@ -307,7 +272,6 @@ display:
     id: page_1
     display_title: Page
     position: 1
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null

core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml

@@ -20,13 +20,11 @@ display:
           table: node
           field: node_bulk_form
           plugin_id: node_bulk_form
-          provider: node
         title:
           id: title
           table: node_field_data
           field: title
           plugin_id: node
-          provider: node
       sorts:
         nid:
           id: nid
@@ -34,7 +32,6 @@ display:
           field: nid
           order: ASC
           plugin_id: standard
-          provider: views
   page_1:
     display_plugin: page
     id: page_1

core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml

@@ -11,34 +11,29 @@ display:
           field: nid
           required: true
           plugin_id: standard
-          provider: views
       fields:
         vid:
           id: vid
           table: node_revision
           field: vid
           plugin_id: standard
-          provider: views
         nid_1:
           id: nid_1
           table: node_revision
           field: nid
           plugin_id: standard
-          provider: views
         nid:
           id: nid
           table: node
           field: nid
           relationship: nid
           plugin_id: node
-          provider: node
       arguments:
         nid:
           id: nid
           table: node_revision
           field: nid
           plugin_id: node_nid
-          provider: node
     display_plugin: default
     display_title: Master
     id: default

core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml

@@ -11,34 +11,29 @@ display:
           field: vid
           required: true
           plugin_id: standard
-          provider: views
       fields:
         vid:
           id: vid
           table: node_revision
           field: vid
           plugin_id: standard
-          provider: views
         nid_1:
           id: nid_1
           table: node_revision
           field: nid
           plugin_id: standard
-          provider: views
         nid:
           id: nid
           table: node
           field: nid
           relationship: vid
           plugin_id: node
-          provider: node
       arguments:
         nid:
           id: nid
           table: node_revision
           field: nid
           plugin_id: node_nid
-          provider: node
     display_plugin: default
     display_title: Master
     id: default

core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml

@@ -22,7 +22,6 @@ display:
           table: node
           value: true
           plugin_id: boolean
-          provider: views
       pager:
         options:
           items_per_page: 10

core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml

@@ -118,7 +118,6 @@ display:
           hide_alter_empty: true
           link_to_node: false
           plugin_id: node
-          provider: node
       filters:
         status:
           value: true
@@ -128,7 +127,6 @@ display:
           expose:
             operator: ''
           group: 1
-          provider: views
       sorts:
         created:
           id: created
@@ -142,7 +140,6 @@ display:
           expose:
             label: ''
           granularity: second
-          provider: views
       title: test_node_view
       header: {  }
       footer: {  }
@@ -188,7 +185,6 @@ display:
           transform_dash: false
           break_phrase: false
           plugin_id: node_type
-          provider: node
 label: test_node_view
 module: views
 id: test_node_view

core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml

@@ -76,7 +76,6 @@ display:
           hide_alter_empty: true
           link_to_node: false
           plugin_id: node
-          provider: node
       filters:
         status_extra:
           id: status_extra
@@ -114,7 +113,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: node_status
-          provider: node
       sorts:
         nid:
           id: nid
@@ -122,7 +120,6 @@ display:
           field: nid
           order: ASC
           plugin_id: standard
-          provider: views
       filter_groups:
         operator: AND
         groups:

core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml

@@ -32,7 +32,6 @@ display:
           field: id
           order: DESC
           plugin_id: date
-          provider: views
       title: 'Test serialize'
       arguments: {  }
   rest_export_1:
@@ -40,7 +39,6 @@ display:
     id: rest_export_1
     display_title: serializer
     position: null
-    provider: rest
     display_options:
       defaults:
         access: false

core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml

@@ -32,7 +32,6 @@ display:
           field: name
           label: ''
           plugin_id: string
-          provider: views_test_data
         nothing:
           id: nothing
           table: views
@@ -46,13 +45,11 @@ display:
             alter_text: true
             text: TEST
           plugin_id: custom
-          provider: views
         created:
           id: created
           table: views_test_data
           field: created
           plugin_id: date
-          provider: views_test_data
       sorts:
         created:
           id: created
@@ -60,7 +57,6 @@ display:
           field: created
           order: DESC
           plugin_id: date
-          provider: views_test_data
       title: 'Test serialize'
       arguments: {  }
   rest_export_1:
@@ -68,7 +64,6 @@ display:
     id: rest_export_1
     display_title: serializer
     position: null
-    provider: rest
     display_options:
       defaults:
         access: false
@@ -86,7 +81,6 @@ display:
     id: rest_export_2
     display_title: 'serialize - access denied'
     position: null
-    provider: rest
     display_options:
       defaults:
         access: false

core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_display_field.yml

@@ -31,7 +31,6 @@ display:
           table: node
           field: nid
           plugin_id: numeric
-          provider: node
         body:
           id: body
           table: node__body
@@ -94,7 +93,6 @@ display:
           separator: ', '
           field_api_classes: false
           plugin_id: field
-          provider: field
       title: 'Test serialize'
       arguments: {  }
   rest_export_1:
@@ -102,7 +100,6 @@ display:
     id: rest_export_1
     display_title: serializer
     position: null
-    provider: rest
     display_options:
       defaults:
         access: false

core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml

@@ -45,7 +45,6 @@ display:
           hide_empty: false
           empty_zero: false
           link_to_node: true
-          provider: node
         timestamp:
           id: timestamp
           table: node_counter
@@ -97,7 +96,6 @@ display:
           date_format: html_year
           custom_date_format: ''
           timezone: ''
-          provider: views
         totalcount:
           id: totalcount
           table: node_counter
@@ -155,7 +153,6 @@ display:
           format_plural_plural: '@count'
           prefix: ''
           suffix: ''
-          provider: views
         daycount:
           id: daycount
           table: node_counter
@@ -213,7 +210,6 @@ display:
           format_plural_plural: '@count'
           prefix: ''
           suffix: ''
-          provider: views
       filters:
         status:
           value: true
@@ -223,14 +219,12 @@ display:
           expose:
             operator: false
           group: true
-          provider: views
       sorts:
         created:
           id: created
           table: node_field_data
           field: created
           order: DESC
-          provider: views
   page_1:
     display_plugin: page
     id: page_1

core/modules/taxonomy/config/install/views.view.taxonomy_term.yml

@@ -27,15 +27,12 @@ display:
           distinct: false
           replica: false
           query_tags: {  }
-        provider: views
       access:
         type: none
         options: {  }
-        provider: views
       cache:
         type: none
         options: {  }
-        provider: views
       exposed_form:
         type: basic
         options:
@@ -46,7 +43,6 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
       pager:
         type: mini
         options:
@@ -65,7 +61,6 @@ display:
           tags:
             previous: ‹‹
             next: ››
-        provider: views
       sorts:
         sticky:
           id: sticky
@@ -79,7 +74,6 @@ display:
           exposed: false
           expose:
             label: ''
-          provider: views
         created:
           id: created
           table: taxonomy_index
@@ -93,7 +87,6 @@ display:
           expose:
             label: ''
           granularity: second
-          provider: views
       arguments:
         tid:
           id: tid
@@ -102,9 +95,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - taxonomy
           default_action: ignore
           exception:
             value: all
@@ -139,7 +129,6 @@ display:
           require_value: false
           reduce_duplicates: false
           plugin_id: taxonomy_index_tid
-          provider: taxonomy
       filters:
         langcode:
           id: langcode
@@ -148,9 +137,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           operator: in
           value:
             '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
@@ -182,7 +168,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: language
-          provider: views
       style:
         type: default
         options:
@@ -190,13 +175,11 @@ display:
           row_class: ''
           default_row_class: true
           uses_fields: false
-        provider: views
       row:
         type: 'entity:node'
         options:
           view_mode: teaser
           comments: false
-        provider: views
       header:
         entity_taxonomy_term:
           id: entity_taxonomy_term
@@ -211,7 +194,6 @@ display:
           view_mode: full
           bypass_access: false
           plugin_id: entity
-          provider: views
       footer: {  }
       empty: {  }
       relationships: {  }
@@ -227,7 +209,6 @@ display:
       query:
         type: views_query
         options: {  }
-        provider: views
       path: taxonomy/term/%
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -240,7 +221,6 @@ display:
       query:
         type: views_query
         options: {  }
-        provider: views
       pager:
         type: full
         options:
@@ -262,7 +242,6 @@ display:
             first: '« first'
             last: 'last »'
           quantity: 9
-        provider: views
       path: taxonomy/term/%/feed
       displays:
         page: page
@@ -273,12 +252,10 @@ display:
           description: ''
           grouping: {  }
           uses_fields: false
-        provider: views
       row:
         type: node_rss
         options:
           relationship: none
           view_mode: default
-        provider: views
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null

core/modules/taxonomy/src/Plugin/views/wizard/TaxonomyTerm.php

@@ -42,7 +42,6 @@ class TaxonomyTerm extends WizardPluginBase {
 
     // Add permission-based access control.
     $display_options['access']['type'] = 'perm';
-    $display_options['access']['provider'] = 'user';
 
     // Remove the default fields, since we are customizing them here.
     unset($display_options['fields']);
@@ -51,7 +50,6 @@ class TaxonomyTerm extends WizardPluginBase {
     $display_options['fields']['name']['id'] = 'name';
     $display_options['fields']['name']['table'] = 'taxonomy_term_field_data';
     $display_options['fields']['name']['field'] = 'name';
-    $display_options['fields']['name']['provider'] = 'taxonomy';
     $display_options['fields']['name']['label'] = '';
     $display_options['fields']['name']['alter']['alter_text'] = 0;
     $display_options['fields']['name']['alter']['make_link'] = 0;

core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml

@@ -17,19 +17,14 @@ display:
     id: default
     display_title: Master
     position: 0
-    provider: views
     display_options:
       access:
         type: perm
         options:
           perm: 'access content'
-        provider: user
-        dependencies: {  }
       cache:
         type: none
         options: {  }
-        provider: views
-        dependencies: {  }
       query:
         type: views_query
         options:
@@ -38,8 +33,6 @@ display:
           replica: false
           query_comment: false
           query_tags: {  }
-        provider: views
-        dependencies: {  }
       exposed_form:
         type: basic
         options:
@@ -50,8 +43,6 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
-        dependencies: {  }
       pager:
         type: full
         options:
@@ -73,8 +64,6 @@ display:
             first: '« first'
             last: 'last »'
           quantity: 9
-        provider: views
-        dependencies: {  }
       style:
         type: default
         options:
@@ -82,21 +71,17 @@ display:
           row_class: ''
           default_row_class: true
           uses_fields: false
-        provider: views
-        dependencies: {  }
       row:
         type: 'entity:taxonomy_term'
         options:
           relationship: none
           view_mode: default
           rendering_language: translation_language_renderer
-        provider: views
       fields:
         name:
           id: name
           table: taxonomy_term_data
           field: name
-          provider: taxonomy
           label: ''
           alter:
             alter_text: false
@@ -113,7 +98,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies: {  }
           exclude: false
           element_type: ''
           element_class: ''
@@ -140,9 +124,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - taxonomy
           default_action: default
           exception:
             value: all
@@ -175,6 +156,5 @@ display:
           break_phrase: false
           not: false
           plugin_id: taxonomy
-          provider: taxonomy
       field_langcode: '***LANGUAGE_site_default***'
       field_langcode_add_to_query: null

core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml

@@ -18,19 +18,14 @@ display:
     id: default
     display_title: Master
     position: 0
-    provider: views
     display_options:
       access:
         type: perm
         options:
           perm: 'access content'
-        provider: user
-        dependencies: {  }
       cache:
         type: none
         options: {  }
-        provider: views
-        dependencies: {  }
       query:
         type: views_query
         options:
@@ -39,8 +34,6 @@ display:
           replica: false
           query_comment: false
           query_tags: {  }
-        provider: views
-        dependencies: {  }
       exposed_form:
         type: basic
         options:
@@ -51,8 +44,6 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
-        dependencies: {  }
       pager:
         type: none
         options:
@@ -67,7 +58,6 @@ display:
           id: name
           table: taxonomy_term_field_data
           field: name
-          provider: taxonomy
           label: ''
           alter:
             alter_text: false
@@ -84,7 +74,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies: {  }
           exclude: false
           element_type: ''
           element_class: ''
@@ -105,9 +94,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           operator: contains
           value: Comida
           group: 1
@@ -137,7 +123,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-          provider: views
       sorts: {  }
       title: 'Name filter page'
       header: {  }
@@ -152,7 +137,6 @@ display:
     id: page_dc
     display_title: 'Description Comida'
     position: 3
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -166,9 +150,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           operator: contains
           value: Comida
           group: 1
@@ -198,7 +179,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-          provider: views
       defaults:
         filters: false
         filter_groups: false
@@ -213,7 +193,6 @@ display:
     id: page_dp
     display_title: 'Description Comida'
     position: 3
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -227,10 +206,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
-              - views
           operator: contains
           value: Paris
           group: 1
@@ -260,7 +235,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-          provider: views
       defaults:
         filters: false
         filter_groups: false
@@ -275,7 +249,6 @@ display:
     id: page_nc
     display_title: 'Name Comida'
     position: 1
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -286,7 +259,6 @@ display:
     id: page_np
     display_title: 'Name Paris'
     position: 1
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -300,10 +272,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
-              - views
           operator: contains
           value: Paris
           group: 1
@@ -333,7 +301,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-          provider: views
       defaults:
         filters: false
         filter_groups: false
@@ -346,7 +313,6 @@ display:
     id: page_fp
     display_title: 'Field Paris'
     position: 3
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -360,10 +326,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
-              - views
           operator: contains
           value: Paris
           group: 1
@@ -393,7 +355,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-          provider: views
       defaults:
         filters: false
         filter_groups: false
@@ -408,7 +369,6 @@ display:
     id: page_fc
     display_title: 'Field Comida'
     position: 3
-    provider: views
     display_options:
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
@@ -422,9 +382,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           operator: contains
           value: Comida
           group: 1
@@ -454,7 +411,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
-          provider: views
       defaults:
         filters: false
         filter_groups: false

core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml

@@ -75,7 +75,6 @@ display:
           id: title
           table: node_field_data
           field: title
-          provider: node
           label: ''
           alter:
             alter_text: false
@@ -108,7 +107,6 @@ display:
           value: true
           table: node_field_data
           field: status
-          provider: node
           id: status
           expose:
             operator: '0'
@@ -157,7 +155,6 @@ display:
           hierarchy: true
           error_message: true
           plugin_id: taxonomy_index_tid
-          provider: taxonomy
       sorts: {  }
       header: {  }
       footer: {  }

core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml

@@ -18,14 +18,12 @@ display:
           id: name
           table: taxonomy_term_field_data
           plugin_id: taxonomy
-          provider: taxonomy
         nid:
           field: nid
           id: nid
           relationship: tid_representative
           table: node
           plugin_id: node
-          provider: node
       pager:
         options:
           items_per_page: 10
@@ -48,7 +46,6 @@ display:
           subquery_view: ''
           table: taxonomy_term_data
           plugin_id: groupwise_max
-          provider: views
       row:
         type: fields
       sorts:
@@ -58,7 +55,6 @@ display:
           order: DESC
           table: taxonomy_term_data
           plugin_id: standard
-          provider: views
       style:
         type: default
       title: test_groupwise

core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml

@@ -20,7 +20,6 @@ display:
             items_per_page: 25
           table: taxonomy_term_data
           plugin_id: taxonomy
-          provider: taxonomy
         tid_1:
           default_argument_type: fixed
           field: tid
@@ -33,7 +32,6 @@ display:
             items_per_page: 25
           table: taxonomy_term_data
           plugin_id: taxonomy
-          provider: taxonomy
       cache:
         type: none
       exposed_form:
@@ -51,7 +49,6 @@ display:
           vids:
             tags: false
           plugin_id: node_term_data
-          provider: taxonomy
         term_node_tid_1:
           field: term_node_tid
           id: term_node_tid_1
@@ -60,7 +57,6 @@ display:
           vids:
             tags: false
           plugin_id: node_term_data
-          provider: taxonomy
       sorts:
         nid:
           field: nid
@@ -68,7 +64,6 @@ display:
           order: DESC
           table: node
           plugin_id: standard
-          provider: views
       style:
         type: default
       row:

core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml

@@ -9,17 +9,14 @@ display:
     id: default
     display_title: Master
     position: 0
-    provider: views
     display_options:
       access:
         type: perm
         options:
           perm: 'access content'
-        provider: user
       cache:
         type: none
         options: {  }
-        provider: views
       query:
         type: views_query
         options:
@@ -28,7 +25,6 @@ display:
           replica: false
           query_comment: false
           query_tags: {  }
-        provider: views
       exposed_form:
         type: basic
         options:
@@ -39,7 +35,6 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
       pager:
         type: full
         options:
@@ -61,7 +56,6 @@ display:
             first: '« first'
             last: 'last »'
           quantity: 9
-        provider: views
       style:
         type: default
         options:
@@ -69,7 +63,6 @@ display:
           row_class: ''
           default_row_class: true
           uses_fields: false
-        provider: views
       row:
         type: fields
         options:
@@ -77,13 +70,11 @@ display:
           separator: ''
           hide_empty: false
           default_field_elements: true
-        provider: views
       fields:
         name:
           id: name
           table: taxonomy_term_data
           field: name
-          provider: taxonomy
           label: ''
           alter:
             alter_text: false
@@ -127,7 +118,6 @@ display:
           admin_label: Parent
           required: true
           plugin_id: standard
-          provider: views
       arguments: {  }
 label: test_taxonomy_parent
 module: views

core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_tid_field.yml

@@ -17,19 +17,14 @@ display:
     id: default
     display_title: Master
     position: 0
-    provider: views
     display_options:
       access:
         type: perm
         options:
           perm: 'access content'
-        provider: user
-        dependencies: {  }
       cache:
         type: none
         options: {  }
-        provider: views
-        dependencies: {  }
       query:
         type: views_query
         options:
@@ -38,8 +33,6 @@ display:
           replica: false
           query_comment: false
           query_tags: {  }
-        provider: views
-        dependencies: {  }
       exposed_form:
         type: basic
         options:
@@ -50,8 +43,6 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
-        dependencies: {  }
       pager:
         type: full
         options:
@@ -73,8 +64,6 @@ display:
             first: '« first'
             last: 'last »'
           quantity: 9
-        provider: views
-        dependencies: {  }
       style:
         type: default
         options:
@@ -82,8 +71,6 @@ display:
           row_class: ''
           default_row_class: true
           uses_fields: false
-        provider: views
-        dependencies: {  }
       row:
         type: fields
         options:
@@ -91,8 +78,6 @@ display:
           separator: ''
           hide_empty: false
           default_field_elements: true
-        provider: views
-        dependencies: {  }
       fields:
         name:
           id: name
@@ -101,9 +86,6 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - taxonomy
           label: Name
           exclude: false
           alter:
@@ -148,7 +130,6 @@ display:
           link_to_taxonomy: true
           convert_spaces: false
           plugin_id: taxonomy
-          provider: taxonomy
       filters: {  }
       sorts:
         tid:
@@ -158,15 +139,11 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          dependencies:
-            module:
-              - views
           order: ASC
           exposed: false
           expose:
             label: ''
           plugin_id: standard
-          provider: views
       header: {  }
       footer: {  }
       empty: {  }

core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml

@@ -93,7 +93,6 @@ display:
           empty_zero: false
           hide_alter_empty: true
           link_to_node: true
-          provider: node
       filters:
         uid_touch_tracker:
           id: uid_touch_tracker
@@ -133,7 +132,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: tracker_user_uid
-          provider: tracker
       arguments:
         uid_touch_tracker:
           id: uid_touch_tracker
@@ -168,7 +166,6 @@ display:
             fail: 'not found'
           validate_options: {  }
           plugin_id: tracker_user_uid
-          provider: tracker
 label: 'tracker test'
 module: views
 id: test_tracker_user_uid

core/modules/user/config/install/views.view.user_admin_people.yml

@@ -14,10 +14,8 @@ display:
         type: perm
         options:
           perm: 'administer users'
-        provider: user
       cache:
         type: none
-        provider: views
       query:
         type: views_query
         options:
@@ -26,7 +24,6 @@ display:
           replica: false
           query_comment: false
           query_tags: {  }
-        provider: views
       exposed_form:
         type: basic
         options:
@@ -37,7 +34,6 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
       pager:
         type: full
         options:
@@ -59,7 +55,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-        provider: views
       style:
         type: table
         options:
@@ -133,10 +128,8 @@ display:
               responsive: ''
           default: created
           empty_table: true
-        provider: views
       row:
         type: fields
-        provider: views
       fields:
         user_bulk_form:
           id: user_bulk_form
@@ -187,7 +180,6 @@ display:
           empty_zero: false
           hide_alter_empty: true
           plugin_id: user_bulk_form
-          provider: user
         name:
           id: name
           table: users_field_data
@@ -241,7 +233,6 @@ display:
           anonymous_text: ''
           format_username: true
           plugin_id: user_name
-          provider: user
         status:
           id: status
           table: users_field_data
@@ -295,7 +286,6 @@ display:
           type_custom_false: ''
           not: '0'
           plugin_id: boolean
-          provider: views
         rid:
           id: rid
           table: users_roles
@@ -347,7 +337,6 @@ display:
           type: ul
           separator: ', '
           plugin_id: user_roles
-          provider: user
         created:
           id: created
           table: users_field_data
@@ -400,7 +389,6 @@ display:
           custom_date_format: ''
           timezone: ''
           plugin_id: date
-          provider: views
         access:
           id: access
           table: users_field_data
@@ -453,7 +441,6 @@ display:
           custom_date_format: ''
           timezone: ''
           plugin_id: date
-          provider: views
         edit_node:
           id: edit_node
           table: users
@@ -504,7 +491,6 @@ display:
           hide_alter_empty: true
           text: Edit
           plugin_id: user_link_edit
-          provider: user
         dropbutton:
           id: dropbutton
           table: views
@@ -695,7 +681,6 @@ display:
             group_items: {  }
           reduce_duplicates: false
           plugin_id: user_roles
-          provider: user
         permission:
           id: permission
           table: users_roles
@@ -736,7 +721,6 @@ display:
             group_items: {  }
           reduce_duplicates: false
           plugin_id: user_permissions
-          provider: user
         status:
           id: status
           table: users_field_data
@@ -783,7 +767,6 @@ display:
                 operator: '='
                 value: '0'
           plugin_id: boolean
-          provider: views
         uid_raw:
           id: uid_raw
           table: users
@@ -823,7 +806,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: numeric
-          provider: views
       sorts:
         created:
           id: created
@@ -838,7 +820,6 @@ display:
             label: ''
           granularity: second
           plugin_id: date
-          provider: views
       title: People
       empty:
         area_text_custom:
@@ -852,7 +833,6 @@ display:
           tokenize: false
           content: 'No people available.'
           plugin_id: text_custom
-          provider: views
       use_more: false
       use_more_always: false
       use_more_text: more

core/modules/user/config/install/views.view.who_s_new.yml

@@ -14,11 +14,9 @@ display:
         type: perm
         options:
           perm: 'access content'
-        provider: user
       cache:
         type: none
         options: {  }
-        provider: views
       query:
         type: views_query
         options:
@@ -27,7 +25,6 @@ display:
           replica: false
           query_comment: false
           query_tags: {  }
-        provider: views
       exposed_form:
         type: basic
         options:
@@ -38,19 +35,15 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
       pager:
         type: some
         options:
           items_per_page: 5
           offset: 0
-        provider: views
       style:
         type: html_list
-        provider: views
       row:
         type: fields
-        provider: views
       fields:
         name:
           id: name
@@ -162,7 +155,6 @@ display:
     id: block_1
     display_title: 'Who''s new'
     position: 1
-    provider: views
     display_options:
       display_description: 'A list of new users'
       block_description: 'Who''s new'

core/modules/user/config/install/views.view.who_s_online.yml

@@ -14,11 +14,9 @@ display:
         type: perm
         options:
           perm: 'access user profiles'
-        provider: user
       cache:
         type: none
         options: {  }
-        provider: views
       query:
         type: views_query
         options:
@@ -27,7 +25,6 @@ display:
           replica: false
           query_comment: false
           query_tags: {  }
-        provider: views
       exposed_form:
         type: basic
         options:
@@ -38,13 +35,11 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-        provider: views
       pager:
         type: some
         options:
           items_per_page: 10
           offset: 0
-        provider: views
       style:
         type: html_list
         options:
@@ -54,10 +49,8 @@ display:
           type: ul
           wrapper_class: item-list
           class: ''
-        provider: views
       row:
         type: fields
-        provider: views
       fields:
         name:
           id: name
@@ -159,7 +152,6 @@ display:
           expose:
             label: ''
           granularity: second
-          provider: views
           plugin_id: date
       title: 'Who''s online'
       header:
@@ -193,7 +185,6 @@ display:
     id: who_s_online_block
     display_title: 'Who''s online'
     position: 1
-    provider: views
     display_options:
       block_description: 'Who''s online'
       display_description: 'A list of users that are currently logged in.'

core/modules/user/src/Plugin/views/wizard/Users.php

@@ -64,7 +64,6 @@ class Users extends WizardPluginBase {
 
     // Add permission-based access control.
     $display_options['access']['type'] = 'perm';
-    $display_options['access']['provider'] = 'user';
     $display_options['access']['perm'] = 'access user profiles';
 
     // Remove the default fields, since we are customizing them here.
@@ -74,7 +73,6 @@ class Users extends WizardPluginBase {
     $display_options['fields']['name']['id'] = 'name';
     $display_options['fields']['name']['table'] = 'users_field_data';
     $display_options['fields']['name']['field'] = 'name';
-    $display_options['fields']['name']['provider'] = 'user';
     $display_options['fields']['name']['label'] = '';
     $display_options['fields']['name']['alter']['alter_text'] = 0;
     $display_options['fields']['name']['alter']['make_link'] = 0;

core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_permission.yml

@@ -128,7 +128,6 @@ display:
           expose:
             label: ''
           plugin_id: standard
-          provider: views
 human_name: test_filter_permission
 module: views
 id: test_filter_permission

core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml

@@ -19,14 +19,12 @@ display:
           id: name
           table: users_field_data
           plugin_id: user_name
-          provider: user
         nid:
           field: nid
           id: nid
           relationship: uid_representative
           table: node
           plugin_id: node
-          provider: node
       filters:
         status:
           expose:
@@ -37,7 +35,6 @@ display:
           table: users_field_data
           value: '1'
           plugin_id: boolean
-          provider: views
       pager:
         options:
           items_per_page: '10'
@@ -60,7 +57,6 @@ display:
           subquery_view: ''
           table: users
           plugin_id: groupwise_max
-          provider: views
       row:
         type: fields
       sorts:
@@ -70,7 +66,6 @@ display:
           order: DESC
           table: users_field_data
           plugin_id: date
-          provider: views
       style:
         type: default
       title: test_groupwise_user

core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml

@@ -16,7 +16,6 @@ display:
           must_not_be: '0'
           style_plugin: default_summary
           table: views
-          provider: views
       cache:
         type: none
       exposed_form:
@@ -37,7 +36,6 @@ display:
           id: title
           link_to_node: '0'
           table: node_field_data
-          provider: node
       pager:
         options:
           id: '0'

core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml

@@ -20,13 +20,11 @@ display:
           table: users
           field: user_bulk_form
           plugin_id: user_bulk_form
-          provider: user
         name:
           id: name
           table: users_field_data
           field: name
           plugin_id: user_name
-          provider: user
       sorts:
         uid:
           id: uid
@@ -34,7 +32,6 @@ display:
           field: uid
           order: ASC
           plugin_id: user
-          provider: views
       filters:
         status:
           id: status
@@ -43,7 +40,6 @@ display:
           operator: '='
           value: '1'
           plugin_id: boolean
-          provider: views
   page_1:
     display_plugin: page
     id: page_1

core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_changed.yml

@@ -22,13 +22,11 @@ display:
           id: uid
           table: users
           field: uid
-          provider: user
         changed:
           id: changed
           table: users_field_data
           field: changed
           label: Updated date
-          provider: user
           date_format: html_date
       filters: { }
     display_plugin: default

core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml

@@ -45,7 +45,6 @@ display:
           link_to_user: '1'
           overwrite_anonymous: '0'
           plugin_id: string
-          provider: views
         data:
           id: data
           table: users
@@ -108,7 +107,6 @@ display:
             operator: '0'
           group: '1'
           plugin_id: numeric
-          provider: user
       sorts:
         created:
           id: created
@@ -116,7 +114,6 @@ display:
           field: created
           order: DESC
           plugin_id: date
-          provider: views
 label: test_user_data
 module: views
 id: test_user_data

core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml

@@ -22,7 +22,6 @@ display:
           id: uid
           table: users
           field: uid
-          provider: user
       filters:
         uid:
           id: uid
@@ -37,7 +36,6 @@ display:
             remember_roles:
               authenticated: authenticated
               anonymous: 0
-          provider: user
     display_plugin: default
     display_title: Master
     id: default

core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml

@@ -37,7 +37,6 @@ display:
           overwrite_anonymous: '0'
           table: users_field_data
           plugin_id: user_name
-          provider: user
         title:
           alter:
             absolute: '0'
@@ -56,7 +55,6 @@ display:
           link_to_node: '1'
           table: node_field_data
           plugin_id: node
-          provider: node
         uid:
           alter:
             absolute: '0'
@@ -81,7 +79,6 @@ display:
           link_to_user: '1'
           table: users
           plugin_id: user
-          provider: user
       pager:
         options:
           items_per_page: '10'

core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml

@@ -11,7 +11,6 @@ display:
           table: users
           field: uid
           plugin_id: user
-          provider: user
       arguments:
         uid:
           id: uid
@@ -20,7 +19,6 @@ display:
           title_enable: true
           title: '%1'
           plugin_id: user_uid
-          provider: user
     display_plugin: default
     display_title: Master
     id: default

core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml

@@ -18,7 +18,6 @@ display:
           validate:
             type: entity:user
           plugin_id: 'null'
-          provider: views
       cache:
         type: none
       exposed_form:

core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_username.yml

@@ -18,7 +18,6 @@ display:
           validate:
             type: user_name
           plugin_id: 'null'
-          provider: views
       cache:
         type: none
       exposed_form:

core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml

@@ -81,7 +81,6 @@ display:
           anonymous_text: ''
           format_username: '1'
           plugin_id: user_name
-          provider: user
         rid:
           id: rid
           table: users_roles
@@ -133,7 +132,6 @@ display:
           type: separator
           separator: ''
           plugin_id: user_roles
-          provider: user
       filters:
         status:
           value: '1'
@@ -144,7 +142,6 @@ display:
             operator: '0'
           group: '1'
           plugin_id: boolean
-          provider: views
       sorts: {  }
       title: test_user_role
   page_1:

core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml

@@ -31,7 +31,6 @@ display:
           overwrite_anonymous: '0'
           table: users_field_data
           plugin_id: user_name
-          provider: user
       pager:
         type: full
       query:

core/modules/views/config/schema/views.data_types.schema.yml

@@ -24,12 +24,6 @@ views_display:
           label: 'Pager type'
         options:
           type: views.pager.[%parent.type]
-        provider:
-          type: string
-          label: 'Provider'
-        dependencies:
-          type: config_dependencies
-          label: 'Dependencies'
     exposed_form:
       type: mapping
       label: 'Exposed form'
@@ -40,12 +34,6 @@ views_display:
         options:
           label: 'Options'
           type: views.exposed_form.[%parent.type]
-        provider:
-          type: string
-          label: 'Provider'
-        dependencies:
-          type: config_dependencies
-          label: 'Dependencies'
     access:
       type: mapping
       label: 'Access'
@@ -55,12 +43,6 @@ views_display:
           label: 'Access type'
         options:
           type: views.access.[%parent.type]
-        provider:
-          type: string
-          label: 'Provider'
-        dependencies:
-          type: config_dependencies
-          label: 'Dependencies'
     cache:
       type: views.cache.[type]
     empty:
@@ -105,12 +87,6 @@ views_display:
           label: 'Type'
         options:
           type: views.style.[%parent.type]
-        provider:
-          type: string
-          label: 'Provider'
-        dependencies:
-          type: config_dependencies
-          label: 'Dependencies'
     row:
       type: mapping
       label: 'Row'
@@ -120,12 +96,6 @@ views_display:
           label: 'Row type'
         options:
           type: views.row.[%parent.type]
-        provider:
-          type: string
-          label: 'Provider'
-        dependencies:
-          type: config_dependencies
-          label: 'Dependencies'
     query:
       type: mapping
       label: 'Query'
@@ -135,12 +105,6 @@ views_display:
           label: 'Query type'
         options:
           type: views.query.[%parent.type]
-        provider:
-          type: string
-          label: 'Provider'
-        dependencies:
-          type: config_dependencies
-          label: 'Dependencies'
     defaults:
       type: mapping
       label: 'Defaults'
@@ -355,12 +319,6 @@ views_handler:
     admin_label:
       type: label
       label: 'A string to identify the handler instance in the admin UI.'
-    provider:
-      type: string
-      label: 'Provider'
-    dependencies:
-      type: config_dependencies
-      label: 'Dependencies'
 
 views_argument:
   type: views_handler
@@ -451,10 +409,6 @@ views_argument:
     plugin_id:
       type: string
       label: 'Plugin ID'
-    provider:
-      type: string
-      label: 'Provider'
-
 
 views_exposed_form:
   type: mapping
@@ -611,9 +565,6 @@ views_field:
     plugin_id:
       type: string
       label: 'Plugin ID'
-    provider:
-      type: string
-      label: 'Provider'
 
 views_pager:
   type: mapping
@@ -802,9 +753,6 @@ views_filter:
     plugin_id:
       type: string
       label: 'Plugin ID'
-    provider:
-      type: string
-      label: 'Provider'
 
 views_filter_group_items:
   type: sequence
@@ -849,9 +797,6 @@ views_relationship:
     required:
       type: boolean
       label: 'Require this relationship'
-    provider:
-      type: string
-      label: 'Provider'
 
 views_query:
   type: mapping
@@ -898,9 +843,3 @@ views_cache:
     type:
       type: string
       label: 'Cache type'
-    provider:
-      type: string
-      label: 'Provider'
-    dependencies:
-      type: config_dependencies
-      label: 'Dependencies'

core/modules/views/config/schema/views.schema.yml

@@ -112,8 +112,5 @@ views.view.*:
             position:
               type: integer
               label: 'Position'
-            provider:
-              type: string
-              label: 'Display provider module'
             display_options:
               type: views.display.[%parent.display_plugin]

core/modules/views/src/Entity/View.php

@@ -199,7 +199,6 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
       // @see \Drupal\Core\StringTranslation\TranslationWrapper
       'display_title' => (string) $title,
       'position' => $id === 'default' ? 0 : count($this->display),
-      'provider' => $plugin['provider'],
       'display_options' => array(),
     );
 
@@ -248,47 +247,32 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
 
     // Ensure that the view is dependant on the module that implements the view.
     $this->addDependency('module', $this->module);
-    // Ensure that the view is dependent on the module that provides the schema
-    // for the base table.
-    $schema = $this->drupalGetSchema($this->base_table);
-    // @todo Entity base tables are no longer registered in hook_schema(). Once
-    //   we automate the views data for entity types add the entity type
-    //   type provider as a dependency. See https://drupal.org/node/1740492.
-    if ($schema && $this->module != $schema['module']) {
-      $this->addDependency('module', $schema['module']);
-    }
 
-    $handler_types = array();
+    $executable = $this->getExecutable();
-    foreach (Views::getHandlerTypes() as $type) {
+    $executable->initDisplay();
-      $handler_types[] = $type['plural'];
+    $handler_types = array_keys(Views::getHandlerTypes());
-    }
+
-    foreach ($this->get('display') as $display) {
+    foreach ($executable->displayHandlers as $display) {
       // Add dependency for the display itself.
-      if (isset($display['provider'])) {
+      /** @var \Drupal\views\Plugin\views\display\DisplayPluginBase $display */
-        $this->addDependency('module', $display['provider']);
+      $this->addDependency('module', $display->getProvider());
-      }
 
       // Collect all dependencies of all handlers.
       foreach ($handler_types as $handler_type) {
-        if (!empty($display['display_options'][$handler_type])) {
+        foreach ($display->getHandlers($handler_type) as $handler) {
-          foreach ($display['display_options'][$handler_type] as $handler) {
+          $this->calculatePluginDependencies($handler);
-            // Add the provider as dependency.
-            if (isset($handler['provider'])) {
-              $this->addDependency('module', $handler['provider']);
-            }
-            // Add the additional dependencies from the handler configuration.
-            if (!empty($handler['dependencies'])) {
-              $this->addDependencies($handler['dependencies']);
-          }
         }
       }
-    }
 
       // Collect all dependencies of plugins.
       foreach (Views::getPluginTypes('plugin') as $plugin_type) {
-        if (!empty($display['display_options'][$plugin_type]['options']['dependencies'])) {
+        // Argument validator/default plugins do not return a plugin.
-          $this->addDependencies($display['display_options'][$plugin_type]['options']['dependencies']);
+        // @todo https://www.drupal.org/node/2368767 Calculate argument
+        //   validator/default plugin dependencies.
+        if (!$plugin = $display->getPlugin($plugin_type)) {
+          continue;
         }
+        $this->calculatePluginDependencies($plugin);
       }
     }
 
@@ -447,11 +431,4 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
     $this->set('display', $displays);
   }
 
-  /**
-   * Wraps drupal_get_schema().
-   */
-  protected function drupalGetSchema($table = NULL, $rebuild = FALSE) {
-    return drupal_get_schema($table, $rebuild);
-  }
-
 }

core/modules/views/src/EntityViewsData.php

@@ -129,6 +129,7 @@ class EntityViewsData implements EntityHandlerInterface, EntityViewsDataInterfac
     // Setup base information of the views data.
     $data[$base_table]['table']['entity type'] = $this->entityType->id();
     $data[$base_table]['table']['group'] = $this->entityType->getLabel();
+    $data[$base_table]['table']['provider'] = $this->entityType->getProvider();
     $data[$base_table]['table']['base'] = [
       'field' => $base_field,
       'title' => $this->entityType->getLabel(),
@@ -157,10 +158,12 @@ class EntityViewsData implements EntityHandlerInterface, EntityViewsDataInterfac
       ];
       $data[$data_table]['table']['entity type'] = $this->entityType->id();
       $data[$data_table]['table']['group'] = $this->entityType->getLabel();
+      $data[$data_table]['table']['provider'] = $this->entityType->getProvider();
     }
     if ($revision_table) {
       $data[$revision_table]['table']['entity type'] = $this->entityType->id();
       $data[$revision_table]['table']['group'] = $this->t('@entity_type revision', ['@entity_type' => $this->entityType->getLabel()]);
+      $data[$revision_table]['table']['provider'] = $this->entityType->getProvider();
       $data[$revision_table]['table']['base'] = array(
         'field' => $revision_field,
         'title' => $this->t('@entity_type revisions', array('@entity_type' => $this->entityType->getLabel())),

core/modules/views/src/Plugin/views/BrokenHandlerTrait.php

@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Plugin\views;
 
+use Drupal\Component\Utility\String;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
@@ -20,10 +21,7 @@ trait BrokenHandlerTrait {
    * @see \Drupal\views\Plugin\views\PluginBase::defineOptions().
    */
   public function adminLabel($short = FALSE) {
-    $args = array(
+    return t('Broken/missing handler');
-      '@module' => $this->definition['original_configuration']['provider'],
-    );
-    return t('Broken/missing handler (Module: @module) …', $args);
   }
 
   /**
@@ -60,11 +58,11 @@ trait BrokenHandlerTrait {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     $description_top = t('The handler for this item is broken or missing. The following details are available:');
 
-    $items = array(
+    foreach ($this->definition['original_configuration'] as $key => $value) {
-      t('Module: @module', array('@module' => $this->definition['original_configuration']['provider'])),
+      if (is_scalar($value)) {
-      t('Table: @table', array('@table' => $this->definition['original_configuration']['table'])),
+        $items[] = String::format('@key: @value', array('@key' => $key, '@value' => $value));
-      t('Field: @field', array('@field' => $this->definition['original_configuration']['field'])),
+      }
-    );
+    }
 
     $description_bottom = t('Enabling the appropriate module will may solve this issue. Otherwise, check to see if there is a module update available.');
 
@@ -97,4 +95,15 @@ trait BrokenHandlerTrait {
     return TRUE;
   }
 
+  /**
+   * Gets dependencies for a broken handler.
+   *
+   * @return array
+   *
+   * @see \Drupal\views\Plugin\views\PluginBase::calculateDependencies().
+   */
+  public function calculateDependencies() {
+    return [];
+  }
+
 }

core/modules/views/src/Plugin/views/HandlerBase.php

@@ -165,7 +165,6 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
     $options['relationship'] = array('default' => 'none');
     $options['group_type'] = array('default' => 'group');
     $options['admin_label'] = array('default' => '');
-    $options['dependencies'] = array('default' => array());
 
     return $options;
   }

core/modules/views/src/Plugin/views/PluginBase.php

@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Plugin\views;
 
+use Drupal\Component\Plugin\DependentPluginInterface;
 use Drupal\Component\Utility\String;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
@@ -42,7 +43,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  *
  * @ingroup views_plugins
  */
-abstract class PluginBase extends ComponentPluginBase implements ContainerFactoryPluginInterface, ViewsPluginInterface {
+abstract class PluginBase extends ComponentPluginBase implements ContainerFactoryPluginInterface, ViewsPluginInterface, DependentPluginInterface {
 
   /**
    * Include negotiated languages when listing languages.
@@ -386,8 +387,16 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
   /**
    * {@inheritdoc}
    */
-  public function getDependencies() {
+  public function calculateDependencies() {
-    return array();
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getProvider() {
+    $definition = $this->getPluginDefinition();
+    return $definition['provider'];
   }
 
   /**

core/modules/views/src/Plugin/views/ViewsPluginInterface.php

@@ -20,14 +20,11 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 interface ViewsPluginInterface extends PluginInspectionInterface, DerivativeInspectionInterface {
 
   /**
-   * Returns an array of module dependencies for this plugin.
+   * Returns the plugin provider.
    *
-   * Dependencies are a list of module names, which might depend on the
+   * @return string
-   * configuration.
-   *
-   * @return array
    */
-  public function getDependencies();
+  public function getProvider();
 
   /**
    * Return the human readable name of the display.

core/modules/views/src/Plugin/views/display/DisplayPluginBase.php

@@ -908,7 +908,9 @@ abstract class DisplayPluginBase extends PluginBase {
       $types = ViewExecutable::getHandlerTypes();
       $plural = $types[$type]['plural'];
 
-      foreach ($this->getOption($plural) as $id => $info) {
+      // Cast to an array so that if the display does not have any handlers of
+      // this type there is no PHP error.
+      foreach ((array) $this->getOption($plural) as $id => $info) {
         // If this is during form submission and there are temporary options
         // which can only appear if the view is in the edit cache, use those
         // options instead. This is used for AJAX multi-step stuff.
@@ -1988,7 +1990,6 @@ abstract class DisplayPluginBase extends PluginBase {
             $plugin_options = array(
               'type' => $type,
               'options' => $plugin->options,
-              'provider' => $plugin->definition['provider']
             );
             $this->setOption($plugin_type, $plugin_options);
             if ($plugin->usesOptions()) {

core/modules/views/src/Plugin/views/query/QueryPluginBase.php

@@ -117,6 +117,21 @@ abstract class QueryPluginBase extends PluginBase {
     return $this->t('Settings');
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    $dependencies = [];
+
+    foreach ($this->getEntityTableInfo() as $entity_type => $info) {
+      if (!empty($info['provider'])) {
+        $dependencies['module'][] = $info['provider'];
+      }
+    }
+
+    return $dependencies;
+  }
+
   /**
    * Set a LIMIT on the query, specifying a maximum number of results.
    */
@@ -260,9 +275,15 @@ abstract class QueryPluginBase extends PluginBase {
         'entity_type' => $base_table_data['table']['entity type'],
         'revision' => FALSE,
       );
+
+      // Include the entity provider.
+      if (!empty($table_data['table']['provider'])) {
+        $entity_tables[$table_data['table']['entity type']]['provider'] = $table_data['table']['provider'];
+      }
     }
+
     // Include all relationships.
-    foreach ($this->view->relationship as $relationship_id => $relationship) {
+    foreach ((array) $this->view->relationship as $relationship_id => $relationship) {
       $table_data = $views_data->get($relationship->definition['base']);
       if (isset($table_data['table']['entity type'])) {
         $entity_tables[$table_data['table']['entity type']] = array(
@@ -272,6 +293,11 @@ abstract class QueryPluginBase extends PluginBase {
           'entity_type' => $table_data['table']['entity type'],
           'revision' => FALSE,
         );
+
+        // Include the entity provider.
+        if (!empty($table_data['table']['provider'])) {
+          $entity_tables[$table_data['table']['entity type']]['provider'] = $table_data['table']['provider'];
+        }
       }
     }
 

core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php

@@ -164,6 +164,17 @@ abstract class RelationshipPluginBase extends HandlerBase {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    // Add the provider of the relationship's base table to the dependencies.
+    $table_data = $this->getViewsData()->get($this->definition['base']);
+    return [
+      'module' => [$table_data['table']['provider']],
+    ];
+  }
+
 }
 
 /**

core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php

@@ -843,8 +843,6 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
     // Add default options array to each plugin type.
     foreach ($display_options as &$options) {
       $options['options'] = array();
-      $options['provider'] = 'views';
-      $options['dependencies'] = array();
     }
 
     // Add a least one field so the view validates and the user has a preview.
@@ -870,9 +868,6 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
     // Load the plugin ID and module.
     $base_field = $data['table']['base']['field'];
     $display_options['fields'][$base_field]['plugin_id'] = $data[$base_field]['field']['id'];
-    if ($definition = Views::pluginManager('field')->getDefinition($display_options['fields'][$base_field]['plugin_id'], FALSE)) {
-      $display_options['fields'][$base_field]['provider'] = isset($definition['provider']) ? $definition['provider'] : 'views';
-    }
 
     return $display_options;
   }

core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php

@@ -7,7 +7,8 @@
 
 namespace Drupal\views\Tests\Entity;
 
-use Drupal\views\Tests\ViewTestBase;
+use Drupal\Component\Utility\Unicode;
+use Drupal\views\Tests\ViewUnitTestBase;
 use Drupal\views\Views;
 
 /**
@@ -15,56 +16,93 @@ use Drupal\views\Views;
  *
  * @group views
  */
-class ViewEntityDependenciesTest extends ViewTestBase {
+class ViewEntityDependenciesTest extends ViewUnitTestBase {
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_field_get_entity');
+  public static $testViews = ['test_field_get_entity', 'test_relationship_dependency', 'test_plugin_dependencies'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'comment');
+  public static $modules = ['node', 'comment', 'user', 'field', 'text', 'entity_reference'];
 
   /**
    * Tests the calculateDependencies method.
    */
   public function testCalculateDependencies() {
-    // The view is a view of comments, their nodes and their authors, so there
+
-    // are three layers of entities.
+    $comment_type = entity_create('comment_type', array(
-    $account = entity_create('user', array('name' => $this->randomMachineName(), 'bundle' => 'user'));
+      'id' => 'comment',
-    $account->save();
+      'label' => 'Comment settings',
-    $this->drupalCreateContentType(array('type' => 'page'));
+      'description' => 'Comment settings',
-    $this->container->get('comment.manager')->addDefaultField('node', 'page');
+      'target_entity_type_id' => 'node',
+    ));
+    $comment_type->save();
+    $content_type = entity_create('node_type', array(
+      'type' => $this->randomMachineName(),
+      'name' => $this->randomString(),
+    ));
+    $content_type->save();
+    $field_storage = entity_create('field_storage_config', array(
+      'field_name' => Unicode::strtolower($this->randomMachineName()),
+      'entity_type' => 'node',
+      'type' => 'comment',
+    ));
+    $field_storage->save();
+    entity_create('field_config', array(
+      'field_storage' => $field_storage,
+      'bundle' => $content_type->id(),
+      'label' => $this->randomMachineName() . '_label',
+      'description' => $this->randomMachineName() . '_description',
+      'settings' => array(
+        'comment_type' => $comment_type->id(),
+      ),
+    ))->save();
     // Force a flush of the in-memory storage.
     $this->container->get('views.views_data')->clear();
 
-    $node = entity_create('node', array('uid' => $account->id(), 'type' => 'page'));
+    $expected = [];
-    $node->save();
+    $expected['test_field_get_entity'] = [
-    $comment = entity_create('comment', array(
+      'module' => [
-      'uid' => $account->id(),
-      'entity_id' => $node->id(),
-      'entity_type' => 'node',
-      'field_name' => 'comment'
-    ));
-    $comment->save();
-
-    $view = Views::getView('test_field_get_entity');
-
-    $expected_dependencies = array(
-      'module' => array(
         'comment',
         'node',
         'user',
-      )
+      ]
-    );
+    ];
-    $dependencies = $view->calculateDependencies();
+    // Tests dependencies of relationships.
-    $this->assertEqual($expected_dependencies, $dependencies);
+    $expected['test_relationship_dependency'] = [
+      'module' => [
+        'comment',
+        'node',
+        'user',
+      ]
+    ];
+    $expected['test_plugin_dependencies'] = [
+      'module' => [
+        'comment',
+        // The argument handler has an explicit dependency on views_test_data.
+        'views_test_data',
+      ],
+      'test_dependency' => [
+        'access',
+        'row',
+        'style',
+      ]
+    ];
+    foreach ($this::$testViews as $view_id) {
+      $view = Views::getView($view_id);
+
+      $dependencies = $view->calculateDependencies();
+      $this->assertEqual($expected[$view_id], $dependencies);
+      $config = \Drupal::config('views.view.' . $view_id);
+      \Drupal::service('config.storage.staging')->write($view_id, $config->get());
+    }
   }
 
 }

core/modules/views/src/Tests/Handler/AreaTitleWebTest.php

@@ -51,7 +51,6 @@ class AreaTitleWebTest extends ViewTestBase {
       'table' => 'views_test_data',
       'relationship' => 'none',
       'plugin_id' => 'numeric',
-      'provider' => 'views_test_data',
       // Add a value which does not exist.
       'value' => ['value' => '042118160112'],
     ];

core/modules/views/src/Tests/Plugin/DisplayTest.php

@@ -66,7 +66,6 @@ class DisplayTest extends PluginTestBase {
       'id' => 'display_test_1',
       'display_title' => 'Display test',
       'position' => 1,
-      'provider' => 'views_test_data',
     );
     $this->assertEqual($displays['display_test_1'], $options);
 
@@ -79,7 +78,6 @@ class DisplayTest extends PluginTestBase {
       'id' => 'display_test_2',
       'display_title' => 'Display test 2',
       'position' => 2,
-      'provider' => 'views_test_data',
     );
     $this->assertEqual($displays['display_test_2'], $options);
 

core/modules/views/src/Tests/ViewStorageTest.php

@@ -268,7 +268,6 @@ class ViewStorageTest extends ViewUnitTestBase {
       'table' => 'views_test_data',
       'field' => 'id',
       'plugin_id' => 'numeric',
-      'provider' => 'views',
     );
     $this->assertEqual($item1, $expected_item);
 
@@ -284,7 +283,6 @@ class ViewStorageTest extends ViewUnitTestBase {
       'table' => 'views_test_data',
       'field' => 'name',
       'plugin_id' => 'standard',
-      'provider' => 'views',
     ) + $options;
     $this->assertEqual($item2, $expected_item);
 

core/modules/views/src/Tests/Wizard/BasicTest.php

@@ -204,11 +204,8 @@ class BasicTest extends WizardTestBase {
     $displays = $view->storage->get('display');
 
     foreach ($displays as $display) {
-      $this->assertIdentical($display['provider'], 'views', 'Expected provider found for display.');
-
       foreach (array('query', 'exposed_form', 'pager', 'style', 'row') as $type) {
         $this->assertFalse(empty($display['display_options'][$type]['options']), String::format('Default options found for @plugin.', array('@plugin' => $type)));
-        $this->assertIdentical($display['display_options'][$type]['provider'], 'views', String::format('Expected provider found for @plugin.', array('@plugin' => $type)));
       }
     }
   }

core/modules/views/src/ViewExecutable.php

@@ -1912,9 +1912,6 @@ class ViewExecutable {
     $data = Views::viewsData()->get($table);
     if (isset($data[$field][$handler_type]['id'])) {
       $fields[$id]['plugin_id'] = $data[$field][$handler_type]['id'];
-      if ($definition = Views::pluginManager($handler_type)->getDefinition($fields[$id]['plugin_id'], FALSE)) {
-        $fields[$id]['provider'] = isset($definition['provider']) ? $definition['provider'] : 'views';
-      }
     }
 
     $this->displayHandlers->get($display_id)->setOption($types[$type]['plural'], $fields);

core/modules/views/src/ViewsData.php

@@ -7,6 +7,7 @@
 
 namespace Drupal\views;
 
+use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
@@ -230,7 +231,18 @@ class ViewsData {
       return $data->data;
     }
     else {
-      $data = $this->moduleHandler->invokeAll('views_data');
+      $modules = $this->moduleHandler->getImplementations('views_data');
+      $data = [];
+      foreach ($modules as $module) {
+        $views_data = $this->moduleHandler->invoke($module, 'views_data');
+        // Set the provider key for each base table.
+        foreach ($views_data as &$table) {
+          if (isset($table['table']) && !isset($table['table']['provider'])) {
+            $table['table']['provider'] = $module;
+          }
+        }
+        $data = NestedArray::mergeDeep($data, $views_data);
+      }
       $this->moduleHandler->alter('views_data', $data);
 
       $this->processEntityTypes($data);

core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml

@@ -17,7 +17,6 @@ display:
             format: default_summary
           table: entity_test
           plugin_id: string
-          provider: views
       cache:
         type: none
       exposed_form:
@@ -39,7 +38,6 @@ display:
           link_to_node: '0'
           table: entity_test
           plugin_id: numeric
-          provider: views
       group_by: '1'
       pager:
         type: some

core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml

@@ -17,21 +17,18 @@ display:
           relationship: none
           table: views_test_data
           plugin_id: numeric
-          provider: views_test_data
         id:
           field: id
           id: id
           relationship: none
           table: views_test_data
           plugin_id: numeric
-          provider: views_test_data
         name:
           field: name
           id: name
           relationship: none
           table: views_test_data
           plugin_id: string
-          provider: views_test_data
       pager:
         options:
           offset: '0'
@@ -46,7 +43,6 @@ display:
           relationship: none
           table: views_test_data
           plugin_id: numeric
-          provider: views_test_data
       use_ajax: 1
     display_plugin: default
     display_title: Master

core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml

@@ -32,7 +32,6 @@ display:
           overwrite_anonymous: '0'
           table: users_field_data
           plugin_id: user_name
-          provider: user
       filters:
         uid_raw:
           admin_label: ''
@@ -73,7 +72,6 @@ display:
             min: ''
             value: '1'
           plugin_id: numeric
-          provider: views
       pager:
         type: full
       query:

core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml

@@ -17,7 +17,6 @@ display:
           relationship: none
           table: views_test_data
           plugin_id: numeric
-          provider: views_test_data
       pager:
         options:
           offset: '0'
@@ -31,7 +30,6 @@ display:
           relationship: none
           table: views_test_data
           plugin_id: numeric
-          provider: views_test_data
       empty:
         title:
           field: title
@@ -39,7 +37,6 @@ display:
           table: views
           plugin_id: title
           title: test_title_empty
-          provider: views
     display_plugin: default
     display_title: Master
     id: default
@@ -56,7 +53,6 @@ display:
           table: views
           plugin_id: title
           title: test_title_header
-          provider: views
     display_plugin: page
     display_title: 'Page 1'
     id: page_1

core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml

@@ -17,7 +17,6 @@ display:
           relationship: none
           table: views_test_data
           plugin_id: numeric
-          provider: views_test_data
       pager:
         options:
           offset: '0'
@@ -31,7 +30,6 @@ display:
           relationship: none
           table: views_test_data
           plugin_id: numeric
-          provider: views_test_data
       header:
         view:
           field: view
@@ -40,7 +38,6 @@ display:
           view_to_insert: test_simple_argument:default
           inherit_arguments: 1
           plugin_id: view
-          provider: views
     display_plugin: default
     display_title: Master
     id: default

core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml

@@ -16,7 +16,6 @@ display:
           id: date_fulldate
           table: views_test_data
           plugin_id: date_fulldate
-          provider: views_test_data
       fields:
         id:
           field: id
@@ -24,7 +23,6 @@ display:
           relationship: none
           table: views_test_data
           plugin_id: numeric
-          provider: views_test_data
       pager:
         options:
           offset: '0'
@@ -38,7 +36,6 @@ display:
           relationship: none
           table: views_test_data
           plugin_id: numeric
-          provider: views_test_data
     display_plugin: default
     display_title: Master
     id: default
@@ -53,7 +50,6 @@ display:
           id: date_day
           table: views_test_data
           plugin_id: date_day
-          provider: views_test_data
     display_plugin: embed
     id: embed_1
   embed_2:
@@ -66,7 +62,6 @@ display:
           id: date_month
           table: views_test_data
           plugin_id: date_month
-          provider: views_test_data
     display_plugin: embed
     id: embed_2
   embed_3:
@@ -79,7 +74,6 @@ display:
           id: date_week
           table: views_test_data
           plugin_id: date_week
-          provider: views_test_data
     display_plugin: embed
     id: embed_3
   embed_4:
@@ -92,7 +86,6 @@ display:
           id: date_year
           table: views_test_data
           plugin_id: date_year
-          provider: views_test_data
     display_plugin: embed
     id: embed_4
   embed_5:
@@ -105,7 +98,6 @@ display:
           id: date_year_month
           table: views_test_data
           plugin_id: date_year_month
-          provider: views_test_data
     display_plugin: embed
     id: embed_5
 label: ''

core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml

@@ -14,7 +14,6 @@ display:
           id: uid
           table: node_field_data
           plugin_id: numeric
-          provider: views
       cache:
         type: none
       exposed_form:
@@ -36,7 +35,6 @@ display:
           link_to_node: '0'
           table: node_field_data
           plugin_id: node
-          provider: node
       pager:
         options:
           id: '0'

core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml

@@ -17,7 +17,6 @@ display:
           style_plugin: default_summary
           table: views
           plugin_id: 'null'
-          provider: views
       cache:
         type: none
       exposed_form:
@@ -39,7 +38,6 @@ display:
           link_to_node: '0'
           table: node_field_data
           plugin_id: node
-          provider: node
       pager:
         options:
           id: '0'

core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml

@@ -25,7 +25,6 @@ display:
           table: views_test_data
           field: id
           plugin_id: numeric
-          provider: views_test_data
     display_plugin: default
     display_title: Master
     id: default

core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml

@@ -15,19 +15,16 @@ display:
           table: views_test_data
           field: id
           relationship: none
-          provider: views_test_data
         name:
           id: name
           table: views_test_data
           field: name
           relationship: none
-          provider: views_test_data
         age:
           id: age
           table: views_test_data
           field: age
           relationship: none
-          provider: views_test_data
       defaults:
         fields: '0'
         sorts: '0'
@@ -38,7 +35,6 @@ display:
           table: views_test_data
           field: id
           relationship: none
-          provider: views_test_data
 label: ''
 id: test_cache
 tag: ''

core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml

@@ -12,21 +12,18 @@ display:
           field: id
           label: ID
           plugin_id: numeric
-          provider: views_test_data
         name:
           id: name
           table: views_test_data
           field: name
           label: Name
           plugin_id: string
-          provider: views_test_data
         created:
           id: created
           table: views_test_data
           field: created
           label: created
           plugin_id: date
-          provider: views_test_data
       display_options:
         access:
           type: none

core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml

@@ -37,7 +37,6 @@ display:
           style_plugin: default_summary
           table: node_field_data
           plugin_id: date_day
-          provider: views
         created_fulldate:
           default_argument_type: fixed
           field: created_fulldate
@@ -45,7 +44,6 @@ display:
           style_plugin: default_summary
           table: node_field_data
           plugin_id: date_fulldate
-          provider: views
         created_month:
           default_argument_type: fixed
           field: created_month
@@ -53,7 +51,6 @@ display:
           style_plugin: default_summary
           table: node_field_data
           plugin_id: date_month
-          provider: views
       cache:
         type: none
       empty:
@@ -63,14 +60,12 @@ display:
           id: area
           table: views
           plugin_id: text
-          provider: views
         area_1:
           empty: '0'
           field: area
           id: area_1
           table: views
           plugin_id: text
-          provider: views
       exposed_form:
         type: basic
       fields:
@@ -79,38 +74,32 @@ display:
           id: created
           table: node_field_data
           plugin_id: date
-          provider: views
         nid:
           field: nid
           id: nid
           table: node
           plugin_id: node
-          provider: node
         path:
           field: path
           id: path
           table: node
           plugin_id: node_path
-          provider: node
       filters:
         nid:
           field: nid
           id: nid
           table: node
           plugin_id: numeric
-          provider: views
         status:
           field: status
           id: status
           table: node_field_data
           plugin_id: boolean
-          provider: views
         title:
           field: title
           id: title
           table: node_field_data
           plugin_id: string
-          provider: views
       footer:
         area:
           empty: '0'
@@ -118,14 +107,12 @@ display:
           id: area
           table: views
           plugin_id: text
-          provider: views
         area_1:
           empty: '0'
           field: area
           id: area_1
           table: views
           plugin_id: text
-          provider: views
       header:
         area:
           empty: '0'
@@ -133,14 +120,12 @@ display:
           id: area
           table: views
           plugin_id: text
-          provider: views
         area_1:
           empty: '0'
           field: area
           id: area_1
           table: views
           plugin_id: text
-          provider: views
       pager:
         type: full
       query:
@@ -151,34 +136,29 @@ display:
           id: comment_cid
           table: node
           plugin_id: standard
-          provider: views
         pid:
           field: pid
           id: pid
           table: comment_field_data
           relationship: comment_cid
           plugin_id: standard
-          provider: views
         uid:
           field: uid
           id: uid
           table: comment_field_data
           relationship: comment_cid
           plugin_id: standard
-          provider: views
       sorts:
         last_comment_name:
           field: last_comment_name
           id: last_comment_name
           table: comment_entity_statistics
           plugin_id: comment_ces_last_comment_name
-          provider: comment
         last_comment_timestamp:
           field: last_comment_timestamp
           id: last_comment_timestamp
           table: comment_entity_statistics
           plugin_id: date
-          provider: views
       style:
         type: default
       row:

core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml

@@ -32,7 +32,6 @@ display:
     display_title: Block
     id: block_1
     position: 2
-    provider: views
   default:
     display_options:
       access:
@@ -47,7 +46,6 @@ display:
           id: title
           table: node_field_data
           plugin_id: node
-          provider: node
       filters:
         status:
           field: status
@@ -56,7 +54,6 @@ display:
           table: node_field_data
           value: '1'
           plugin_id: boolean
-          provider: views
       pager:
         options:
           items_per_page: '10'
@@ -75,7 +72,6 @@ display:
           order: DESC
           table: node_field_data
           plugin_id: date
-          provider: views
       style_plugin: default
       title: 'Test Display'
     display_plugin: default