renamed plugin_id to id

help/api-example.html

@@ -73,14 +73,14 @@ function node_example_views_data()  {
     'title' => t('Quantity'),
     'help' => t('Quantity of items.'),
     'field' => array(
-      'plugin_id' => 'numeric',
+      'id' => 'numeric',
       'click sortable' => TRUE,
      ),
     'filter' => array(
-      'plugin_id' => 'numeric',
+      'id' => 'numeric',
     ),
     'sort' => array(
-      'plugin_id' => 'standard',
+      'id' => 'standard',
     ),
   );
 
@@ -90,17 +90,17 @@ function node_example_views_data()  {
     'help' => t('Color of item.'),
 
     'field' => array(
-      'plugin_id' => 'standard',
+      'id' => 'standard',
       'click sortable' => TRUE,
      ),
      'filter' => array(
-      'plugin_id' => 'string',
+      'id' => 'string',
      ),
      'argument' => array(
-       'plugin_id' => 'string',
+       'id' => 'string',
      ),
      'sort' => array(
-      'plugin_id' => 'standard',
+      'id' => 'standard',
      ),
   );
 

includes/admin.inc

@@ -706,9 +706,9 @@ function views_ui_nojs_submit($form, &$form_state) {
 function views_ui_wizard_form_validate($form, &$form_state) {
   $wizard = views_ui_get_wizard($form_state['values']['show']['wizard_key']);
   $manager = new ViewsPluginManager('wizard');
-  $definition = $manager->getDefinition($wizard['plugin_id']);
+  $definition = $manager->getDefinition($wizard['id']);
   $form_state['wizard'] = $wizard;
-  $form_state['wizard_instance'] = $manager->createInstance($wizard['plugin_id'], $definition);
+  $form_state['wizard_instance'] = $manager->createInstance($wizard['id'], $definition);
   $errors = $form_state['wizard_instance']->validate($form, $form_state);
   foreach ($errors as $name => $message) {
     form_set_error($name, $message);

includes/cache.inc

@@ -88,8 +88,8 @@ function _views_data_process_entity_types(&$data) {
 /**
  * Fetch the plugin data from cache.
  */
-function _views_fetch_plugin_data($type = NULL, $plugin_id = NULL, $reset = FALSE) {
-  if (!$type && !$plugin_id) {
+function _views_fetch_plugin_data($type = NULL, $id = NULL, $reset = FALSE) {
+  if (!$type && !$id) {
     $plugins = array();
     $plugin_types = array('access', 'argument', 'argument_default', 'argument_validator', 'cache', 'display_extender', 'display', 'exposed_form', 'localization', 'pager', 'query', 'row', 'style', 'wizard');
     foreach ($plugin_types as $plugin_type) {
@@ -101,11 +101,11 @@ function _views_fetch_plugin_data($type = NULL, $plugin_id = NULL, $reset = FALS
 
   $manager = new ViewsPluginManager($type);
 
-  if (!$plugin_id) {
+  if (!$id) {
     return $manager->getDefinitions();
   }
   else {
-    return $manager->getDefinition($plugin_id);
+    return $manager->getDefinition($id);
   }
 }
 

includes/handlers.inc

@@ -16,11 +16,11 @@ use Drupal\views\Plugin\Type\ViewsPluginManager;
  */
 function _views_create_plugin($type, $definition) {
   $manager = new ViewsPluginManager($type);
-  $instance = $manager->createInstance($definition['plugin_id']);
+  $instance = $manager->createInstance($definition['id']);
 
   $instance->is_plugin = TRUE;
   $instance->plugin_type = $type;
-  $instance->plugin_name = $definition['plugin_id'];
+  $instance->plugin_name = $definition['id'];
 
   $instance->set_definition($definition);
 
@@ -35,7 +35,7 @@ function _views_create_plugin($type, $definition) {
  */
 function _views_create_handler($type, $definition) {
   $manager = new ViewsPluginManager($type);
-  $instance = $manager->createInstance($definition['plugin_id']);
+  $instance = $manager->createInstance($definition['id']);
 
   $instance->is_handler = TRUE;
   $instance->handler_type = $type;

lib/Drupal/views/Plugin/Discovery/ViewsDiscovery.php

@@ -44,7 +44,7 @@ class ViewsDiscovery extends AnnotatedClassDiscovery {
       }
 
       // merge the new data in
-      $definitions[$definition['plugin_id']] = $definition;
+      $definitions[$definition['id']] = $definition;
     }
 
     return $definitions;

lib/Drupal/views/Plugin/views/Plugin.php

@@ -11,9 +11,9 @@ use Drupal\views\ViewsObject;
 use Drupal\Component\Plugin\PluginBase;
 
 abstract class Plugin extends PluginBase {
-  public function __construct(array $configuration, $plugin_id) {
+  public function __construct(array $configuration, $id) {
     $this->configuration = $configuration;
-    $this->plugin_id = $plugin_id;
+    $this->id = $id;
   }
 
   /**

lib/Drupal/views/Plugin/views/access/None.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "none",
+ *   id = "none",
  *   title = @Translation("None"),
  *   help = @Translation("Will be available to all users."),
  *   help_topic = "access-none"

lib/Drupal/views/Plugin/views/access/Permission.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "permission",
+ *   id = "permission",
  *   title = @Translation("Permission"),
  *   help = @Translation("Access will be granted to users with the specified permission string."),
  *   help_topic = "access-perm",

lib/Drupal/views/Plugin/views/access/Role.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "role",
+ *   id = "role",
  *   title = @Translation("Role"),
  *   help = @Translation("Access will be granted to users with any of the specified roles."),
  *   help_topic = "access-role",

lib/Drupal/views/Plugin/views/area/Broken.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "broken"
+ *   id = "broken"
  * )
  */
 class Broken extends AreaPluginBase {

lib/Drupal/views/Plugin/views/area/Result.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "result"
+ *   id = "result"
  * )
  */
 class Result extends AreaPluginBase {

lib/Drupal/views/Plugin/views/area/Text.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "text"
+ *   id = "text"
  * )
  */
 class Text extends AreaPluginBase {

lib/Drupal/views/Plugin/views/area/TextCustom.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "text_custom"
+ *   id = "text_custom"
  * )
  */
 class TextCustom extends AreaPluginBase {

lib/Drupal/views/Plugin/views/area/View.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "view"
+ *   id = "view"
  * )
  */
 class View extends AreaPluginBase {

lib/Drupal/views/Plugin/views/argument/Broken.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "broken"
+ *   id = "broken"
  * )
  */
 class Broken extends ArgumentPluginBase {

lib/Drupal/views/Plugin/views/argument/Date.php

@@ -30,7 +30,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "date"
+ *   id = "date"
  * )
  */
 class Date extends ArgumentPluginBase {

lib/Drupal/views/Plugin/views/argument/Formula.php

@@ -22,7 +22,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "formula"
+ *   id = "formula"
  * )
  */
 class Formula extends ArgumentPluginBase {

lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "groupby_numeric"
+ *   id = "groupby_numeric"
  * )
  */
 class GroupByNumeric extends ArgumentPluginBase  {

lib/Drupal/views/Plugin/views/argument/ManyToOne.php

@@ -26,7 +26,7 @@ use Drupal\views\ManyToOneHelper;
 
 /**
  * @Plugin(
- *   plugin_id = "many_to_one"
+ *   id = "many_to_one"
  * )
  */
 class ManyToOne extends ArgumentPluginBase {

lib/Drupal/views/Plugin/views/argument/Null.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "null"
+ *   id = "null"
  * )
  */
 class Null extends ArgumentPluginBase {

lib/Drupal/views/Plugin/views/argument/Numeric.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "numeric"
+ *   id = "numeric"
  * )
  */
 class Numeric extends ArgumentPluginBase {

lib/Drupal/views/Plugin/views/argument/String.php

@@ -19,7 +19,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "string"
+ *   id = "string"
  * )
  */
 class String extends ArgumentPluginBase {

lib/Drupal/views/Plugin/views/argument_default/Fixed.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "fixed",
+ *   id = "fixed",
  *   title = @Translation("Fixed")
  * )
  */

lib/Drupal/views/Plugin/views/argument_default/Php.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "php",
+ *   id = "php",
  *   title = @Translation("PHP Code")
  * )
  */

lib/Drupal/views/Plugin/views/argument_default/Raw.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "raw",
+ *   id = "raw",
  *   title = @Translation("Raw value from URL")
  * )
  */

lib/Drupal/views/Plugin/views/argument_validator/Numeric.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "numeric",
+ *   id = "numeric",
  *   title = @Translation("Numeric")
  * )
  */

lib/Drupal/views/Plugin/views/argument_validator/Php.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "php",
+ *   id = "php",
  *   title = @Translation("PHP Code")
  * )
  */

lib/Drupal/views/Plugin/views/cache/None.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "none",
+ *   id = "none",
  *   title = @Translation("None"),
  *   help = @Translation("No caching of Views data."),
  *   help_topic = "cache-none"

lib/Drupal/views/Plugin/views/cache/Time.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "time",
+ *   id = "time",
  *   title = @Translation("Time-based"),
  *   help = @Translation("Simple time-based caching of data."),
  *   help_topic = "cache-time",

lib/Drupal/views/Plugin/views/display/Attachment.php

@@ -22,7 +22,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "attachment",
+ *   id = "attachment",
  *   title = @Translation("Attachment"),
  *   help = @Translation("Attachments added to other displays to achieve multiple views in the same view."),
  *   theme = "views_view",

lib/Drupal/views/Plugin/views/display/Block.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "block",
+ *   id = "block",
  *   title = @Translation("Block"),
  *   help = @Translation("Display the view as a block."),
  *   theme = "views_view",

lib/Drupal/views/Plugin/views/display/DefaultDisplay.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "default",
+ *   id = "default",
  *   title = @Translation("Master"),
  *   help = @Translation("Default settings for this view."),
  *   theme = "views_view",

lib/Drupal/views/Plugin/views/display/Embed.php

@@ -21,7 +21,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "embed",
+ *   id = "embed",
  *   title = @Translation("Embed"),
  *   help = @Translation("Provide a display which can be embedded using the views api."),
  *   theme = "views_view",

lib/Drupal/views/Plugin/views/display/Feed.php

@@ -21,7 +21,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "feed",
+ *   id = "feed",
  *   title = @Translation("Feed"),
  *   help = @Translation("Display the view as a feed, such as an RSS feed."),
  *   uses_hook_menu = TRUE,

lib/Drupal/views/Plugin/views/display/Page.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "page",
+ *   id = "page",
  *   title = @Translation("Page"),
  *   help = @Translation("Display the view as a page, with a URL and menu links."),
  *   uses_hook_menu = TRUE,

lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php

@@ -11,7 +11,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "default",
+ *   id = "default",
  *   title = @Translation("Empty display extender"),
  *   help = @Translation("Default settings for this view."),
  *   enabled = FALSE,

lib/Drupal/views/Plugin/views/exposed_form/Basic.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "basic",
+ *   id = "basic",
  *   title = @Translation("Basic"),
  *   help = @Translation("Basic exposed form"),
  *   uses_options = TRUE,

lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "input_required",
+ *   id = "input_required",
  *   title = @Translation("Input required"),
  *   help = @Translation("An exposed form that only renders a view if the form contains user input."),
  *   uses_options = TRUE,

lib/Drupal/views/Plugin/views/field/Boolean.php

@@ -27,7 +27,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "boolean"
+ *   id = "boolean"
  * )
  */
 class Boolean extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/Broken.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "broken"
+ *   id = "broken"
  * )
  */
 class Broken extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/ContextualLinks.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "contextual_links"
+ *   id = "contextual_links"
  * )
  */
 class ContextualLinks extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/Counter.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "counter"
+ *   id = "counter"
  * )
  */
 class Counter extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/Custom.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "custom"
+ *   id = "custom"
  * )
  */
 class Custom extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/Date.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "date"
+ *   id = "date"
  * )
  */
 class Date extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/Entity.php

@@ -23,7 +23,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "entity"
+ *   id = "entity"
  * )
  */
 class Entity extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/FieldPluginBase.php

@@ -50,7 +50,7 @@ define('VIEWS_HANDLER_RENDER_TEXT_PHASE_EMPTY', 2);
 
 /**
  * @plugin(
- *   plugin_id = "standard"
+ *   id = "standard"
  * )
  */
 class FieldPluginBase extends Handler {

lib/Drupal/views/Plugin/views/field/FileSize.php

@@ -15,7 +15,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "file_size"
+ *   id = "file_size"
  * )
  */
 class FileSize extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/MachineName.php

@@ -20,7 +20,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "machine_name"
+ *   id = "machine_name"
  * )
  */
 class MachineName extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/Markup.php

@@ -23,7 +23,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "markup"
+ *   id = "markup"
  * )
  */
 class Markup extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/Math.php

@@ -21,7 +21,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "math"
+ *   id = "math"
  * )
  */
 class Math extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/Numeric.php

@@ -21,7 +21,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "numeric"
+ *   id = "numeric"
  * )
  */
 class Numeric extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/PrerenderList.php

@@ -22,7 +22,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "prerender_list"
+ *   id = "prerender_list"
  * )
  */
 class PrerenderList extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/Serialized.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "serialized"
+ *   id = "serialized"
  * )
  */
 class Serialized extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/TimeInterval.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "time_interval"
+ *   id = "time_interval"
  * )
  */
 class TimeInterval extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/Url.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "url"
+ *   id = "url"
  * )
  */
 class Url extends FieldPluginBase {

lib/Drupal/views/Plugin/views/field/Xss.php

@@ -16,7 +16,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "xss"
+ *   id = "xss"
  * )
  */
 class Xss extends FieldPluginBase {

lib/Drupal/views/Plugin/views/filter/BooleanOperator.php

@@ -28,7 +28,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "boolean"
+ *   id = "boolean"
  * )
  */
 class BooleanOperator extends FilterPluginBase {

lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php

@@ -23,7 +23,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "boolean_string"
+ *   id = "boolean_string"
  * )
  */
 class BooleanOperatorString extends BooleanOperator {

lib/Drupal/views/Plugin/views/filter/Broken.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "broken"
+ *   id = "broken"
  * )
  */
 class Broken extends FilterPluginBase {

lib/Drupal/views/Plugin/views/filter/Combine.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "combine"
+ *   id = "combine"
  * )
  */
 class Combine extends String {

lib/Drupal/views/Plugin/views/filter/Date.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "date"
+ *   id = "date"
  * )
  */
 class Date extends Numeric {

lib/Drupal/views/Plugin/views/filter/Equality.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "equality"
+ *   id = "equality"
  * )
  */
 class Equality extends FilterPluginBase {

lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php

@@ -39,7 +39,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "standard"
+ *   id = "standard"
  * )
  */
 class FilterPluginBase extends Handler {

lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "groupby_numeric"
+ *   id = "groupby_numeric"
  * )
  */
 class GroupByNumeric extends Numeric {

lib/Drupal/views/Plugin/views/filter/InOperator.php

@@ -21,7 +21,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "in_operator"
+ *   id = "in_operator"
  * )
  */
 class InOperator extends FilterPluginBase {

lib/Drupal/views/Plugin/views/filter/ManyToOne.php

@@ -23,7 +23,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "many_to_one"
+ *   id = "many_to_one"
  * )
  */
 class ManyToOne extends InOperator {

lib/Drupal/views/Plugin/views/filter/Numeric.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "numeric"
+ *   id = "numeric"
  * )
  */
 class Numeric extends FilterPluginBase {

lib/Drupal/views/Plugin/views/filter/String.php

@@ -19,7 +19,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "string"
+ *   id = "string"
  * )
  */
 class String extends FilterPluginBase {

lib/Drupal/views/Plugin/views/localization/Core.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "core",
+ *   id = "core",
  *   title = @Translation("Core"),
  *   help = @Translation("Use Drupal core t() function. Not recommended, as it doesn't support updates to existing strings."),
  *   help_topic = "localization-core"

lib/Drupal/views/Plugin/views/localization/None.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "none",
+ *   id = "none",
  *   title = @Translation("None"),
  *   help = @Translation("Do not pass admin strings for translation."),
  *   help_topic = "localization-none"

lib/Drupal/views/Plugin/views/pager/Full.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "full",
+ *   id = "full",
  *   title = @Translation("Paged output, full pager"),
  *   short_title = @Translation("Full"),
  *   help = @Translation("Paged output, full Drupal style"),

lib/Drupal/views/Plugin/views/pager/Mini.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "mini",
+ *   id = "mini",
  *   title = @Translation("Paged output, mini pager"),
  *   short_title = @Translation("Mini"),
  *   help = @Translation("Use the mini pager output."),

lib/Drupal/views/Plugin/views/pager/None.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "none",
+ *   id = "none",
  *   title = @Translation("Display all items"),
  *   help = @Translation("Display all items that this view might find."),
  *   help_topic = "pager-none",

lib/Drupal/views/Plugin/views/pager/Some.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "some",
+ *   id = "some",
  *   title = @Translation("Display a specified number of items"),
  *   help = @Translation("Display a limited number items that this view might find."),
  *   help_topic = "pager-some",

lib/Drupal/views/Plugin/views/query/Sql.php

@@ -15,7 +15,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "views_query",
+ *   id = "views_query",
  *   title = @Translation("SQL Query"),
  *   help = @Translation("Query will be generated and run using the Drupal database API.")
  * )

lib/Drupal/views/Plugin/views/relationship/Broken.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "broken"
+ *   id = "broken"
  * )
  */
 class Broken extends RelationshipPluginBase {

lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php

@@ -63,7 +63,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @plugin(
- *   plugin_id = "groupwise_max"
+ *   id = "groupwise_max"
  * )
  */
 class GroupwiseMax extends RelationshipPluginBase {

lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php

@@ -44,7 +44,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "standard"
+ *   id = "standard"
  * )
  */
 class RelationshipPluginBase extends Handler {

lib/Drupal/views/Plugin/views/row/Fields.php

@@ -21,7 +21,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "fields",
+ *   id = "fields",
  *   title = @Translation("Fields"),
  *   help = @Translation("Displays the fields with an optional template."),
  *   theme = "views_view_fields",

lib/Drupal/views/Plugin/views/row/RssFields.php

@@ -16,7 +16,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "rss_fields",
+ *   id = "rss_fields",
  *   title = @Translation("Fields"),
  *   help = @Translation("Display fields as RSS items."),
  *   theme = "views_view_row_rss",

lib/Drupal/views/Plugin/views/sort/Broken.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "broken"
+ *   id = "broken"
  * )
  */
 class Broken extends SortPluginBase {

lib/Drupal/views/Plugin/views/sort/Date.php

@@ -16,7 +16,7 @@ use Drupal\Core\Annotation\Plugin;
  * equivalent based upon nearness.
  *
  * @Plugin(
- *   plugin_id = "date"
+ *   id = "date"
  * )
  *
  */

lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php

@@ -13,7 +13,7 @@ use Drupal\Core\Annotation\Plugin;
  * Handler for GROUP BY on simple numeric fields.
  *
  * @Plugin(
- *   plugin_id = "groupby_numeric"
+ *   id = "groupby_numeric"
  * )
  */
 class GroupByNumeric extends SortPluginBase {

lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php

@@ -21,7 +21,7 @@ use Drupal\Core\Annotation\Plugin;
  * This is only really useful for the {menu_links} table.
  *
  * @Plugin(
- *   plugin_id = "menu_hierarchy"
+ *   id = "menu_hierarchy"
  * )
  */
 class MenuHierarchy extends SortPluginBase {

lib/Drupal/views/Plugin/views/sort/Random.php

@@ -13,7 +13,7 @@ use Drupal\Core\Annotation\Plugin;
  * Handle a random sort.
  *
  * @Plugin(
- *   plugin_id = "random"
+ *   id = "random"
  * )
  */
 class Random extends SortPluginBase {

lib/Drupal/views/Plugin/views/sort/SortPluginBase.php

@@ -25,7 +25,7 @@ use Drupal\Core\Annotation\Plugin;
 
 /**
  * @Plugin(
- *   plugin_id = "standard"
+ *   id = "standard"
  * )
  */
 class SortPluginBase extends Handler {

lib/Drupal/views/Plugin/views/style/DefaultStyle.php

@@ -19,7 +19,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "default",
+ *   id = "default",
  *   title = @Translation("Unformatted list"),
  *   help = @Translation("Displays rows one after another."),
  *   theme = "views_view_unformatted",

lib/Drupal/views/Plugin/views/style/DefaultSummary.php

@@ -19,7 +19,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "default_summary",
+ *   id = "default_summary",
  *   title = @Translation("List"),
  *   help = @Translation("Displays the default summary as a list."),
  *   theme = "views_view_summary",

lib/Drupal/views/Plugin/views/style/Grid.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "grid",
+ *   id = "grid",
  *   title = @Translation("Grid"),
  *   help = @Translation("Displays rows in a grid."),
  *   theme = "views_view_grid",

lib/Drupal/views/Plugin/views/style/HtmlList.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "html_list",
+ *   id = "html_list",
  *   title = @Translation("HTML List"),
  *   help = @Translation("Displays rows as HTML list."),
  *   theme = "views_view_list",

lib/Drupal/views/Plugin/views/style/JumpMenu.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "jump_menu",
+ *   id = "jump_menu",
  *   title = @Translation("Jump menu"),
  *   help = @Translation("Puts all of the results into a select box and allows the user to go to a different page based upon the results."),
  *   theme = "views_view_jump_menu",

lib/Drupal/views/Plugin/views/style/JumpMenuSummary.php

@@ -17,7 +17,7 @@ use Drupal\Core\Annotation\Translation;
  */
 /**
  * @Plugin(
- *   plugin_id = "jump_menu_summary",
+ *   id = "jump_menu_summary",
  *   title = @Translation("Jump menu"),
  *   help = @Translation("Puts all of the results into a select box and allows the user to go to a different page based upon the results."),
  *   theme = "views_view_summary_jump_menu",

lib/Drupal/views/Plugin/views/style/Rss.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "rss",
+ *   id = "rss",
  *   title = @Translation("RSS Feed"),
  *   help = @Translation("Generates an RSS feed from a view."),
  *   theme = "views_view_rss",

lib/Drupal/views/Plugin/views/style/Table.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "table",
+ *   id = "table",
  *   title = @Translation("Table"),
  *   help = @Translation("Displays rows in a table."),
  *   theme = "views_view_table",

lib/Drupal/views/Plugin/views/style/UnformattedSummary.php

@@ -18,7 +18,7 @@ use Drupal\Core\Annotation\Translation;
 
 /**
  * @Plugin(
- *   plugin_id = "unformatted_summary",
+ *   id = "unformatted_summary",
  *   title = @Translation("Unformatted"),
  *   help = @Translation("Displays the summary unformatted, with option for one after another or inline."),
  *   theme = "views_view_summary_unformatted",

lib/Drupal/views/Plugin/views/wizard/Comment.php

@@ -19,7 +19,7 @@ use Drupal\Core\Annotation\Translation;
  * Tests creating comment views with the wizard.
  *
  * @Plugin(
- *   plugin_id = "comment",
+ *   id = "comment",
  *   base_table = "comment",
  *   created_column = "created",
  *   title = @Translation("Comments"),

lib/Drupal/views/Plugin/views/wizard/File.php

@@ -15,7 +15,7 @@ use Drupal\Core\Annotation\Translation;
  * Tests creating managed files views with the wizard.
  *
  * @Plugin(
- *   plugin_id = "file_managed",
+ *   id = "file_managed",
  *   base_table = "file_managed",
  *   created_column = "timestamp",
  *   title = @Translation("Files"),

lib/Drupal/views/Plugin/views/wizard/Node.php

@@ -19,7 +19,7 @@ use Drupal\Core\Annotation\Translation;
  * Tests creating node views with the wizard.
  *
  * @Plugin(
- *   plugin_id = "node",
+ *   id = "node",
  *   base_table = "node",
  *   created_column = "created",
  *   title = @Translation("Content"),

lib/Drupal/views/Plugin/views/wizard/NodeRevision.php

@@ -19,7 +19,7 @@ use Drupal\Core\Annotation\Translation;
  * Tests creating node revision views with the wizard.
  *
  * @Plugin(
- *   plugin_id = "node_revision",
+ *   id = "node_revision",
  *   base_table = "node_revision",
  *   created_column = "timestamp",
  *   title = @Translation("Content revisions"),

lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php

@@ -15,7 +15,7 @@ use Drupal\Core\Annotation\Translation;
  * Tests creating taxonomy views with the wizard.
  *
  * @Plugin(
- *   plugin_id = "taxonomy_term",
+ *   id = "taxonomy_term",
  *   base_table = "taxonomy_term_data",
  *   title = @Translation("Taxonomy terms"),
  *   path_field = {