Issue #2070609 by damiankloip, tstoeckler: Remove obsolete 'module' keys from...

Issue #2070609 by damiankloip, tstoeckler: Remove obsolete 'module' keys from Views plugin annotations.

core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php

@@ -18,7 +18,6 @@
  *
  * @ViewsArgumentValidator(
  *   id = "taxonomy_term",
- *   module = "taxonomy",
  *   title = @Translation("Taxonomy term")
  *   )
  */

core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php

@@ -16,7 +16,6 @@
  *
  * @ViewsWizard(
  *   id = "taxonomy_term",
- *   module = "taxonomy",
  *   base_table = "taxonomy_term_data",
  *   title = @Translation("Taxonomy terms")
  * )

core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php

@@ -18,7 +18,6 @@
  *
  * @ViewsArgumentDefault(
  *   id = "current_user",
- *   module = "user",
  *   title = @Translation("User ID from logged in user")
  * )
  */

core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php

@@ -17,7 +17,6 @@
  *
  * @ViewsArgumentDefault(
  *   id = "user",
- *   module = "user",
  *   title = @Translation("User ID from URL")
  * )
  */

core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php

@@ -22,7 +22,6 @@
  *
  * @ViewsArgumentValidator(
  *   id = "user",
- *   module = "user",
  *   title = @Translation("User")
  * )
  */

core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php

@@ -20,7 +20,6 @@
  *
  * @ViewsWizard(
  *   id = "users",
- *   module = "user",
  *   base_table = "users",
  *   title = @Translation("Users")
  * )

core/modules/user/user.views.inc

@@ -384,5 +384,5 @@ function user_views_data() {
  */
 function user_views_plugins_row_alter(array &$plugins) {
   $plugins['entity:user']['class'] = 'Drupal\user\Plugin\views\row\UserRow';
-  $plugins['entity:user']['module'] = 'user';
+  $plugins['entity:user']['provider'] = 'user';
 }

core/modules/views/lib/Drupal/views/Annotation/ViewsPluginAnnotationBase.php

@@ -15,13 +15,6 @@
  */
 abstract class ViewsPluginAnnotationBase extends Plugin implements AnnotationInterface {
 
-  /**
-   * The module the plugin is defined by.
-   *
-   * @var string
-   */
-  public $module = 'views';
-
   /**
    * A class to make the plugin derivative aware.
    *

core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php

@@ -96,7 +96,7 @@ public function getDerivativeDefinitions(array $base_plugin_definition) {
       if (isset($entity_info['base_table']) && $this->viewsData->get($entity_info['base_table']) && $this->entityManager->hasController($entity_type, 'render')) {
         $this->derivatives[$entity_type] = array(
           'id' => 'entity:' . $entity_type,
-          'module' => 'views',
+          'provider' => 'views',
           'title' => $entity_info['label'],
           'help' => t('Display the @label', array('@label' => $entity_info['label'])),
           'base' => array($entity_info['base_table']),

core/modules/views/lib/Drupal/views/Plugin/ViewsPluginManager.php

@@ -41,7 +41,6 @@ public function __construct($type, \Traversable $namespaces, CacheBackendInterfa
     $this->defaults += array(
       'parent' => 'parent',
       'plugin_type' => $type,
-      'module' => 'views',
       'register_theme' => TRUE,
     );
 

core/modules/views/lib/Drupal/views/Tests/ModuleTest.php

@@ -11,6 +11,7 @@
  * Tests basic functions from the Views module.
  */
 use Drupal\views\Plugin\views\filter\Standard;
+use Drupal\Component\Utility\String;
 
 class ModuleTest extends ViewUnitTestBase {
 
@@ -19,7 +20,7 @@ class ModuleTest extends ViewUnitTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view_status');
+  public static $testViews = array('test_view_status', 'test_view');
 
   /**
    * Stores the last triggered error, for example via debug().
@@ -254,6 +255,26 @@ public function testViewsFetchPluginNames() {
     $this->assertIdentical($plugins, array());
   }
 
+  /**
+   * Tests the views_plugin_list() function.
+   */
+  public function testViewsPluginList() {
+    $plugin_list = views_plugin_list();
+    // Only plugins used by 'test_view' should be in the plugin list.
+    foreach (array('display:default', 'pager:none') as $key) {
+      list($plugin_type, $plugin_id) = explode(':', $key);
+      $plugin_def = $this->container->get("plugin.manager.views.$plugin_type")->getDefinition($plugin_id);
+
+      $this->assertTrue(isset($plugin_list[$key]), String::format('The expected @key plugin list key was found.', array('@key' => $key)));
+      $plugin_details = $plugin_list[$key];
+
+      $this->assertEqual($plugin_details['type'], $plugin_type, 'The expected plugin type was found.');
+      $this->assertEqual($plugin_details['title'], $plugin_def['title'], 'The expected plugin title was found.');
+      $this->assertEqual($plugin_details['provider'], $plugin_def['provider'], 'The expected plugin provider was found.');
+      $this->assertTrue(in_array('test_view', $plugin_details['views']), 'The test_view View was found in the list of views using this plugin.');
+    }
+  }
+
   /**
    * Helper to return an expected views option array.
    *

core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php

@@ -21,7 +21,6 @@
  *   title = @Translation("Test row plugin"),
  *   help = @Translation("Provides a generic row test plugin."),
  *   theme = "views_view_row_test",
- *   module = "views_test_data",
  *   display_types = {"normal", "test"}
  * )
  */

core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php

@@ -22,7 +22,6 @@
  *   title = @Translation("Field mapping"),
  *   help = @Translation("Maps specific fields to specific purposes."),
  *   theme = "views_view_mapping_test",
- *   module = "views_test_data",
  *   display_types = {"normal", "test"}
  * )
  */

core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTemplateTest.php

@@ -18,7 +18,6 @@
  *
  * @ViewsStyle(
  *   id = "test_template_style",
- *   module = "views_test_data",
  *   title = @Translation("Test style template plugin"),
  *   help = @Translation("Provides a generic style template test plugin."),
  *   theme = "views_view_style_template_test",

core/modules/views/views.module

@@ -234,7 +234,7 @@ function views_plugin_list() {
           $plugins[$key] = array(
             'type' => $type,
             'title' => check_plain($info[$name]['title']),
-            'module' => check_plain($info[$name]['module']),
+            'provider' => check_plain($info[$name]['provider']),
             'views' => array(),
           );
         }