diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php
index c9fe040..b174e29 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\aggregator\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides an 'Aggregator category' block for the latest items in a category.
*
- * @Plugin(
+ * @Block(
* id = "aggregator_category_block",
* admin_label = @Translation("Aggregator category"),
- * module = "aggregator",
* derivative = "Drupal\aggregator\Plugin\Derivative\AggregatorCategoryBlock"
* )
*/
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
index 4b002a2..ca75c64 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\aggregator\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides an 'Aggregator feed' block with the latest items from the feed.
*
- * @Plugin(
+ * @Block(
* id = "aggregator_feed_block",
* admin_label = @Translation("Aggregator feed"),
- * module = "aggregator",
* derivative = "Drupal\aggregator\Plugin\Derivative\AggregatorFeedBlock"
* )
*/
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php
index 0d17fa1..4014112 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\custom_block\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Defines a generic custom block type.
*
- * @Plugin(
+ * @Block(
* id = "custom_block",
* admin_label = @Translation("Custom block"),
- * module = "custom_block",
* derivative = "Drupal\custom_block\Plugin\Derivative\CustomBlock"
* )
*/
diff --git a/core/modules/block/lib/Drupal/block/Annotation/Block.php b/core/modules/block/lib/Drupal/block/Annotation/Block.php
new file mode 100644
index 0000000..62541ab
--- /dev/null
+++ b/core/modules/block/lib/Drupal/block/Annotation/Block.php
@@ -0,0 +1,35 @@
+ $namespaces['Drupal\block']);
+ parent::__construct('Plugin/Block', $namespaces, $annotation_namespaces, 'Drupal\block\Annotation\Block');
$this->alterInfo($module_handler, 'block');
$this->setCacheBackend($cache_backend, $language_manager, 'block_plugins');
}
@@ -48,6 +49,7 @@ public function processDefinition(&$definition, $plugin_id) {
// Ensure that every block has a category.
$definition += array(
+ 'module' => $definition['provider'],
'category' => $definition['provider'],
);
}
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
index 4c28638..96f60b2 100644
--- a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
+++ b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
@@ -8,16 +8,15 @@
namespace Drupal\block_test\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a basic block for testing block instantiation and configuration.
*
- * @Plugin(
+ * @Block(
* id = "test_block_instantiation",
- * admin_label = @Translation("Display message"),
- * module = "block_test"
+ * admin_label = @Translation("Display message")
* )
*/
class TestBlockInstantiation extends BlockBase {
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
index c83d668..847fb51 100644
--- a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
+++ b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\block_test\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a block to test caching.
*
- * @Plugin(
+ * @Block(
* id = "test_cache",
- * admin_label = @Translation("Test block caching"),
- * module = "block_test"
+ * admin_label = @Translation("Test block caching")
* )
*/
class TestCacheBlock extends BlockBase {
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php
index 82d1310..eeeacb0 100644
--- a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php
+++ b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php
@@ -7,17 +7,15 @@
namespace Drupal\block_test\Plugin\Block;
-use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a block to test HTML IDs.
*
- * @Plugin(
+ * @Block(
* id = "test_html_id",
- * admin_label = @Translation("Test block html id"),
- * module = "block_test"
+ * admin_label = @Translation("Test block html id")
* )
*/
class TestHtmlIdBlock extends TestCacheBlock {
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
index ea134df..a9f36bb 100644
--- a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
+++ b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
@@ -7,15 +7,14 @@
namespace Drupal\block_test\Plugin\Block;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
/**
* Provides a block to test XSS in title.
*
- * @Plugin(
+ * @Block(
* id = "test_xss_title",
- * admin_label = "",
- * module = "block_test"
+ * admin_label = ""
* )
*/
class TestXSSTitleBlock extends TestCacheBlock {
diff --git a/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php b/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php
index 8cacc04..887b7bd 100644
--- a/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php
+++ b/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\book\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a 'Book navigation' block.
*
- * @Plugin(
+ * @Block(
* id = "book_navigation",
- * admin_label = @Translation("Book navigation"),
- * module = "book"
+ * admin_label = @Translation("Book navigation")
* )
*/
class BookNavigationBlock extends BlockBase {
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php b/core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php
index cf442db..d133434 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\comment\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a 'Recent comments' block.
*
- * @Plugin(
+ * @Block(
* id = "recent_comments",
- * admin_label = @Translation("Recent comments"),
- * module = "comment"
+ * admin_label = @Translation("Recent comments")
* )
*/
class RecentCommentsBlock extends BlockBase {
diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php b/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php
index 176fa14..769aeb7 100644
--- a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php
+++ b/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php
@@ -7,16 +7,15 @@
namespace Drupal\forum\Plugin\Block;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides an 'Active forum topics' block.
*
- * @Plugin(
+ * @Block(
* id = "forum_active_block",
- * admin_label = @Translation("Active forum topics"),
- * module = "forum"
+ * admin_label = @Translation("Active forum topics")
* )
*/
class ActiveTopicsBlock extends ForumBlockBase {
diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php b/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php
index 02f4650..44622a1 100644
--- a/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php
+++ b/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php
@@ -7,16 +7,15 @@
namespace Drupal\forum\Plugin\Block;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a 'New forum topics' block.
*
- * @Plugin(
+ * @Block(
* id = "forum_new_block",
- * admin_label = @Translation("New forum topics"),
- * module = "forum"
+ * admin_label = @Translation("New forum topics")
* )
*/
class NewTopicsBlock extends ForumBlockBase {
diff --git a/core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php b/core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php
index fa8a249..5279dd6 100644
--- a/core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php
+++ b/core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\language\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a 'Language switcher' block.
*
- * @Plugin(
+ * @Block(
* id = "language_block",
* admin_label = @Translation("Language switcher"),
- * module = "language",
* derivative = "Drupal\language\Plugin\Derivative\LanguageBlock"
* )
*/
diff --git a/core/modules/menu/lib/Drupal/menu/Plugin/Block/MenuBlock.php b/core/modules/menu/lib/Drupal/menu/Plugin/Block/MenuBlock.php
index 0e83734..419617c 100644
--- a/core/modules/menu/lib/Drupal/menu/Plugin/Block/MenuBlock.php
+++ b/core/modules/menu/lib/Drupal/menu/Plugin/Block/MenuBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\menu\Plugin\Block;
use Drupal\system\Plugin\Block\SystemMenuBlock;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a generic Menu block.
*
- * @Plugin(
+ * @Block(
* id = "menu_menu_block",
* admin_label = @Translation("Menu"),
- * module = "menu",
* derivative = "Drupal\menu\Plugin\Derivative\MenuBlock"
* )
*/
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php b/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php
index 8144161..3d50cc2 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\node\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a 'Recent content' block.
*
- * @Plugin(
+ * @Block(
* id = "node_recent_block",
- * admin_label = @Translation("Recent content"),
- * module = "node"
+ * admin_label = @Translation("Recent content")
* )
*/
class RecentContentBlock extends BlockBase {
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php b/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php
index 1440a48..bca0889 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\node\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a 'Syndicate' block that links to the site's RSS feed.
*
- * @Plugin(
+ * @Block(
* id = "node_syndicate_block",
- * admin_label = @Translation("Syndicate"),
- * module = "node"
+ * admin_label = @Translation("Syndicate")
* )
*/
class SyndicateBlock extends BlockBase {
diff --git a/core/modules/search/lib/Drupal/search/Plugin/Block/SearchBlock.php b/core/modules/search/lib/Drupal/search/Plugin/Block/SearchBlock.php
index b692e5e..c977ba1 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/Block/SearchBlock.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/Block/SearchBlock.php
@@ -8,7 +8,7 @@
namespace Drupal\search\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\search\Form\SearchBlockForm;
@@ -18,10 +18,9 @@
/**
* Provides a 'Search form' block.
*
- * @Plugin(
+ * @Block(
* id = "search_form_block",
- * admin_label = @Translation("Search form"),
- * module = "search"
+ * admin_label = @Translation("Search form")
* )
*/
class SearchBlock extends BlockBase implements ContainerFactoryPluginInterface {
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php b/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php
index 5296971..e6c9bb4 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\shortcut\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a 'Shortcut' block.
*
- * @Plugin(
+ * @Block(
* id = "shortcuts",
- * admin_label = @Translation("Shortcuts"),
- * module = "shortcut"
+ * admin_label = @Translation("Shortcuts")
* )
*/
class ShortcutsBlock extends BlockBase {
diff --git a/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php b/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php
index d11412e..640ece1 100644
--- a/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php
+++ b/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\statistics\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a 'Popular content' block.
*
- * @Plugin(
+ * @Block(
* id = "statistics_popular_block",
- * admin_label = @Translation("Popular content"),
- * module = "statistics"
+ * admin_label = @Translation("Popular content")
* )
*/
class StatisticsPopularBlock extends BlockBase {
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemBreadcrumbBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemBreadcrumbBlock.php
index cb0b908..ec239a6 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemBreadcrumbBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemBreadcrumbBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\system\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a block to display the breadcrumbs.
*
- * @Plugin(
+ * @Block(
* id = "system_breadcrumb_block",
- * admin_label = @Translation("Breadcrumbs"),
- * module = "system"
+ * admin_label = @Translation("Breadcrumbs")
* )
*/
class SystemBreadcrumbBlock extends BlockBase {
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php
index c19a575..23520a3 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\system\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a 'System Help' block.
*
- * @Plugin(
+ * @Block(
* id = "system_help_block",
- * admin_label = @Translation("System Help"),
- * module = "system"
+ * admin_label = @Translation("System Help")
* )
*/
class SystemHelpBlock extends BlockBase {
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php
index 997d563..26d17f7 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\system\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a 'Main page content' block.
*
- * @Plugin(
+ * @Block(
* id = "system_main_block",
- * admin_label = @Translation("Main page content"),
- * module = "system"
+ * admin_label = @Translation("Main page content")
* )
*/
class SystemMainBlock extends BlockBase {
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
index 1daf4bf..e1f5b83 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\system\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a 'System Menu' block.
*
- * @Plugin(
+ * @Block(
* id = "system_menu_block",
* admin_label = @Translation("System Menu"),
- * module = "system",
* derivative = "Drupal\system\Plugin\Derivative\SystemMenuBlock"
* )
*/
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php
index 7edd34b..ececd37 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\system\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a 'Powered by Drupal' block.
*
- * @Plugin(
+ * @Block(
* id = "system_powered_by_block",
- * admin_label = @Translation("Powered by Drupal"),
- * module = "system"
+ * admin_label = @Translation("Powered by Drupal")
* )
*/
class SystemPoweredByBlock extends BlockBase {
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
index 00a9061..b3de132 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
@@ -8,21 +8,19 @@
namespace Drupal\user\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\user\Form\UserLoginForm;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
/**
* Provides a 'User login' block.
*
- * @Plugin(
+ * @Block(
* id = "user_login_block",
- * admin_label = @Translation("User login"),
- * module = "user"
+ * admin_label = @Translation("User login")
* )
*/
class UserLoginBlock extends BlockBase implements ContainerFactoryPluginInterface {
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
index 26be5ba..01209c5 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
@@ -8,16 +8,15 @@
namespace Drupal\user\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a "Who's new" block.
*
- * @Plugin(
+ * @Block(
* id = "user_new_block",
- * admin_label = @Translation("Who's new"),
- * module = "user"
+ * admin_label = @Translation("Who's new")
* )
*/
class UserNewBlock extends BlockBase {
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php
index 3f5b0b2..1b1e506 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php
@@ -8,7 +8,7 @@
namespace Drupal\user\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
@@ -17,10 +17,9 @@
* @todo Move this block to the Statistics module and remove its dependency on
* {users}.access.
*
- * @Plugin(
+ * @Block(
* id = "user_online_block",
- * admin_label = @Translation("Who's online"),
- * module = "user"
+ * admin_label = @Translation("Who's online")
* )
*/
class UserOnlineBlock extends BlockBase {
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
index d3cada4..02daf5a 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Plugin\Block;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\Component\Utility\Xss;
@@ -16,10 +16,9 @@
/**
* Provides a generic Views block.
*
- * @Plugin(
+ * @Block(
* id = "views_block",
* admin_label = @Translation("Views Block"),
- * module = "views",
* derivative = "Drupal\views\Plugin\Derivative\ViewsBlock"
* )
*/
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php
index 3ef4ecd..8c25e9f 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php
@@ -7,16 +7,15 @@
namespace Drupal\views\Plugin\Block;
-use Drupal\Component\Annotation\Plugin;
+use Drupal\block\Annotation\Block;
use Drupal\Core\Annotation\Translation;
/**
* Provides a 'Views Exposed Filter' block.
*
- * @Plugin(
+ * @Block(
* id = "views_exposed_filter_block",
* admin_label = @Translation("Views Exposed Filter Block"),
- * module = "views",
* derivative = "Drupal\views\Plugin\Derivative\ViewsExposedFilterBlock"
* )
*/