From 523fb855333df9bc8733243dab423e402a27843d Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Sun, 18 Aug 2013 14:16:19 -0700
Subject: [PATCH] Issue #1847002 by tim.plunkett, effulgentsia, msonnabaum:
Move entity type classes from Drupal$provider\Plugin\Core\Entity to
Drupal$provider\Entity.
---
core/includes/entity.api.php | 18 ++++-----
core/includes/entity.inc | 10 ++---
core/includes/menu.inc | 2 +-
core/lib/Drupal/Core/Entity/EntityManager.php | 2 +-
.../Core/Entity/EntityRenderController.php | 4 +-
.../Drupal/Core/Entity/Query/Sql/Tables.php | 2 +-
core/modules/aggregator/aggregator.module | 6 +--
core/modules/aggregator/aggregator.pages.inc | 8 ++--
.../{Plugin/Core => }/Entity/Feed.php | 4 +-
.../{Plugin/Core => }/Entity/Item.php | 4 +-
.../lib/Drupal/aggregator/FeedInterface.php | 2 +-
.../aggregator/FeedStorageController.php | 2 +-
.../FeedStorageControllerInterface.php | 2 +-
.../lib/Drupal/aggregator/ItemInterface.php | 2 +-
.../aggregator/ItemStorageController.php | 2 +-
.../ItemStorageControllerInterface.php | 2 +-
.../aggregator/Plugin/FetcherInterface.php | 4 +-
.../aggregator/Plugin/ParserInterface.php | 4 +-
.../aggregator/Plugin/ProcessorInterface.php | 8 ++--
.../aggregator/fetcher/DefaultFetcher.php | 2 +-
.../aggregator/parser/DefaultParser.php | 2 +-
.../aggregator/processor/DefaultProcessor.php | 2 +-
.../aggregator/Tests/AggregatorTestBase.php | 16 ++++----
.../Plugin/aggregator/fetcher/TestFetcher.php | 2 +-
.../Plugin/aggregator/parser/TestParser.php | 2 +-
.../aggregator/processor/TestProcessor.php | 2 +-
core/modules/block/block.admin.inc | 2 +-
core/modules/block/block.api.php | 6 +--
core/modules/block/block.module | 2 +-
.../block/custom_block/custom_block.module | 8 ++--
.../block/custom_block/custom_block.pages.inc | 6 +--
.../custom_block/CustomBlockInterface.php | 2 +-
.../CustomBlockRenderController.php | 2 +-
.../custom_block/CustomBlockTypeInterface.php | 2 +-
.../{Plugin/Core => }/Entity/CustomBlock.php | 4 +-
.../Core => }/Entity/CustomBlockType.php | 4 +-
.../Tests/CustomBlockFieldTest.php | 6 +--
.../Tests/CustomBlockTestBase.php | 4 +-
.../Tests/CustomBlockTranslationUITest.php | 4 +-
.../custom_block_test.module | 2 +-
.../block/lib/Drupal/block/BlockInterface.php | 2 +-
.../block/{Plugin/Core => }/Entity/Block.php | 4 +-
.../block/Tests/BlockStorageUnitTest.php | 2 +-
core/modules/book/book.module | 6 +--
core/modules/book/book.pages.inc | 4 +-
core/modules/breakpoint/breakpoint.module | 10 ++---
.../breakpoint/BreakpointGroupInterface.php | 2 +-
.../Drupal/breakpoint/BreakpointInterface.php | 2 +-
.../{Plugin/Core => }/Entity/Breakpoint.php | 4 +-
.../Core => }/Entity/BreakpointGroup.php | 8 ++--
.../breakpoint/Tests/BreakpointAPITest.php | 2 +-
.../breakpoint/Tests/BreakpointCRUDTest.php | 2 +-
.../Tests/BreakpointGroupAPITest.php | 4 +-
.../Tests/BreakpointGroupCRUDTest.php | 4 +-
.../Tests/BreakpointGroupTestBase.php | 2 +-
.../breakpoint/Tests/BreakpointTestBase.php | 2 +-
.../breakpoint/Tests/BreakpointThemeTest.php | 4 +-
.../Tests/BreakpointMediaQueryTest.php | 2 +-
core/modules/ckeditor/ckeditor.api.php | 2 +-
.../Drupal/ckeditor/CKEditorPluginBase.php | 2 +-
.../CKEditorPluginConfigurableInterface.php | 4 +-
.../CKEditorPluginContextualInterface.php | 4 +-
.../ckeditor/CKEditorPluginInterface.php | 8 ++--
.../Drupal/ckeditor/CKEditorPluginManager.php | 6 +--
.../Plugin/CKEditorPlugin/DrupalImage.php | 2 +-
.../Plugin/CKEditorPlugin/DrupalLink.php | 2 +-
.../Plugin/CKEditorPlugin/Internal.php | 6 +--
.../Plugin/CKEditorPlugin/StylesCombo.php | 2 +-
.../ckeditor/Plugin/Editor/CKEditor.php | 6 +--
.../ckeditor/Tests/CKEditorAdminTest.php | 2 +-
.../tests/modules/ckeditor_test.module | 2 +-
.../Plugin/CKEditorPlugin/Llama.php | 2 +-
.../Plugin/CKEditorPlugin/LlamaContextual.php | 2 +-
.../LlamaContextualAndButton.php | 2 +-
core/modules/comment/comment.admin.inc | 4 +-
core/modules/comment/comment.api.php | 16 ++++----
core/modules/comment/comment.module | 8 ++--
core/modules/comment/comment.pages.inc | 2 +-
.../comment/CommentAccessController.php | 2 +-
.../lib/Drupal/comment/CommentInterface.php | 2 +-
.../comment/CommentRenderController.php | 2 +-
.../comment/Controller/CommentController.php | 4 +-
.../{Plugin/Core => }/Entity/Comment.php | 4 +-
.../Drupal/comment/Tests/CommentTestBase.php | 2 +-
.../comment/Tests/Views/CommentTestBase.php | 2 +-
.../config/Tests/ConfigEntityListTest.php | 2 +-
.../tests/config_test/config_test.module | 4 +-
.../config_test/ConfigTestController.php | 4 +-
.../config_test/ConfigTestInterface.php | 2 +-
.../Core => }/Entity/ConfigQueryTest.php | 4 +-
.../{Plugin/Core => }/Entity/ConfigTest.php | 4 +-
core/modules/contact/contact.module | 6 +--
core/modules/contact/contact.pages.inc | 4 +-
.../contact/CategoryAccessController.php | 2 +-
.../lib/Drupal/contact/CategoryInterface.php | 2 +-
.../{Plugin/Core => }/Entity/Category.php | 4 +-
.../{Plugin/Core => }/Entity/Message.php | 4 +-
.../lib/Drupal/contact/MessageInterface.php | 2 +-
.../contact/Tests/MessageEntityTest.php | 4 +-
.../contact/Tests/Views/ContactFieldsTest.php | 2 +-
.../content_translation.admin.inc | 8 ++--
.../datetime/Tests/DatetimeFieldTest.php | 4 +-
core/modules/edit/edit.module | 2 +-
core/modules/editor/editor.module | 6 +--
.../lib/Drupal/editor/EditorController.php | 2 +-
.../lib/Drupal/editor/EditorInterface.php | 2 +-
.../{Plugin/Core => }/Entity/Editor.php | 4 +-
.../Drupal/editor/Form/EditorImageDialog.php | 4 +-
.../Drupal/editor/Form/EditorLinkDialog.php | 4 +-
.../lib/Drupal/editor/Plugin/EditorBase.php | 2 +-
.../editor/Plugin/EditorPluginInterface.php | 10 ++---
.../Plugin/Editor/UnicornEditor.php | 2 +-
.../lib/Drupal/email/Tests/EmailFieldTest.php | 4 +-
.../Core => }/Entity/EntityDisplay.php | 4 +-
.../Core => }/Entity/EntityFormDisplay.php | 4 +-
.../Core => }/Entity/EntityFormMode.php | 4 +-
.../Core => }/Entity/EntityViewMode.php | 4 +-
.../entity/EntityDisplayBaseInterface.php | 6 +--
core/modules/field/field.attach.inc | 8 ++--
core/modules/field/field.crud.inc | 4 +-
core/modules/field/field.info.inc | 2 +-
core/modules/field/field.install | 2 +-
.../field/{Plugin/Core => }/Entity/Field.php | 6 +--
.../Core => }/Entity/FieldInstance.php | 12 +++---
.../field/lib/Drupal/field/FieldInterface.php | 2 +-
.../ConfigEntityReferenceItemBase.php | 4 +-
.../Plugin/Type/FieldType/ConfigField.php | 2 +-
.../Type/FieldType/ConfigFieldInterface.php | 2 +-
.../Type/FieldType/ConfigFieldItemBase.php | 2 +-
.../Type/Formatter/FormatterPluginManager.php | 2 +-
.../Plugin/Type/Widget/WidgetInterface.php | 2 +-
.../lib/Drupal/field/Tests/BulkDeleteTest.php | 2 +-
.../Drupal/field/Tests/FieldAccessTest.php | 2 +-
.../field/Tests/FieldAttachStorageTest.php | 2 +-
.../field/Tests/FieldInstanceCrudTest.php | 2 +-
.../Drupal/field/Tests/TranslationTest.php | 4 +-
.../Drupal/field/Tests/TranslationWebTest.php | 4 +-
.../modules/field_test/field_test.entity.inc | 2 +-
.../field_sql_storage.install | 2 +-
.../field_sql_storage.module | 2 +-
.../Tests/FieldSqlStorageTest.php | 4 +-
.../lib/Drupal/field_ui/FieldOverview.php | 2 +-
.../Core => }/Entity/FieldUITestNoBundle.php | 4 +-
core/modules/file/file.api.php | 4 +-
core/modules/file/file.install | 2 +-
core/modules/file/file.module | 2 +-
.../file/{Plugin/Core => }/Entity/File.php | 4 +-
.../file/lib/Drupal/file/FileInterface.php | 2 +-
.../FileUsage/DatabaseFileUsageBackend.php | 2 +-
.../Drupal/file/FileUsage/FileUsageBase.php | 2 +-
.../file/FileUsage/FileUsageInterface.php | 2 +-
.../lib/Drupal/file/Tests/FileItemTest.php | 2 +-
.../file/tests/file_module_test.module | 2 +-
.../file/tests/file_test/file_test.module | 2 +-
core/modules/filter/filter.module | 4 +-
.../{Plugin/Core => }/Entity/FilterFormat.php | 4 +-
.../Drupal/filter/FilterFormatInterface.php | 2 +-
.../Drupal/filter/Plugin/FilterInterface.php | 2 +-
core/modules/forum/forum.admin.inc | 2 +-
core/modules/forum/forum.module | 2 +-
.../lib/Drupal/forum/Form/DeleteForm.php | 4 +-
.../Drupal/hal/Tests/NormalizerTestBase.php | 2 +-
.../image/config/schema/image.schema.yml | 2 +-
core/modules/image/image.module | 8 ++--
.../{Plugin/Core => }/Entity/ImageStyle.php | 4 +-
.../image/ImageStyleAccessController.php | 2 +-
.../Tests/ImageFieldDefaultImagesTest.php | 4 +-
.../lib/Drupal/image/Tests/ImageItemTest.php | 2 +-
.../{Plugin/Core => }/Entity/Language.php | 4 +-
.../lib/Drupal/language/LanguageInterface.php | 2 +-
.../{Plugin/Core => }/Entity/Display.php | 4 +-
.../Core => }/Entity/UnboundDisplay.php | 4 +-
.../layout/Tests/DisplayInternalLogicTest.php | 10 ++---
.../lib/Drupal/link/Tests/LinkFieldTest.php | 4 +-
.../menu/lib/Drupal/menu/Tests/MenuTest.php | 2 +-
core/modules/menu/menu.api.php | 6 +--
core/modules/menu/menu.module | 8 ++--
.../{Plugin/Core => }/Entity/MenuLink.php | 4 +-
.../menu_link/MenuLinkAccessController.php | 2 +-
.../Drupal/menu_link/MenuLinkInterface.php | 2 +-
core/modules/menu_link/menu_link.api.php | 16 ++++----
core/modules/menu_link/menu_link.module | 10 ++---
.../node/{Plugin/Core => }/Entity/Node.php | 4 +-
.../{Plugin/Core => }/Entity/NodeType.php | 8 ++--
.../lib/Drupal/node/NodeAccessController.php | 2 +-
.../Drupal/node/NodeGrantDatabaseStorage.php | 2 +-
.../node/lib/Drupal/node/NodeInterface.php | 2 +-
.../lib/Drupal/node/NodeRenderController.php | 2 +-
.../Drupal/node/NodeTypeAccessController.php | 2 +-
...NodeAccessLanguageAwareCombinationTest.php | 4 +-
.../lib/Drupal/node/Tests/NodeTestBase.php | 2 +-
.../Drupal/node/Tests/Views/RowPluginTest.php | 2 +-
core/modules/node/node.api.php | 8 ++--
core/modules/node/node.module | 4 +-
.../Plugin/views/field/NodeBulkFormTest.php | 4 +-
.../lib/Drupal/node_test/NodeTest.php | 2 +-
.../tests/modules/node_test/node_test.module | 2 +-
.../Drupal/number/Tests/NumberFieldTest.php | 4 +-
.../Tests/OptionsFieldUnitTestBase.php | 4 +-
.../options/Tests/OptionsWidgetsTest.php | 6 +--
core/modules/overlay/overlay.module | 2 +-
core/modules/path/path.module | 2 +-
.../Core => }/Entity/PictureMapping.php | 2 +-
.../picture/PictureMappingInterface.php | 2 +-
.../picture/Tests/PictureAdminUITest.php | 2 +-
.../picture/Tests/PictureFieldDisplayTest.php | 2 +-
core/modules/picture/picture.module | 2 +-
.../{Plugin/Core => }/Entity/RdfMapping.php | 4 +-
.../lib/Drupal/rdf/RdfMappingInterface.php | 4 +-
.../rdf/Tests/CommentAttributesTest.php | 2 +-
.../Drupal/rdf/Tests/StandardProfileTest.php | 2 +-
.../Tests/TaxonomyTermFieldAttributesTest.php | 2 +-
core/modules/rdf/rdf.module | 2 +-
core/modules/rest/rest.api.php | 2 +-
.../Tests/EntityResolverTest.php | 2 +-
.../{Plugin/Core => }/Entity/ShortcutSet.php | 4 +-
.../lib/Drupal/shortcut/Form/LinkDelete.php | 4 +-
.../Drupal/shortcut/ShortcutSetInterface.php | 2 +-
.../ShortcutSetStorageControllerInterface.php | 2 +-
core/modules/shortcut/shortcut.admin.inc | 4 +-
core/modules/shortcut/shortcut.module | 8 ++--
.../lib/Drupal/simpletest/WebTestBase.php | 8 ++--
.../Drupal/simpletest/Tests/phpunit_error.xml | 6 +--
.../Tests/Views/IntegrationTest.php | 2 +-
core/modules/statistics/statistics.module | 2 +-
.../{Plugin/Core => }/Entity/Action.php | 4 +-
.../{Plugin/Core => }/Entity/DateFormat.php | 4 +-
.../system/{Plugin/Core => }/Entity/Menu.php | 4 +-
.../lib/Drupal/system/MenuInterface.php | 2 +-
.../Tests/Entity/EntityQueryAggregateTest.php | 2 +-
.../Tests/Entity/EntityUnitTestBase.php | 2 +-
.../system/Tests/Menu/TreeAccessTest.php | 2 +-
.../system/Tests/Menu/TreeDataUnitTest.php | 2 +-
.../system/Tests/Theme/TwigTransTest.php | 2 +-
.../Core => }/Entity/EntityCacheTest.php | 4 +-
.../modules/entity_test/entity_test.module | 18 ++++-----
.../{Plugin/Core => }/Entity/EntityTest.php | 4 +-
.../Core => }/Entity/EntityTestCache.php | 4 +-
.../Entity/EntityTestDefaultAccess.php | 4 +-
.../Core => }/Entity/EntityTestLabel.php | 4 +-
.../Entity/EntityTestLabelCallback.php | 4 +-
.../Core => }/Entity/EntityTestMul.php | 6 +--
.../Core => }/Entity/EntityTestMulRev.php | 6 +--
.../Core => }/Entity/EntityTestNoLabel.php | 4 +-
.../Core => }/Entity/EntityTestRender.php | 4 +-
.../Core => }/Entity/EntityTestRev.php | 6 +--
.../EntityTestRenderController.php | 2 +-
.../tests/modules/menu_test/menu_test.module | 2 +-
.../service_provider_test/TestFileUsage.php | 2 +-
.../{Plugin/Core => }/Entity/Term.php | 4 +-
.../{Plugin/Core => }/Entity/Vocabulary.php | 4 +-
.../Drupal/taxonomy/TermAccessController.php | 2 +-
.../Drupal/taxonomy/TermRenderController.php | 2 +-
.../taxonomy/Tests/TermTranslationUITest.php | 2 +-
.../taxonomy/VocabularyAccessController.php | 2 +-
core/modules/taxonomy/taxonomy.admin.inc | 4 +-
core/modules/taxonomy/taxonomy.api.php | 40 +++++++++----------
core/modules/taxonomy/taxonomy.install | 2 +-
core/modules/taxonomy/taxonomy.module | 20 +++++-----
core/modules/taxonomy/taxonomy.pages.inc | 8 ++--
.../Tests/Formatter/TextPlainUnitTest.php | 4 +-
.../tour/{Plugin/Core => }/Entity/Tour.php | 4 +-
.../tour/lib/Drupal/tour/TourInterface.php | 2 +-
core/modules/tour/tour.api.php | 8 ++--
core/modules/translation/translation.module | 2 +-
.../user/{Plugin/Core => }/Entity/Role.php | 4 +-
.../user/{Plugin/Core => }/Entity/User.php | 4 +-
.../user/lib/Drupal/user/RoleInterface.php | 2 +-
.../lib/Drupal/user/Tests/UserEntityTest.php | 10 ++---
.../Tests/Plugin/Action/AddRoleUserTest.php | 2 +-
.../Plugin/Action/RemoveRoleUserTest.php | 2 +-
.../Tests/Plugin/Core/Entity/UserTest.php | 10 ++---
.../Plugin/views/field/UserBulkFormTest.php | 4 +-
.../Tests/Views/Argument/RolesRidTest.php | 4 +-
core/modules/user/user.api.php | 10 ++---
core/modules/user/user.module | 8 ++--
.../views/{Plugin/Core => }/Entity/View.php | 4 +-
.../Plugin/views/wizard/WizardPluginBase.php | 2 +-
.../lib/Drupal/views/Tests/ModuleTest.php | 2 +-
.../Drupal/views/Tests/ViewStorageTest.php | 10 ++---
.../lib/Drupal/views/Tests/ViewTestBase.php | 8 ++--
.../Tests/ViewsTaxonomyAutocompleteTest.php | 2 +-
.../views/lib/Drupal/views/ViewExecutable.php | 2 +-
.../Tests/Plugin/Block/ViewsBlockTest.php | 2 +-
.../views/Tests/Plugin/field/CounterTest.php | 2 +-
.../views/Tests/ViewExecutableUnitTest.php | 2 +-
.../tests/Drupal/views/Tests/ViewsTest.php | 2 +-
core/modules/views/views.module | 10 ++---
.../views_ui/lib/Drupal/views_ui/ViewUI.php | 4 +-
.../views_ui/Tests/ViewListControllerTest.php | 2 +-
.../views_ui/Tests/ViewUIObjectTest.php | 2 +-
.../Controller/EntityViewControllerTest.php | 2 +-
.../Core/Entity/EntityAccessCheckTest.php | 2 +-
.../Core/Entity/EntityListControllerTest.php | 6 +--
.../Tests/Core/Session/UserSessionTest.php | 4 +-
core/tests/Drupal/Tests/UnitTestCase.php | 2 +-
296 files changed, 587 insertions(+), 587 deletions(-)
rename core/modules/aggregator/lib/Drupal/aggregator/{Plugin/Core => }/Entity/Feed.php (98%)
rename core/modules/aggregator/lib/Drupal/aggregator/{Plugin/Core => }/Entity/Item.php (96%)
rename core/modules/block/custom_block/lib/Drupal/custom_block/{Plugin/Core => }/Entity/CustomBlock.php (98%)
rename core/modules/block/custom_block/lib/Drupal/custom_block/{Plugin/Core => }/Entity/CustomBlockType.php (95%)
rename core/modules/block/lib/Drupal/block/{Plugin/Core => }/Entity/Block.php (97%)
rename core/modules/breakpoint/lib/Drupal/breakpoint/{Plugin/Core => }/Entity/Breakpoint.php (98%)
rename core/modules/breakpoint/lib/Drupal/breakpoint/{Plugin/Core => }/Entity/BreakpointGroup.php (96%)
rename core/modules/comment/lib/Drupal/comment/{Plugin/Core => }/Entity/Comment.php (98%)
rename core/modules/config/tests/config_test/lib/Drupal/config_test/{Plugin/Core => }/Entity/ConfigQueryTest.php (90%)
rename core/modules/config/tests/config_test/lib/Drupal/config_test/{Plugin/Core => }/Entity/ConfigTest.php (95%)
rename core/modules/contact/lib/Drupal/contact/{Plugin/Core => }/Entity/Category.php (95%)
rename core/modules/contact/lib/Drupal/contact/{Plugin/Core => }/Entity/Message.php (96%)
rename core/modules/editor/lib/Drupal/editor/{Plugin/Core => }/Entity/Editor.php (95%)
rename core/modules/entity/lib/Drupal/entity/{Plugin/Core => }/Entity/EntityDisplay.php (94%)
rename core/modules/entity/lib/Drupal/entity/{Plugin/Core => }/Entity/EntityFormDisplay.php (95%)
rename core/modules/entity/lib/Drupal/entity/{Plugin/Core => }/Entity/EntityFormMode.php (95%)
rename core/modules/entity/lib/Drupal/entity/{Plugin/Core => }/Entity/EntityViewMode.php (95%)
rename core/modules/field/lib/Drupal/field/{Plugin/Core => }/Entity/Field.php (99%)
rename core/modules/field/lib/Drupal/field/{Plugin/Core => }/Entity/FieldInstance.php (98%)
rename core/modules/field_ui/tests/modules/field_ui_test/lib/Drupal/field_ui_test/{Plugin/Core => }/Entity/FieldUITestNoBundle.php (83%)
rename core/modules/file/lib/Drupal/file/{Plugin/Core => }/Entity/File.php (97%)
rename core/modules/filter/lib/Drupal/filter/{Plugin/Core => }/Entity/FilterFormat.php (98%)
rename core/modules/image/lib/Drupal/image/{Plugin/Core => }/Entity/ImageStyle.php (99%)
rename core/modules/language/lib/Drupal/language/{Plugin/Core => }/Entity/Language.php (95%)
rename core/modules/layout/lib/Drupal/layout/{Plugin/Core => }/Entity/Display.php (98%)
rename core/modules/layout/lib/Drupal/layout/{Plugin/Core => }/Entity/UnboundDisplay.php (93%)
rename core/modules/menu_link/lib/Drupal/menu_link/{Plugin/Core => }/Entity/MenuLink.php (99%)
rename core/modules/node/lib/Drupal/node/{Plugin/Core => }/Entity/Node.php (98%)
rename core/modules/node/lib/Drupal/node/{Plugin/Core => }/Entity/NodeType.php (95%)
rename core/modules/picture/lib/Drupal/picture/{Plugin/Core => }/Entity/PictureMapping.php (99%)
rename core/modules/rdf/lib/Drupal/rdf/{Plugin/Core => }/Entity/RdfMapping.php (96%)
rename core/modules/shortcut/lib/Drupal/shortcut/{Plugin/Core => }/Entity/ShortcutSet.php (97%)
rename core/modules/system/lib/Drupal/system/{Plugin/Core => }/Entity/Action.php (97%)
rename core/modules/system/lib/Drupal/system/{Plugin/Core => }/Entity/DateFormat.php (97%)
rename core/modules/system/lib/Drupal/system/{Plugin/Core => }/Entity/Menu.php (91%)
rename core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/{Plugin/Core => }/Entity/EntityCacheTest.php (76%)
rename core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/{Plugin/Core => }/Entity/EntityTest.php (95%)
rename core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/{Plugin/Core => }/Entity/EntityTestCache.php (95%)
rename core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/{Plugin/Core => }/Entity/EntityTestDefaultAccess.php (82%)
rename core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/{Plugin/Core => }/Entity/EntityTestLabel.php (82%)
rename core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/{Plugin/Core => }/Entity/EntityTestLabelCallback.php (84%)
rename core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/{Plugin/Core => }/Entity/EntityTestMul.php (85%)
rename core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/{Plugin/Core => }/Entity/EntityTestMulRev.php (86%)
rename core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/{Plugin/Core => }/Entity/EntityTestNoLabel.php (82%)
rename core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/{Plugin/Core => }/Entity/EntityTestRender.php (85%)
rename core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/{Plugin/Core => }/Entity/EntityTestRev.php (89%)
rename core/modules/taxonomy/lib/Drupal/taxonomy/{Plugin/Core => }/Entity/Term.php (97%)
rename core/modules/taxonomy/lib/Drupal/taxonomy/{Plugin/Core => }/Entity/Vocabulary.php (97%)
rename core/modules/tour/lib/Drupal/tour/{Plugin/Core => }/Entity/Tour.php (96%)
rename core/modules/user/lib/Drupal/user/{Plugin/Core => }/Entity/Role.php (96%)
rename core/modules/user/lib/Drupal/user/{Plugin/Core => }/Entity/User.php (98%)
rename core/modules/views/lib/Drupal/views/{Plugin/Core => }/Entity/View.php (98%)
diff --git a/core/includes/entity.api.php b/core/includes/entity.api.php
index 05175681b252..da9c1b8255ea 100644
--- a/core/includes/entity.api.php
+++ b/core/includes/entity.api.php
@@ -334,7 +334,7 @@ function hook_entity_query_alter(\Drupal\Core\Entity\Query\QueryInterface $query
*
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity object.
- * @param \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display
+ * @param \Drupal\entity\Entity\EntityDisplay $display
* The entity_display object holding the display options configured for the
* entity components.
* @param $view_mode
@@ -351,7 +351,7 @@ function hook_entity_query_alter(\Drupal\Core\Entity\Query\QueryInterface $query
* @see hook_node_view()
* @see hook_user_view()
*/
-function hook_entity_view(\Drupal\Core\Entity\EntityInterface $entity, \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display, $view_mode, $langcode) {
+function hook_entity_view(\Drupal\Core\Entity\EntityInterface $entity, \Drupal\entity\Entity\EntityDisplay $display, $view_mode, $langcode) {
// Only do the extra work if the component is configured to be displayed.
// This assumes a 'mymodule_addition' extra field has been defined for the
// entity bundle in hook_field_extra_fields().
@@ -380,7 +380,7 @@ function hook_entity_view(\Drupal\Core\Entity\EntityInterface $entity, \Drupal\e
* A renderable array representing the entity content.
* @param Drupal\Core\Entity\EntityInterface $entity
* The entity object being rendered.
- * @param \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display
+ * @param \Drupal\entity\Entity\EntityDisplay $display
* The entity_display object holding the display options configured for the
* entity components.
*
@@ -390,7 +390,7 @@ function hook_entity_view(\Drupal\Core\Entity\EntityInterface $entity, \Drupal\e
* @see hook_taxonomy_term_view_alter()
* @see hook_user_view_alter()
*/
-function hook_entity_view_alter(&$build, Drupal\Core\Entity\EntityInterface $entity, \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display) {
+function hook_entity_view_alter(&$build, Drupal\Core\Entity\EntityInterface $entity, \Drupal\entity\Entity\EntityDisplay $display) {
if ($build['#view_mode'] == 'full' && isset($build['an_additional_field'])) {
// Change its weight.
$build['an_additional_field']['#weight'] = -10;
@@ -459,7 +459,7 @@ function hook_entity_view_mode_alter(&$view_mode, Drupal\Core\Entity\EntityInter
/**
* Alters the settings used for displaying an entity.
*
- * @param \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display
+ * @param \Drupal\entity\Entity\EntityDisplay $display
* The entity_display object that will be used to display the entity
* components.
* @param array $context
@@ -468,7 +468,7 @@ function hook_entity_view_mode_alter(&$view_mode, Drupal\Core\Entity\EntityInter
* - bundle: The bundle, e.g., 'page' or 'article'.
* - view_mode: The view mode, e.g. 'full', 'teaser'...
*/
-function hook_entity_display_alter(\Drupal\entity\Plugin\Core\Entity\EntityDisplay $display, array $context) {
+function hook_entity_display_alter(\Drupal\entity\Entity\EntityDisplay $display, array $context) {
// Leave field labels out of the search index.
if ($context['entity_type'] == 'node' && $context['view_mode'] == 'search_index') {
foreach ($display->getComponents() as $name => $options) {
@@ -508,7 +508,7 @@ function hook_entity_prepare_form(\Drupal\Core\Entity\EntityInterface $entity, $
/**
* Alters the settings used for displaying an entity form.
*
- * @param \Drupal\entity\Plugin\Core\Entity\EntityFormDisplay $form_display
+ * @param \Drupal\entity\Entity\EntityFormDisplay $form_display
* The entity_form_display object that will be used to display the entity form
* components.
* @param array $context
@@ -517,7 +517,7 @@ function hook_entity_prepare_form(\Drupal\Core\Entity\EntityInterface $entity, $
* - bundle: The bundle, e.g., 'page' or 'article'.
* - form_mode: The form mode, e.g. 'default', 'profile', 'register'...
*/
-function hook_entity_form_display_alter(\Drupal\entity\Plugin\Core\Entity\EntityFormDisplay $form_display, array $context) {
+function hook_entity_form_display_alter(\Drupal\entity\Entity\EntityFormDisplay $form_display, array $context) {
// Hide the 'user_picture' field from the register form.
if ($context['entity_type'] == 'user' && $context['form_mode'] == 'register') {
$form_display->setComponent('user_picture', array(
@@ -648,7 +648,7 @@ function hook_entity_field_access($operation, $field, \Drupal\Core\Session\Accou
* - operation: The operation to be performed (string).
* - field: The entity field object (\Drupal\Core\Entity\Field\Field).
* - account: The user account to check access for
- * (Drupal\user\Plugin\Core\Entity\User).
+ * (Drupal\user\Entity\User).
*/
function hook_entity_field_access_alter(array &$grants, array $context) {
$field = $context['field'];
diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index 7822d7aa2d4a..8071a0db004d 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -293,7 +293,7 @@ function entity_load_by_uuid($entity_type, $uuid, $reset = FALSE) {
* can either implement the Drupal\Core\Entity\EntityStorageControllerInterface
* interface, or, most commonly, extend the
* Drupal\Core\Entity\DatabaseStorageController class.
- * See Drupal\node\Plugin\Core\Entity\Node and Drupal\node\NodeStorageController
+ * See Drupal\node\Entity\Node and Drupal\node\NodeStorageController
* for an example.
*
* @param string $entity_type
@@ -689,7 +689,7 @@ function entity_view_multiple(array $entities, $view_mode, $langcode = NULL) {
* The view mode, or 'default' to retrieve the 'default' display object for
* this bundle.
*
- * @return \Drupal\entity\Plugin\Core\Entity\EntityDisplay
+ * @return \Drupal\entity\Entity\EntityDisplay
* The display object associated to the view mode.
*/
function entity_get_display($entity_type, $bundle, $view_mode) {
@@ -731,7 +731,7 @@ function entity_get_display($entity_type, $bundle, $view_mode) {
* @param string $view_mode
* The view mode being rendered.
*
- * @return \Drupal\entity\Plugin\Core\Entity\EntityDisplay
+ * @return \Drupal\entity\Entity\EntityDisplay
* The display object that should be used to render the entity.
*
* @see entity_get_display().
@@ -784,7 +784,7 @@ function entity_get_render_display(EntityInterface $entity, $view_mode) {
* @param string $form_mode
* The form mode.
*
- * @return \Drupal\entity\Plugin\Core\Entity\EntityFormDisplay
+ * @return \Drupal\entity\Entity\EntityFormDisplay
* The EntityFormDisplay object associated to the form mode.
*/
function entity_get_form_display($entity_type, $bundle, $form_mode) {
@@ -822,7 +822,7 @@ function entity_get_form_display($entity_type, $bundle, $form_mode) {
* @param string $form_mode
* The form mode being rendered.
*
- * @return \Drupal\entity\Plugin\Core\Entity\EntityFormDisplay
+ * @return \Drupal\entity\Entity\EntityFormDisplay
* The form display object that should be used to render the entity form.
*
* @see entity_get_form_display().
diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index 248659410e60..d205ac08f9e2 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -9,7 +9,7 @@
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Language\Language;
use Drupal\Core\Template\Attribute;
-use Drupal\menu_link\Plugin\Core\Entity\MenuLink;
+use Drupal\menu_link\Entity\MenuLink;
use Drupal\menu_link\MenuLinkStorageController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index a662259fadeb..5321099b8a59 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -112,7 +112,7 @@ public function __construct(\Traversable $namespaces, ContainerInterface $contai
$this->cache = $cache;
$this->languageManager = $language_manager;
- $this->discovery = new AnnotatedClassDiscovery('Plugin/Core/Entity', $namespaces, $annotation_namespaces, 'Drupal\Core\Entity\Annotation\EntityType');
+ $this->discovery = new AnnotatedClassDiscovery('Entity', $namespaces, $annotation_namespaces, 'Drupal\Core\Entity\Annotation\EntityType');
$this->discovery = new InfoHookDecorator($this->discovery, 'entity_info');
$this->discovery = new AlterDecorator($this->discovery, 'entity_info');
$this->discovery = new CacheDecorator($this->discovery, 'entity_info:' . $this->languageManager->getLanguage(Language::TYPE_INTERFACE)->id, 'cache', CacheBackendInterface::CACHE_PERMANENT, array('entity_info' => TRUE));
diff --git a/core/lib/Drupal/Core/Entity/EntityRenderController.php b/core/lib/Drupal/Core/Entity/EntityRenderController.php
index cd92f52cfd4c..860c0446a2f2 100644
--- a/core/lib/Drupal/Core/Entity/EntityRenderController.php
+++ b/core/lib/Drupal/Core/Entity/EntityRenderController.php
@@ -6,7 +6,7 @@
*/
namespace Drupal\Core\Entity;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
+use Drupal\entity\Entity\EntityDisplay;
use Drupal\Core\Language\Language;
@@ -72,7 +72,7 @@ protected function getBuildDefaults(EntityInterface $entity, $view_mode, $langco
* The render array that is being created.
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity to be prepared.
- * @param \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display
+ * @param \Drupal\entity\Entity\EntityDisplay $display
* The entity_display object holding the display options configured for
* the entity components.
* @param string $view_mode
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
index 2f7156adb4ec..9740e8a26574 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
@@ -10,7 +10,7 @@
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\Core\Entity\Plugin\DataType\EntityReference;
use Drupal\Core\Entity\Query\QueryException;
-use Drupal\field\Plugin\Core\Entity\Field;
+use Drupal\field\Entity\Field;
/**
* Adds tables and fields to the SQL entity query.
diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index a46971e6fa36..e5321d4362fd 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -5,7 +5,7 @@
* Used to aggregate syndicated content (RSS, RDF, and Atom).
*/
-use Drupal\aggregator\Plugin\Core\Entity\Feed;
+use Drupal\aggregator\Entity\Feed;
use Drupal\Component\Plugin\Exception\PluginException;
/**
@@ -346,7 +346,7 @@ function aggregator_save_category($edit) {
/**
* Checks a news feed for new items.
*
- * @param \Drupal\aggregator\Plugin\Core\Entity\Feed $feed
+ * @param \Drupal\aggregator\Entity\Feed $feed
* An object describing the feed to be refreshed.
*/
function aggregator_refresh(Feed $feed) {
@@ -435,7 +435,7 @@ function aggregator_refresh(Feed $feed) {
* @param int $fid
* The feed id.
*
- * @return \Drupal\aggregator\Plugin\Core\Entity\Feed
+ * @return \Drupal\aggregator\Entity\Feed
* An object describing the feed.
*/
function aggregator_feed_load($fid) {
diff --git a/core/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc
index 6579703d1a88..7ab756c70d83 100644
--- a/core/modules/aggregator/aggregator.pages.inc
+++ b/core/modules/aggregator/aggregator.pages.inc
@@ -5,13 +5,13 @@
* User page callbacks for the Aggregator module.
*/
-use Drupal\aggregator\Plugin\Core\Entity\Feed;
+use Drupal\aggregator\Entity\Feed;
use Drupal\Core\Entity\EntityInterface;
/**
* Page callback: Displays all the items captured from the particular feed.
*
- * @param \Drupal\aggregator\Plugin\Core\Entity\Feed $feed
+ * @param \Drupal\aggregator\Entity\Feed $feed
* The feed for which to display all items.
*
* @return string
@@ -369,7 +369,7 @@ function theme_aggregator_page_opml($variables) {
*
* @param array $variables
* An associative array containing:
- * - source: A Drupal\aggregator\Plugin\Core\Entity\Feed instance representing
+ * - source: A Drupal\aggregator\Entity\Feed instance representing
* the feed source.
* - summary_items: An array of feed items.
*/
@@ -423,7 +423,7 @@ function template_preprocess_aggregator_summary_item(&$variables) {
*
* @param array $variables
* An associative array containing:
- * - aggregator_feed: A Drupal\aggregator\Plugin\Core\Entity\Feed instance
+ * - aggregator_feed: A Drupal\aggregator\Entity\Feed instance
* representing the feed source.
*/
function template_preprocess_aggregator_feed_source(&$variables) {
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Feed.php b/core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php
similarity index 98%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Feed.php
rename to core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php
index bf2ecc3ba11b..ceabe5a4b496 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Feed.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\aggregator\Plugin\Core\Entity\Feed.
+ * Contains \Drupal\aggregator\Entity\Feed.
*/
-namespace Drupal\aggregator\Plugin\Core\Entity;
+namespace Drupal\aggregator\Entity;
use Drupal\Core\Entity\EntityNG;
use Symfony\Component\DependencyInjection\Container;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Item.php b/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php
similarity index 96%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Item.php
rename to core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php
index 6da20f30bcad..b22e738e60c1 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Item.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\aggregator\Plugin\Core\Entity\Item.
+ * Contains \Drupal\aggregator\Entity\Item.
*/
-namespace Drupal\aggregator\Plugin\Core\Entity;
+namespace Drupal\aggregator\Entity;
use Drupal\Core\Entity\EntityNG;
use Drupal\Core\Entity\EntityStorageControllerInterface;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/FeedInterface.php b/core/modules/aggregator/lib/Drupal/aggregator/FeedInterface.php
index a01f20a93d5e..3cccaec7ee04 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/FeedInterface.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/FeedInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\aggregator\Plugin\Core\Entity\FeedInterface.
+ * Contains \Drupal\aggregator\Entity\FeedInterface.
*/
namespace Drupal\aggregator;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageController.php b/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageController.php
index b54a7d6d52d9..7b6be0a72103 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageController.php
@@ -8,7 +8,7 @@
namespace Drupal\aggregator;
use Drupal\Core\Entity\DatabaseStorageControllerNG;
-use Drupal\aggregator\Plugin\Core\Entity\Feed;
+use Drupal\aggregator\Entity\Feed;
use Drupal\Core\Entity\EntityInterface;
/**
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageControllerInterface.php b/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageControllerInterface.php
index 24545ca4ad2b..c991b0f29a69 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageControllerInterface.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageControllerInterface.php
@@ -7,7 +7,7 @@
namespace Drupal\aggregator;
-use Drupal\aggregator\Plugin\Core\Entity\Feed;
+use Drupal\aggregator\Entity\Feed;
use Drupal\Core\Entity\EntityStorageControllerInterface;
/**
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemInterface.php b/core/modules/aggregator/lib/Drupal/aggregator/ItemInterface.php
index 5228925288f8..9ad17a2cdd0d 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/ItemInterface.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/ItemInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\aggregator\Plugin\Core\Entity\ItemInterface.
+ * Contains \Drupal\aggregator\Entity\ItemInterface.
*/
namespace Drupal\aggregator;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php b/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php
index 31f4a973a5c8..ede61e1b9e8a 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php
@@ -7,7 +7,7 @@
namespace Drupal\aggregator;
-use Drupal\aggregator\Plugin\Core\Entity\Item;
+use Drupal\aggregator\Entity\Item;
use Drupal\Core\Database\Query\PagerSelectExtender;
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\Core\Entity\DatabaseStorageControllerNG;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageControllerInterface.php b/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageControllerInterface.php
index da9597d78fac..0476cc71c289 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageControllerInterface.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageControllerInterface.php
@@ -7,7 +7,7 @@
namespace Drupal\aggregator;
-use Drupal\aggregator\Plugin\Core\Entity\Item;
+use Drupal\aggregator\Entity\Item;
use Drupal\core\Entity\EntityStorageControllerInterface;
/**
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/FetcherInterface.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/FetcherInterface.php
index da1377d82ffe..f497b36b756a 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/FetcherInterface.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/FetcherInterface.php
@@ -7,7 +7,7 @@
namespace Drupal\aggregator\Plugin;
-use Drupal\aggregator\Plugin\Core\Entity\Feed;
+use Drupal\aggregator\Entity\Feed;
/**
* Defines an interface for aggregator fetcher implementations.
@@ -23,7 +23,7 @@ interface FetcherInterface {
/**
* Downloads feed data.
*
- * @param \Drupal\aggregator\Plugin\Core\Entity\Feed $feed
+ * @param \Drupal\aggregator\Entity\Feed $feed
* A feed object representing the resource to be downloaded.
* $feed->url->value contains the link to the feed.
* Download the data at the URL and expose it
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/ParserInterface.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/ParserInterface.php
index 317b806a4dbc..9b945e65ddcd 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/ParserInterface.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/ParserInterface.php
@@ -7,7 +7,7 @@
namespace Drupal\aggregator\Plugin;
-use Drupal\aggregator\Plugin\Core\Entity\Feed;
+use Drupal\aggregator\Entity\Feed;
/**
* Defines an interface for aggregator parser implementations.
@@ -24,7 +24,7 @@ interface ParserInterface {
/**
* Parses feed data.
*
- * @param \Drupal\aggregator\Plugin\Core\Entity\Feed $feed
+ * @param \Drupal\aggregator\Entity\Feed $feed
* An object describing the resource to be parsed.
* $feed->source_string->value contains the raw feed data. Parse the data
* and add the following properties to the $feed object:
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/ProcessorInterface.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/ProcessorInterface.php
index b67038380081..d635f868e42d 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/ProcessorInterface.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/ProcessorInterface.php
@@ -7,7 +7,7 @@
namespace Drupal\aggregator\Plugin;
-use Drupal\aggregator\Plugin\Core\Entity\Feed;
+use Drupal\aggregator\Entity\Feed;
/**
* Defines an interface for aggregator processor implementations.
@@ -48,7 +48,7 @@ public function settingsSubmit(array $form, array &$form_state);
/**
* Processes feed data.
*
- * @param \Drupal\aggregator\Plugin\Core\Entity\Feed $feed
+ * @param \Drupal\aggregator\Entity\Feed $feed
* A feed object representing the resource to be processed.
* $feed->items contains an array of feed items downloaded and parsed at the
* parsing stage. See \Drupal\aggregator\Plugin\FetcherInterface::parse()
@@ -64,7 +64,7 @@ public function process(Feed $feed);
* Called after the processing of the feed is completed by all selected
* processors.
*
- * @param \Drupal\aggregator\Plugin\Core\Entity\Feed $feed
+ * @param \Drupal\aggregator\Entity\Feed $feed
* Object describing feed.
*
* @see aggregator_refresh()
@@ -77,7 +77,7 @@ public function postProcess(Feed $feed);
* Called by aggregator if either a feed is deleted or a user clicks on
* "remove items".
*
- * @param \Drupal\aggregator\Plugin\Core\Entity\Feed $feed
+ * @param \Drupal\aggregator\Entity\Feed $feed
* The $feed object whose items are being removed.
*
*/
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
index 7055c3f4f1c0..986d66e94035 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
@@ -8,7 +8,7 @@
namespace Drupal\aggregator\Plugin\aggregator\fetcher;
use Drupal\aggregator\Plugin\FetcherInterface;
-use Drupal\aggregator\Plugin\Core\Entity\Feed;
+use Drupal\aggregator\Entity\Feed;
use Drupal\aggregator\Annotation\AggregatorFetcher;
use Drupal\Core\Annotation\Translation;
use Guzzle\Http\Exception\BadResponseException;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/parser/DefaultParser.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/parser/DefaultParser.php
index b21b9f5eb929..9b2bcb0c46f4 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/parser/DefaultParser.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/parser/DefaultParser.php
@@ -8,7 +8,7 @@
namespace Drupal\aggregator\Plugin\aggregator\parser;
use Drupal\aggregator\Plugin\ParserInterface;
-use Drupal\aggregator\Plugin\Core\Entity\Feed;
+use Drupal\aggregator\Entity\Feed;
use Drupal\aggregator\Annotation\AggregatorParser;
use Drupal\Core\Annotation\Translation;
use Drupal\Core\Cache\Cache;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/processor/DefaultProcessor.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/processor/DefaultProcessor.php
index 9085fc193d52..eefadcd5a6b6 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/processor/DefaultProcessor.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/processor/DefaultProcessor.php
@@ -9,7 +9,7 @@
use Drupal\Component\Plugin\PluginBase;
use Drupal\aggregator\Plugin\ProcessorInterface;
-use Drupal\aggregator\Plugin\Core\Entity\Feed;
+use Drupal\aggregator\Entity\Feed;
use Drupal\aggregator\Annotation\AggregatorProcessor;
use Drupal\Core\Annotation\Translation;
use Drupal\Core\Database\Database;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php
index ae2d1984ec50..1f1674f253a7 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php
@@ -9,7 +9,7 @@
use Drupal\Core\Language\Language;
use Drupal\simpletest\WebTestBase;
-use Drupal\aggregator\Plugin\Core\Entity\Feed;
+use Drupal\aggregator\Entity\Feed;
/**
* Defines a base class for testing the Aggregator module.
@@ -47,7 +47,7 @@ function setUp() {
* @param array $edit
* Array with additional form fields.
*
- * @return \Drupal\aggregator\Plugin\Core\Entity\Feed $feed
+ * @return \Drupal\aggregator\Entity\Feed $feed
* Full feed object if possible.
*
* @see getFeedEditArray()
@@ -65,7 +65,7 @@ function createFeed($feed_url = NULL, array $edit = array()) {
/**
* Deletes an aggregator feed.
*
- * @param \Drupal\aggregator\Plugin\Core\Entity\Feed $feed
+ * @param \Drupal\aggregator\Entity\Feed $feed
* Feed object representing the feed.
*/
function deleteFeed(Feed $feed) {
@@ -110,7 +110,7 @@ function getFeedEditArray($feed_url = NULL, array $edit = array()) {
* @param array $values
* (optional) Default values to initialize object properties with.
*
- * @return \Drupal\aggregator\Plugin\Core\Entity\Feed
+ * @return \Drupal\aggregator\Entity\Feed
* A feed object.
*/
function getFeedEditObject($feed_url = NULL, array $values = array()) {
@@ -147,7 +147,7 @@ function getDefaultFeedItemCount() {
* This method simulates a click to
* admin/config/services/aggregator/update/$fid.
*
- * @param \Drupal\aggregator\Plugin\Core\Entity\Feed $feed
+ * @param \Drupal\aggregator\Entity\Feed $feed
* Feed object representing the feed.
* @param int|null $expected_count
* Expected number of feed items. If omitted no check will happen.
@@ -182,7 +182,7 @@ function updateFeedItems(Feed $feed, $expected_count = NULL) {
/**
* Confirms an item removal from a feed.
*
- * @param \Drupal\aggregator\Plugin\Core\Entity\Feed $feed
+ * @param \Drupal\aggregator\Entity\Feed $feed
* Feed object representing the feed.
*/
function removeFeedItems(Feed $feed) {
@@ -193,7 +193,7 @@ function removeFeedItems(Feed $feed) {
/**
* Adds and removes feed items and ensure that the count is zero.
*
- * @param \Drupal\aggregator\Plugin\Core\Entity\Feed $feed
+ * @param \Drupal\aggregator\Entity\Feed $feed
* Feed object representing the feed.
* @param int $expected_count
* Expected number of feed items.
@@ -210,7 +210,7 @@ function updateAndRemove(Feed $feed, $expected_count) {
/**
* Pulls feed categories from {aggregator_category_feed} table.
*
- * @param \Drupal\aggregator\Plugin\Core\Entity\Feed $feed
+ * @param \Drupal\aggregator\Entity\Feed $feed
* Feed object representing the feed.
*/
function getFeedCategories(Feed $feed) {
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/fetcher/TestFetcher.php b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/fetcher/TestFetcher.php
index 8e69f8d5a9a4..42c62bd1654a 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/fetcher/TestFetcher.php
+++ b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/fetcher/TestFetcher.php
@@ -9,7 +9,7 @@
use Drupal\aggregator\Plugin\FetcherInterface;
use Drupal\aggregator\Plugin\aggregator\fetcher\DefaultFetcher;
-use Drupal\aggregator\Plugin\Core\Entity\Feed;
+use Drupal\aggregator\Entity\Feed;
use Drupal\aggregator\Annotation\AggregatorFetcher;
use Drupal\Core\Annotation\Translation;
use Guzzle\Http\Exception\BadResponseException;
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/parser/TestParser.php b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/parser/TestParser.php
index a9ab57cc8a66..e12d0984eca5 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/parser/TestParser.php
+++ b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/parser/TestParser.php
@@ -8,7 +8,7 @@
namespace Drupal\aggregator_test\Plugin\aggregator\parser;
use Drupal\aggregator\Plugin\ParserInterface;
-use Drupal\aggregator\Plugin\Core\Entity\Feed;
+use Drupal\aggregator\Entity\Feed;
use Drupal\aggregator\Plugin\aggregator\parser\DefaultParser;
use Drupal\aggregator\Annotation\AggregatorParser;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/processor/TestProcessor.php b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/processor/TestProcessor.php
index 85738b8220eb..f6f605d702d3 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/processor/TestProcessor.php
+++ b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/processor/TestProcessor.php
@@ -9,7 +9,7 @@
use Drupal\Component\Plugin\PluginBase;
use Drupal\aggregator\Plugin\ProcessorInterface;
-use Drupal\aggregator\Plugin\Core\Entity\Feed;
+use Drupal\aggregator\Entity\Feed;
use Drupal\aggregator\Annotation\AggregatorProcessor;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/block/block.admin.inc b/core/modules/block/block.admin.inc
index f849833b2318..0f6ea1e3d360 100644
--- a/core/modules/block/block.admin.inc
+++ b/core/modules/block/block.admin.inc
@@ -5,7 +5,7 @@
* Admin page callbacks for the block module.
*/
-use Drupal\block\Plugin\Core\Entity\Block;
+use Drupal\block\Entity\Block;
use Drupal\Core\Template\Attribute;
/**
diff --git a/core/modules/block/block.api.php b/core/modules/block/block.api.php
index 93a113a7743e..b7c3dab76b3d 100644
--- a/core/modules/block/block.api.php
+++ b/core/modules/block/block.api.php
@@ -74,11 +74,11 @@ function hook_block_view_BASE_BLOCK_ID_alter(array &$build, \Drupal\block\BlockP
* Modules may implement this hook if they want to have a say in whether or not
* a given user has access to perform a given operation on a block instance.
*
- * @param \Drupal\block\Plugin\Core\Entity\Block $block
+ * @param \Drupal\block\Entity\Block $block
* The block instance.
* @param string $operation
* The operation to be performed, e.g., 'view', 'create', 'delete', 'update'.
- * @param \Drupal\user\Plugin\Core\Entity\User $account
+ * @param \Drupal\user\Entity\User $account
* The user object to perform the access check operation on.
* @param string $langcode
* The language code to perform the access check operation on.
@@ -91,7 +91,7 @@ function hook_block_view_BASE_BLOCK_ID_alter(array &$build, \Drupal\block\BlockP
* @see \Drupal\Core\Entity\EntityAccessController::access()
* @see \Drupal\block\BlockAccessController::checkAccess()
*/
-function hook_block_access(\Drupal\block\Plugin\Core\Entity\Block $block, $operation, \Drupal\user\Plugin\Core\Entity\User $account, $langcode) {
+function hook_block_access(\Drupal\block\Entity\Block $block, $operation, \Drupal\user\Entity\User $account, $langcode) {
// Example code that would prevent displaying the 'Powered by Drupal' block in
// a region different than the footer.
if ($operation == 'view' && $block->get('plugin') == 'system_powered_by_block' && $block->get('region') != 'footer') {
diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 361a33a00f96..c50738f21011 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -453,7 +453,7 @@ function block_list($region) {
* @param string $entity_id
* The block ID.
*
- * @return \Drupal\block\Plugin\Core\Entity\Block
+ * @return \Drupal\block\Entity\Block
* The loaded block object.
*/
function block_load($entity_id) {
diff --git a/core/modules/block/custom_block/custom_block.module b/core/modules/block/custom_block/custom_block.module
index 0af90772ba80..b8da16f219ed 100644
--- a/core/modules/block/custom_block/custom_block.module
+++ b/core/modules/block/custom_block/custom_block.module
@@ -5,8 +5,8 @@
* Allows the creaation of custom blocks through the user interface.
*/
-use Drupal\custom_block\Plugin\Core\Entity\CustomBlockType;
-use Drupal\custom_block\Plugin\Core\Entity\CustomBlock;
+use Drupal\custom_block\Entity\CustomBlockType;
+use Drupal\custom_block\Entity\CustomBlock;
/**
* Implements hook_help().
@@ -152,7 +152,7 @@ function custom_block_theme($existing, $type, $theme, $path) {
* @param int $id
* The ID of the custom block type to load.
*
- * @return \Drupal\custom_block\Plugin\Core\Entity\CustomBlockType|null
+ * @return \Drupal\custom_block\Entity\CustomBlockType|null
* A CustomBlockType object or NULL if the requested $id does not exist.
*/
function custom_block_type_load($id) {
@@ -165,7 +165,7 @@ function custom_block_type_load($id) {
* @param int $id
* The id of the custom block.
*
- * @return \Drupal\custom_block\Plugin\Core\Entity\CustomBlock|null
+ * @return \Drupal\custom_block\Entity\CustomBlock|null
* A CustomBlock object or NULL if the requested $id does not exist.
*/
function custom_block_load($id) {
diff --git a/core/modules/block/custom_block/custom_block.pages.inc b/core/modules/block/custom_block/custom_block.pages.inc
index e50b297ddc34..3732b2540e0b 100644
--- a/core/modules/block/custom_block/custom_block.pages.inc
+++ b/core/modules/block/custom_block/custom_block.pages.inc
@@ -5,8 +5,8 @@
* Provides page callbacks for custom blocks.
*/
-use Drupal\custom_block\Plugin\Core\Entity\CustomBlockType;
-use Drupal\custom_block\Plugin\Core\Entity\CustomBlock;
+use Drupal\custom_block\Entity\CustomBlockType;
+use Drupal\custom_block\Entity\CustomBlock;
use Symfony\Component\HttpFoundation\RedirectResponse;
/**
@@ -39,7 +39,7 @@ function template_preprocess_custom_block_add_list(&$variables) {
/**
* Page callback: Form constructor for the custom block deletion form.
*
- * @param Drupal\custom_block\Plugin\Core\Entity\CustomBlock $block
+ * @param Drupal\custom_block\Entity\CustomBlock $block
* The custom block to be deleted.
*
* @see custom_block_menu()
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php
index e650389b53c4..23e07e00bad6 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\custom_block\Plugin\Core\Entity\CustomBlockInterface.
+ * Contains \Drupal\custom_block\Entity\CustomBlockInterface.
*/
namespace Drupal\custom_block;
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockRenderController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockRenderController.php
index 00fa8ec6242e..3457115b34e7 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockRenderController.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockRenderController.php
@@ -9,7 +9,7 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityRenderController;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
+use Drupal\entity\Entity\EntityDisplay;
/**
* Render controller for custom blocks.
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeInterface.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeInterface.php
index fbbcd0c2397b..53bfe1b84634 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeInterface.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\custom_block\Plugin\Core\Entity\CustomBlockTypeInterface.
+ * Contains \Drupal\custom_block\Entity\CustomBlockTypeInterface.
*/
namespace Drupal\custom_block;
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
similarity index 98%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php
rename to core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
index 97722f60d19d..a7b36249a0cd 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\custom_block\Plugin\Core\Entity\CustomBlock.
+ * Contains \Drupal\custom_block\Entity\CustomBlock.
*/
-namespace Drupal\custom_block\Plugin\Core\Entity;
+namespace Drupal\custom_block\Entity;
use Drupal\Core\Entity\EntityNG;
use Drupal\Core\Entity\EntityStorageControllerInterface;
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlockType.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php
similarity index 95%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlockType.php
rename to core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php
index 685e370b0211..ec51ca46fd2d 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlockType.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\custom_block\Plugin\Core\Entity\CustomBlockType.
+ * Contains \Drupal\custom_block\Entity\CustomBlockType.
*/
-namespace Drupal\custom_block\Plugin\Core\Entity;
+namespace Drupal\custom_block\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php
index 7c1d7d5c02a8..c59b43542ee6 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php
@@ -25,21 +25,21 @@ class CustomBlockFieldTest extends CustomBlockTestBase {
/**
* The created field.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
protected $field;
/**
* The created instance.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
protected $instance;
/**
* The block type.
*
- * @var \Drupal\custom_block\Plugin\Core\Entity\CustomBlockType
+ * @var \Drupal\custom_block\Entity\CustomBlockType
*/
protected $blockType;
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTestBase.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTestBase.php
index 55d6bb94424b..54c89c8cae16 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTestBase.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTestBase.php
@@ -59,7 +59,7 @@ protected function setUp() {
* @param string $bundle
* (optional) Bundle name. Defaults to 'basic'.
*
- * @return Drupal\custom_block\Plugin\Core\Entity\CustomBlock
+ * @return Drupal\custom_block\Entity\CustomBlock
* Created custom block.
*/
protected function createCustomBlock($title = FALSE, $bundle = 'basic') {
@@ -80,7 +80,7 @@ protected function createCustomBlock($title = FALSE, $bundle = 'basic') {
* @param string $label
* The block type label.
*
- * @return Drupal\custom_block\Plugin\Core\Entity\CustomBlockType
+ * @return Drupal\custom_block\Entity\CustomBlockType
* Created custom block type.
*/
protected function createCustomBlockType($label) {
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTranslationUITest.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTranslationUITest.php
index dbb9aba318b6..77d14b129e80 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTranslationUITest.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTranslationUITest.php
@@ -8,7 +8,7 @@
namespace Drupal\custom_block\Tests;
use Drupal\content_translation\Tests\ContentTranslationUITest;
-use Drupal\custom_block\Plugin\Core\Entity\CustomBlock;
+use Drupal\custom_block\Entity\CustomBlock;
/**
* Tests the Custom Block Translation UI.
@@ -77,7 +77,7 @@ public function getTranslatorPermissions() {
* (optional) Bundle name. When no value is given, defaults to
* $this->bundle. Defaults to FALSE.
*
- * @return Drupal\custom_block\Plugin\Core\Entity\CustomBlock
+ * @return Drupal\custom_block\Entity\CustomBlock
* Created custom block.
*/
protected function createCustomBlock($title = FALSE, $bundle = FALSE) {
diff --git a/core/modules/block/custom_block/tests/modules/custom_block_test/custom_block_test.module b/core/modules/block/custom_block/tests/modules/custom_block_test/custom_block_test.module
index a2961fc641fb..e649f5449442 100644
--- a/core/modules/block/custom_block/tests/modules/custom_block_test/custom_block_test.module
+++ b/core/modules/block/custom_block/tests/modules/custom_block_test/custom_block_test.module
@@ -8,7 +8,7 @@
* interaction with the custom_block module.
*/
-use Drupal\custom_block\Plugin\Core\Entity\CustomBlock;
+use Drupal\custom_block\Entity\CustomBlock;
/**
* Implements hook_custom_block_load().
diff --git a/core/modules/block/lib/Drupal/block/BlockInterface.php b/core/modules/block/lib/Drupal/block/BlockInterface.php
index d06f708ef4f1..0ffbcfcd7994 100644
--- a/core/modules/block/lib/Drupal/block/BlockInterface.php
+++ b/core/modules/block/lib/Drupal/block/BlockInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\block\Plugin\Core\Entity\BlockInterface.
+ * Contains \Drupal\block\Entity\BlockInterface.
*/
namespace Drupal\block;
diff --git a/core/modules/block/lib/Drupal/block/Plugin/Core/Entity/Block.php b/core/modules/block/lib/Drupal/block/Entity/Block.php
similarity index 97%
rename from core/modules/block/lib/Drupal/block/Plugin/Core/Entity/Block.php
rename to core/modules/block/lib/Drupal/block/Entity/Block.php
index e9ee314d4e1e..e465455b4478 100644
--- a/core/modules/block/lib/Drupal/block/Plugin/Core/Entity/Block.php
+++ b/core/modules/block/lib/Drupal/block/Entity/Block.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\block\Plugin\Core\Entity\Block.
+ * Contains \Drupal\block\Entity\Block.
*/
-namespace Drupal\block\Plugin\Core\Entity;
+namespace Drupal\block\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
index d787a3d48f30..1b9c6df91d49 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
@@ -13,7 +13,7 @@
use Drupal\Component\Plugin\Exception\PluginException;
use Drupal\block\BlockStorageController;
use Drupal\Core\Entity\EntityMalformedException;
-use Drupal\block\Plugin\Core\Entity\Block;
+use Drupal\block\Entity\Block;
use Drupal\block\BlockInterface;
/**
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index 42499462b66d..e9e863e785cd 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -8,9 +8,9 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\node\NodeTypeInterface;
use Drupal\Core\Language\Language;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
+use Drupal\entity\Entity\EntityDisplay;
use Drupal\Core\Template\Attribute;
-use Drupal\menu_link\Plugin\Core\Entity\MenuLink;
+use Drupal\menu_link\Entity\MenuLink;
use Drupal\menu_link\MenuLinkStorageController;
use Drupal\node\NodeInterface;
@@ -220,7 +220,7 @@ function book_menu() {
/**
* Access callback: Determines if the book export page is accessible.
*
- * @param \Drupal\node\Plugin\Core\Entity\EntityInterface $node
+ * @param \Drupal\node\Entity\EntityInterface $node
* The node whose export page is to be viewed.
*/
function book_export_access(EntityInterface $node) {
diff --git a/core/modules/book/book.pages.inc b/core/modules/book/book.pages.inc
index 4cd7e2512b5d..31410a767926 100644
--- a/core/modules/book/book.pages.inc
+++ b/core/modules/book/book.pages.inc
@@ -22,7 +22,7 @@
* currently supported in book module:
* - html: Printer-friendly HTML.
* Other types may be supported in contributed modules.
- * @param \Drupal\node\Plugin\Core\Entity\EntityInterface $node
+ * @param \Drupal\node\Entity\EntityInterface $node
* The node to export.
*
* @return
@@ -57,7 +57,7 @@ function book_export($type, EntityInterface $node) {
* look like level 3 sections, no matter their depth relative to the node
* selected to be exported as printer-friendly HTML.
*
- * @param \Drupal\node\Plugin\Core\Entity\Node
+ * @param \Drupal\node\Entity\Node
* The node to export.
*
* @return
diff --git a/core/modules/breakpoint/breakpoint.module b/core/modules/breakpoint/breakpoint.module
index 6cda5e9a9e31..f4aebc88ec85 100644
--- a/core/modules/breakpoint/breakpoint.module
+++ b/core/modules/breakpoint/breakpoint.module
@@ -5,8 +5,8 @@
* Manage breakpoints and breakpoint groups for responsive designs.
*/
-use Drupal\breakpoint\Plugin\Core\Entity\Breakpoint;
-use Drupal\breakpoint\Plugin\Core\Entity\BreakpointGroup;
+use Drupal\breakpoint\Entity\Breakpoint;
+use Drupal\breakpoint\Entity\BreakpointGroup;
use Drupal\Core\Config\Entity\ConfigStorageController;
/**
@@ -294,7 +294,7 @@ function breakpoint_get_module_media_queries($module) {
* @param string $id
* The id of the breakpoint group to load.
*
- * @return \Drupal\breakpoint\Plugin\Core\Entity\BreakpointGroup|null
+ * @return \Drupal\breakpoint\Entity\BreakpointGroup|null
* The breakpoint group, or NULL if there is no entity with the given id.
*
* @todo Remove this in a follow-up issue.
@@ -310,7 +310,7 @@ function breakpoint_group_load($id) {
* @param int $id
* The id of the breakpoint to load.
*
- * @return \Drupal\breakpoint\Plugin\Core\Entity\Breakpoint|null
+ * @return \Drupal\breakpoint\Entity\Breakpoint|null
* The entity object, or NULL if there is no entity with the given id.
*
* @todo Remove this in a follow-up issue.
@@ -364,7 +364,7 @@ function breakpoint_select_options() {
* @param string $source_type
* Either Breakpoint::SOURCE_TYPE_THEME or Breakpoint::SOURCE_TYPE_MODULE.
*
- * @return Drupal\breakpoint\Plugin\Core\Entity\BreakpointGroup
+ * @return Drupal\breakpoint\Entity\BreakpointGroup
*
* @see _breakpoint_import_media_queries()
* @see _breakpoint_import_breakpoint_groups()
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroupInterface.php b/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroupInterface.php
index 3f441e948b4d..59833ff74e98 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroupInterface.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroupInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\breakpoint\Plugin\Core\Entity\BreakpointGroupInterface.
+ * Contains \Drupal\breakpoint\Entity\BreakpointGroupInterface.
*/
namespace Drupal\breakpoint;
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointInterface.php b/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointInterface.php
index ccde947b56fa..cf62bcd9d3b5 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointInterface.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\breakpoint\Plugin\Core\Entity\BreakpointInterface.
+ * Contains \Drupal\breakpoint\Entity\BreakpointInterface.
*/
namespace Drupal\breakpoint;
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/Breakpoint.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php
similarity index 98%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/Breakpoint.php
rename to core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php
index 59c87e9ce164..e8f729421149 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/Breakpoint.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\breakpoint\Plugin\Core\Entity\Breakpoint.
+ * Definition of Drupal\breakpoint\Entity\Breakpoint.
*/
-namespace Drupal\breakpoint\Plugin\Core\Entity;
+namespace Drupal\breakpoint\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\breakpoint\BreakpointInterface;
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/BreakpointGroup.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
similarity index 96%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/BreakpointGroup.php
rename to core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
index 4a34ce290354..774890d3b691 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/BreakpointGroup.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\breakpoint\Plugin\Core\Entity\BreakpointGroup.
+ * Definition of Drupal\breakpoint\Entity\BreakpointGroup.
*/
-namespace Drupal\breakpoint\Plugin\Core\Entity;
+namespace Drupal\breakpoint\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\breakpoint\BreakpointGroupInterface;
@@ -68,7 +68,7 @@ class BreakpointGroup extends ConfigEntityBase implements BreakpointGroupInterfa
* @var array
* Array containing all breakpoints of this group.
*
- * @see Drupal\breakpoint\Plugin\Core\Entity\Breakpoint
+ * @see Drupal\breakpoint\Entity\Breakpoint
*/
public $breakpoints = array();
@@ -89,7 +89,7 @@ class BreakpointGroup extends ConfigEntityBase implements BreakpointGroupInterfa
* Breakpoint::SOURCE_TYPE_MODULE
* Breakpoint::SOURCE_TYPE_USER_DEFINED
*
- * @see Drupal\breakpoint\Plugin\Core\Entity\Breakpoint
+ * @see Drupal\breakpoint\Entity\Breakpoint
*/
public $sourceType = Breakpoint::SOURCE_TYPE_USER_DEFINED;
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointAPITest.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointAPITest.php
index f65b559ac0fa..85d0711fc17d 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointAPITest.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointAPITest.php
@@ -7,7 +7,7 @@
namespace Drupal\breakpoint\Tests;
use Drupal\breakpoint\Tests\BreakpointsTestBase;
-use Drupal\breakpoint\Plugin\Core\Entity\Breakpoint;
+use Drupal\breakpoint\Entity\Breakpoint;
use Drupal\breakpoint\InvalidBreakpointNameException;
use Drupal\breakpoint\InvalidBreakpointSourceException;
use Drupal\breakpoint\InvalidBreakpointSourceTypeException;
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointCRUDTest.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointCRUDTest.php
index 37caff79c2c5..43588699f13d 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointCRUDTest.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointCRUDTest.php
@@ -7,7 +7,7 @@
namespace Drupal\breakpoint\Tests;
use Drupal\breakpoint\Tests\BreakpointTestBase;
-use Drupal\breakpoint\Plugin\Core\Entity\Breakpoint;
+use Drupal\breakpoint\Entity\Breakpoint;
/**
* Tests for breakpoint CRUD operations.
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupAPITest.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupAPITest.php
index d2bc016139e2..3751c813b659 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupAPITest.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupAPITest.php
@@ -7,8 +7,8 @@
namespace Drupal\breakpoint\Tests;
use Drupal\breakpoint\Tests\BreakpointsTestBase;
-use Drupal\breakpoint\Plugin\Core\Entity\BreakpointGroup;
-use Drupal\breakpoint\Plugin\Core\Entity\Breakpoint;
+use Drupal\breakpoint\Entity\BreakpointGroup;
+use Drupal\breakpoint\Entity\Breakpoint;
use Drupal\breakpoint\InvalidBreakpointNameException;
use Drupal\breakpoint\InvalidBreakpointSourceException;
use Drupal\breakpoint\InvalidBreakpointSourceTypeException;
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCRUDTest.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCRUDTest.php
index 05eaeafbc388..bd5a2a841ff3 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCRUDTest.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCRUDTest.php
@@ -7,8 +7,8 @@
namespace Drupal\breakpoint\Tests;
use Drupal\breakpoint\Tests\BreakpointGroupTestBase;
-use Drupal\breakpoint\Plugin\Core\Entity\BreakpointGroup;
-use Drupal\breakpoint\Plugin\Core\Entity\Breakpoint;
+use Drupal\breakpoint\Entity\BreakpointGroup;
+use Drupal\breakpoint\Entity\Breakpoint;
/**
* Tests for breakpoint group CRUD operations.
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupTestBase.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupTestBase.php
index ee1e57dd758f..0f7e471788cd 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupTestBase.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupTestBase.php
@@ -7,7 +7,7 @@
namespace Drupal\breakpoint\Tests;
use Drupal\simpletest\WebTestBase;
-use Drupal\breakpoint\Plugin\Core\Entity\BreakpointGroup;
+use Drupal\breakpoint\Entity\BreakpointGroup;
/**
* Base class for Breakpoint group tests.
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointTestBase.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointTestBase.php
index cca4d62e08a7..89d0cc1bf563 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointTestBase.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointTestBase.php
@@ -7,7 +7,7 @@
namespace Drupal\breakpoint\Tests;
use Drupal\simpletest\WebTestBase;
-use Drupal\breakpoint\Plugin\Core\Entity\Breakpoint;
+use Drupal\breakpoint\Entity\Breakpoint;
/**
* Base class for Breakpoint tests.
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php
index 0091300a2b06..dde38a055961 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php
@@ -7,8 +7,8 @@
namespace Drupal\breakpoint\Tests;
use Drupal\breakpoint\Tests\BreakpointGroupTestBase;
-use Drupal\breakpoint\Plugin\Core\Entity\BreakpointGroup;
-use Drupal\breakpoint\Plugin\Core\Entity\Breakpoint;
+use Drupal\breakpoint\Entity\BreakpointGroup;
+use Drupal\breakpoint\Entity\Breakpoint;
/**
* Test breakpoints provided by themes.
diff --git a/core/modules/breakpoint/tests/Drupal/breakpoint/Tests/BreakpointMediaQueryTest.php b/core/modules/breakpoint/tests/Drupal/breakpoint/Tests/BreakpointMediaQueryTest.php
index 1e2524f51973..11866190cf42 100644
--- a/core/modules/breakpoint/tests/Drupal/breakpoint/Tests/BreakpointMediaQueryTest.php
+++ b/core/modules/breakpoint/tests/Drupal/breakpoint/Tests/BreakpointMediaQueryTest.php
@@ -7,7 +7,7 @@
namespace Drupal\breakpoint\Tests;
use Drupal\Tests\UnitTestCase;
-use Drupal\breakpoint\Plugin\Core\Entity\Breakpoint;
+use Drupal\breakpoint\Entity\Breakpoint;
use Drupal\breakpoint\InvalidBreakpointMediaQueryException;
/**
diff --git a/core/modules/ckeditor/ckeditor.api.php b/core/modules/ckeditor/ckeditor.api.php
index 0b4f343522db..3f08460733b3 100644
--- a/core/modules/ckeditor/ckeditor.api.php
+++ b/core/modules/ckeditor/ckeditor.api.php
@@ -5,7 +5,7 @@
* Documentation for CKEditor module APIs.
*/
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
/**
* @addtogroup hooks
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginBase.php b/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginBase.php
index 34ab0bd150b3..05e6b0db271e 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginBase.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginBase.php
@@ -8,7 +8,7 @@
namespace Drupal\ckeditor;
use Drupal\Component\Plugin\PluginBase;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
/**
* Defines a base CKEditor plugin implementation.
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginConfigurableInterface.php b/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginConfigurableInterface.php
index 9d0162548a83..ba3ce86ea7cc 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginConfigurableInterface.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginConfigurableInterface.php
@@ -7,7 +7,7 @@
namespace Drupal\ckeditor;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
/**
* Defines an interface for configurable CKEditor plugins.
@@ -34,7 +34,7 @@ interface CKEditorPluginConfigurableInterface extends CKEditorPluginInterface {
* An empty form array to be populated with a configuration form, if any.
* @param array $form_state
* The state of the entire filter administration form.
- * @param \Drupal\editor\Plugin\Core\Entity\Editor $editor
+ * @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
*
* @return array|FALSE
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginContextualInterface.php b/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginContextualInterface.php
index b1b88dfc1f46..a2707421b91a 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginContextualInterface.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginContextualInterface.php
@@ -7,7 +7,7 @@
namespace Drupal\ckeditor;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
/**
* Defines an interface for contextually enabled CKEditor plugins.
@@ -29,7 +29,7 @@ interface CKEditorPluginContextualInterface extends CKEditorPluginInterface {
*
* The editor's settings can be found in $editor->settings.
*
- * @param \Drupal\editor\Plugin\Core\Entity\Editor $editor
+ * @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
*
* @return bool
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginInterface.php b/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginInterface.php
index 58c83ac55c7b..c070fbd9f248 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginInterface.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginInterface.php
@@ -8,7 +8,7 @@
namespace Drupal\ckeditor;
use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
/**
* Defines an interface for (loading of) CKEditor plugins.
@@ -43,7 +43,7 @@ public function isInternal();
/**
* Returns a list of plugins this plugin requires.
*
- * @param \Drupal\editor\Plugin\Core\Entity\Editor $editor
+ * @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
* @return array
* An unindexed array of plugin names this plugin requires. Each plugin is
@@ -57,7 +57,7 @@ public function getDependencies(Editor $editor);
* These libraries will be attached to the text_format element on which the
* editor is being loaded.
*
- * @param \Drupal\editor\Plugin\Core\Entity\Editor $editor
+ * @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
* @return array
* An array of libraries suitable for usage in a render API #attached
@@ -85,7 +85,7 @@ public function getFile();
* If there are plugin-specific settings (verify with isset()), they can be
* found at $editor->settings['plugins'][$plugin_id].
*
- * @param \Drupal\editor\Plugin\Core\Entity\Editor $editor
+ * @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
* @return array
* A keyed array, whose keys will end up as keys under CKEDITOR.config.
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginManager.php b/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginManager.php
index 555eae390b8b..dc69f7e0594c 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginManager.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginManager.php
@@ -12,7 +12,7 @@
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Language\LanguageManager;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
/**
* CKEditor Plugin manager.
@@ -54,7 +54,7 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac
* even implicitly loaded (i.e. internal) plugins, then set the optional
* second parameter.
*
- * @param \Drupal\editor\Plugin\Core\Entity\Editor $editor
+ * @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
* @param bool $include_internal_plugins
* Defaults to FALSE. When set to TRUE, plugins whose isInternal() method
@@ -137,7 +137,7 @@ public function getButtons() {
* A reference to an associative array containing the structure of the form.
* @param array &$form_state
* A reference to a keyed array containing the current state of the form.
- * @param \Drupal\editor\Plugin\Core\Entity\Editor $editor
+ * @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
*/
public function injectPluginSettingsForm(array &$form, array &$form_state, Editor $editor) {
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php
index 84c31b241465..c1e2f94493b9 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php
@@ -10,7 +10,7 @@
use Drupal\ckeditor\CKEditorPluginBase;
use Drupal\ckeditor\Annotation\CKEditorPlugin;
use Drupal\Core\Annotation\Translation;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
/**
* Defines the "drupalimage" plugin.
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php
index a60314c60b8e..e9e193b9c9bf 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php
@@ -10,7 +10,7 @@
use Drupal\ckeditor\CKEditorPluginBase;
use Drupal\ckeditor\Annotation\CKEditorPlugin;
use Drupal\Core\Annotation\Translation;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
/**
* Defines the "drupallink" plugin.
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php
index f5c505f3ad69..75a97bf2a04e 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php
@@ -11,7 +11,7 @@
use Drupal\Component\Utility\NestedArray;
use Drupal\ckeditor\Annotation\CKEditorPlugin;
use Drupal\Core\Annotation\Translation;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
/**
* Defines the "internal" plugin (i.e. core plugins part of our CKEditor build).
@@ -241,7 +241,7 @@ public function getButtons() {
*
* @see getConfig()
*
- * @param \Drupal\editor\Plugin\Core\Entity\Editor $editor
+ * @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
*
* @return array
@@ -275,7 +275,7 @@ protected function generateFormatTagsSetting(Editor $editor) {
*
* @see getConfig()
*
- * @param \Drupal\editor\Plugin\Core\Entity\Editor $editor
+ * @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
*
* @return string|TRUE
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php
index d28ff6ff3494..3adb74fbd367 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php
@@ -12,7 +12,7 @@
use Drupal\Component\Utility\NestedArray;
use Drupal\ckeditor\Annotation\CKEditorPlugin;
use Drupal\Core\Annotation\Translation;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
/**
* Defines the "stylescombo" plugin.
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
index 1ed57a661f6e..1faaa0506fa8 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
@@ -13,7 +13,7 @@
use Drupal\editor\Annotation\Editor;
use Drupal\Core\Annotation\Translation;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\editor\Plugin\Core\Entity\Editor as EditorEntity;
+use Drupal\editor\Entity\Editor as EditorEntity;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -252,7 +252,7 @@ public function getLibraries(EditorEntity $editor) {
*
* @see getJSSettings()
*
- * @param \Drupal\editor\Plugin\Core\Entity\Editor $editor
+ * @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
* @return array
* An array containing the "toolbar" configuration.
@@ -283,7 +283,7 @@ public function buildToolbarJSSetting(EditorEntity $editor) {
*
* @see getJSSettings()
*
- * @param \Drupal\editor\Plugin\Core\Entity\Editor $editor
+ * @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
* @return array
* An array containing the "contentsCss" configuration.
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php
index bf1c30e67f58..e0e3cac88d1b 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php
@@ -7,7 +7,7 @@
namespace Drupal\ckeditor\Tests;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
use Drupal\simpletest\WebTestBase;
/**
diff --git a/core/modules/ckeditor/tests/modules/ckeditor_test.module b/core/modules/ckeditor/tests/modules/ckeditor_test.module
index e97c019fec40..a75ad86354cc 100644
--- a/core/modules/ckeditor/tests/modules/ckeditor_test.module
+++ b/core/modules/ckeditor/tests/modules/ckeditor_test.module
@@ -5,7 +5,7 @@
* Helper module for the CKEditor tests.
*/
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
/**
* Implements hook_ckeditor_css_alter().
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php
index f8c7443cc84f..8eccb434aac9 100644
--- a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php
+++ b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php
@@ -11,7 +11,7 @@
use Drupal\Component\Plugin\PluginBase;
use Drupal\ckeditor\Annotation\CKEditorPlugin;
use Drupal\Core\Annotation\Translation;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
/**
* Defines the "Llama" plugin, with a CKEditor "llama" feature.
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php
index e36ad314d72a..e2fb4b914199 100644
--- a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php
+++ b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php
@@ -11,7 +11,7 @@
use Drupal\Component\Plugin\PluginBase;
use Drupal\ckeditor\Annotation\CKEditorPlugin;
use Drupal\Core\Annotation\Translation;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
/**
* Defines a "Llama" plugin, with a contextually enabled "llama" feature.
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
index e6a60f429a14..87ec5a74e578 100644
--- a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
+++ b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
@@ -13,7 +13,7 @@
use Drupal\Component\Plugin\PluginBase;
use Drupal\ckeditor\Annotation\CKEditorPlugin;
use Drupal\Core\Annotation\Translation;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
/**
* Defines a "LlamaContextualAndbutton" plugin, with a contextually OR toolbar
diff --git a/core/modules/comment/comment.admin.inc b/core/modules/comment/comment.admin.inc
index ac186ccbcfde..4360918e3329 100644
--- a/core/modules/comment/comment.admin.inc
+++ b/core/modules/comment/comment.admin.inc
@@ -5,7 +5,7 @@
* Admin page callbacks for the Comment module.
*/
-use Drupal\comment\Plugin\Core\Entity\Comment;
+use Drupal\comment\Entity\Comment;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -270,7 +270,7 @@ function comment_multiple_delete_confirm_submit($form, &$form_state) {
/**
* Page callback: Shows a confirmation page for comment deletions.
*
- * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment
+ * @param \Drupal\comment\Entity\Comment $comment
* The comment entity that is about to be deleted.
*
* @see comment_menu()
diff --git a/core/modules/comment/comment.api.php b/core/modules/comment/comment.api.php
index ec1707f599e3..a613825f74ff 100644
--- a/core/modules/comment/comment.api.php
+++ b/core/modules/comment/comment.api.php
@@ -54,10 +54,10 @@ function hook_comment_update(Drupal\comment\Comment $comment) {
* This hook runs after a new comment object has just been instantiated. It can
* be used to set initial values, e.g. to provide defaults.
*
- * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment
+ * @param \Drupal\comment\Entity\Comment $comment
* The comment object.
*/
-function hook_comment_create(\Drupal\comment\Plugin\Core\Entity\Comment $comment) {
+function hook_comment_create(\Drupal\comment\Entity\Comment $comment) {
if (!isset($comment->foo)) {
$comment->foo = 'some_initial_value';
}
@@ -79,9 +79,9 @@ function hook_comment_load(Drupal\comment\Comment $comments) {
/**
* Act on a comment that is being assembled before rendering.
*
- * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment $comment
+ * @param \Drupal\comment\Entity\Comment $comment $comment
* Passes in the comment the action is being performed on.
- * @param \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display
+ * @param \Drupal\entity\Entity\EntityDisplay $display
* The entity_display object holding the display options configured for the
* comment components.
* @param $view_mode
@@ -91,7 +91,7 @@ function hook_comment_load(Drupal\comment\Comment $comments) {
*
* @see hook_entity_view()
*/
-function hook_comment_view(\Drupal\comment\Plugin\Core\Entity\Comment $comment, \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display, $view_mode, $langcode) {
+function hook_comment_view(\Drupal\comment\Entity\Comment $comment, \Drupal\entity\Entity\EntityDisplay $display, $view_mode, $langcode) {
// Only do the extra work if the component is configured to be displayed.
// This assumes a 'mymodule_addition' extra field has been defined for the
// node type in hook_field_extra_fields().
@@ -117,16 +117,16 @@ function hook_comment_view(\Drupal\comment\Plugin\Core\Entity\Comment $comment,
*
* @param $build
* A renderable array representing the comment.
- * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment
+ * @param \Drupal\comment\Entity\Comment $comment
* The comment being rendered.
- * @param \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display
+ * @param \Drupal\entity\Entity\EntityDisplay $display
* The entity_display object holding the display options configured for the
* comment components.
*
* @see comment_view()
* @see hook_entity_view_alter()
*/
-function hook_comment_view_alter(&$build, \Drupal\comment\Plugin\Core\Entity\Comment $comment, \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display) {
+function hook_comment_view_alter(&$build, \Drupal\comment\Entity\Comment $comment, \Drupal\entity\Entity\EntityDisplay $display) {
// Check for the existence of a field added by another module.
if ($build['#view_mode'] == 'full' && isset($build['an_additional_field'])) {
// Change its weight.
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 1af78a5e75df..b7869fbe8acb 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -10,8 +10,8 @@
*/
use Drupal\node\NodeTypeInterface;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
-use Drupal\file\Plugin\Core\Entity\File;
+use Drupal\entity\Entity\EntityDisplay;
+use Drupal\file\Entity\File;
use Drupal\Core\Entity\EntityInterface;
use Drupal\node\NodeInterface;
use Symfony\Component\HttpFoundation\Request;
@@ -78,7 +78,7 @@
*/
const COMMENT_NODE_OPEN = 2;
-use Drupal\comment\Plugin\Core\Entity\Comment;
+use Drupal\comment\Entity\Comment;
/**
* Implements hook_help().
@@ -1476,7 +1476,7 @@ function comment_preprocess_block(&$variables) {
* This helper handles anonymous authors in addition to registered comment
* authors.
*
- * @return \Drupal\user\Plugin\Core\Entity\User
+ * @return \Drupal\user\Entity\User
* A user account, for use with theme_username() or the user_picture template.
*/
function comment_prepare_author(Comment $comment) {
diff --git a/core/modules/comment/comment.pages.inc b/core/modules/comment/comment.pages.inc
index 221fbfcd8ad6..b11b4938be51 100644
--- a/core/modules/comment/comment.pages.inc
+++ b/core/modules/comment/comment.pages.inc
@@ -6,7 +6,7 @@
*/
use Drupal\Core\Entity\EntityInterface;
-use Drupal\comment\Plugin\Core\Entity\Comment;
+use Drupal\comment\Entity\Comment;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
diff --git a/core/modules/comment/lib/Drupal/comment/CommentAccessController.php b/core/modules/comment/lib/Drupal/comment/CommentAccessController.php
index 98e03e10f17e..800991f6fa0e 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentAccessController.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentAccessController.php
@@ -14,7 +14,7 @@
/**
* Access controller for the comment entity.
*
- * @see \Drupal\comment\Plugin\Core\Entity\Comment.
+ * @see \Drupal\comment\Entity\Comment.
*/
class CommentAccessController extends EntityAccessController {
diff --git a/core/modules/comment/lib/Drupal/comment/CommentInterface.php b/core/modules/comment/lib/Drupal/comment/CommentInterface.php
index e586087b7397..6ac0a55d81e8 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentInterface.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\comment\Plugin\Core\Entity\CommentInterface.
+ * Contains \Drupal\comment\Entity\CommentInterface.
*/
namespace Drupal\comment;
diff --git a/core/modules/comment/lib/Drupal/comment/CommentRenderController.php b/core/modules/comment/lib/Drupal/comment/CommentRenderController.php
index c6b21f0d8c6b..641c56673c3c 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentRenderController.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentRenderController.php
@@ -9,7 +9,7 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityRenderController;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
+use Drupal\entity\Entity\EntityDisplay;
/**
* Render controller for comments.
diff --git a/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php b/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php
index 6bd628e50123..4d1af2518fd9 100644
--- a/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php
+++ b/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php
@@ -8,7 +8,7 @@
namespace Drupal\comment\Controller;
use Drupal\comment\CommentInterface;
-use Drupal\comment\Plugin\Core\Entity\Comment;
+use Drupal\comment\Entity\Comment;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Routing\PathBasedGeneratorInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -21,7 +21,7 @@
/**
* Controller for the comment entity.
*
- * @see \Drupal\comment\Plugin\Core\Entity\Comment.
+ * @see \Drupal\comment\Entity\Comment.
*/
class CommentController implements ControllerInterface {
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
similarity index 98%
rename from core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php
rename to core/modules/comment/lib/Drupal/comment/Entity/Comment.php
index 2b711dda3a5f..4774ec56a864 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\comment\Plugin\Core\Entity\Comment.
+ * Definition of Drupal\comment\Entity\Comment.
*/
-namespace Drupal\comment\Plugin\Core\Entity;
+namespace Drupal\comment\Entity;
use Drupal\Core\Entity\EntityNG;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
index 0d27bf970ec5..0f5804902f08 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
@@ -8,7 +8,7 @@
namespace Drupal\comment\Tests;
use Drupal\Core\Language\Language;
-use Drupal\comment\Plugin\Core\Entity\Comment;
+use Drupal\comment\Entity\Comment;
use Drupal\simpletest\WebTestBase;
/**
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/CommentTestBase.php b/core/modules/comment/lib/Drupal/comment/Tests/Views/CommentTestBase.php
index dabf53f0246a..7027ef46d815 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/Views/CommentTestBase.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/Views/CommentTestBase.php
@@ -25,7 +25,7 @@ abstract class CommentTestBase extends ViewTestBase {
/**
* Stores a comment used by the tests.
*
- * @var \Drupal\comment\Plugin\Core\Entity\Comment
+ * @var \Drupal\comment\Entity\Comment
*/
public $comment;
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
index f97d6cf46b57..ed1f69fa64f9 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
@@ -8,7 +8,7 @@
namespace Drupal\config\Tests;
use Drupal\simpletest\WebTestBase;
-use Drupal\config_test\Plugin\Core\Entity\ConfigTest;
+use Drupal\config_test\Entity\ConfigTest;
use Drupal\Core\Entity\EntityStorageControllerInterface;
/**
diff --git a/core/modules/config/tests/config_test/config_test.module b/core/modules/config/tests/config_test/config_test.module
index 41e7c626a7ce..a985921b50a7 100644
--- a/core/modules/config/tests/config_test/config_test.module
+++ b/core/modules/config/tests/config_test/config_test.module
@@ -5,7 +5,7 @@
* Provides Config module hook implementations for testing purposes.
*/
-use Drupal\config_test\Plugin\Core\Entity\ConfigTest;
+use Drupal\config_test\Entity\ConfigTest;
use Symfony\Component\HttpFoundation\RedirectResponse;
require_once dirname(__FILE__) . '/config_test.hooks.inc';
@@ -13,7 +13,7 @@
/**
* Entity URI callback.
*
- * @param Drupal\config_test\Plugin\Core\Entity\ConfigTest $config_test
+ * @param Drupal\config_test\Entity\ConfigTest $config_test
* A ConfigTest entity.
*/
function config_test_uri(ConfigTest $config_test) {
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php
index 0888dba5f60b..7b4d95e8a9ab 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php
@@ -7,7 +7,7 @@
namespace Drupal\config_test;
-use Drupal\config_test\Plugin\Core\Entity\ConfigTest;
+use Drupal\config_test\Entity\ConfigTest;
use Drupal\Component\Utility\String;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -20,7 +20,7 @@ class ConfigTestController {
/**
* Presents the ConfigTest edit form.
*
- * @param \Drupal\config_test\Plugin\Core\Entity\ConfigTest $config_test
+ * @param \Drupal\config_test\Entity\ConfigTest $config_test
* The ConfigTest object to edit.
*
* @return array
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestInterface.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestInterface.php
index 2752b9cfdf9c..87e558be948a 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestInterface.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\config_test\Plugin\Core\Entity\ConfigTestInterface.
+ * Contains \Drupal\config_test\Entity\ConfigTestInterface.
*/
namespace Drupal\config_test;
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigQueryTest.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php
similarity index 90%
rename from core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigQueryTest.php
rename to core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php
index b62538e26490..e909f4d1eefc 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigQueryTest.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\config_test\Plugin\Core\Entity\ConfigQueryTest.
+ * Contains \Drupal\config_test\Entity\ConfigQueryTest.
*/
-namespace Drupal\config_test\Plugin\Core\Entity;
+namespace Drupal\config_test\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php
similarity index 95%
rename from core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php
rename to core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php
index dc76288c29b9..eab1598c57ca 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\config_test\Plugin\Core\Entity\ConfigTest.
+ * Definition of Drupal\config_test\Entity\ConfigTest.
*/
-namespace Drupal\config_test\Plugin\Core\Entity;
+namespace Drupal\config_test\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module
index 74cfb1e22458..2b1d8bffc3d5 100644
--- a/core/modules/contact/contact.module
+++ b/core/modules/contact/contact.module
@@ -5,7 +5,7 @@
* Enables the use of personal and site-wide contact forms.
*/
-use Drupal\contact\Plugin\Core\Entity\Category;
+use Drupal\contact\Entity\Category;
use Drupal\user\UserInterface;
/**
@@ -233,7 +233,7 @@ function contact_field_extra_fields() {
* @param $id
* The ID of the contact category to load.
*
- * @return \Drupal\contact\Plugin\Core\Entity\Category|null
+ * @return \Drupal\contact\Entity\Category|null
* A Category object or NULL if the requested $id does not exist.
*/
function contact_category_load($id) {
@@ -243,7 +243,7 @@ function contact_category_load($id) {
/**
* Entity URI callback.
*
- * @param Drupal\contact\Plugin\Core\Entity\Category $category
+ * @param Drupal\contact\Entity\Category $category
* A contact category entity.
*
* @return array
diff --git a/core/modules/contact/contact.pages.inc b/core/modules/contact/contact.pages.inc
index c7b7539fc18f..b6da2ec5a76e 100644
--- a/core/modules/contact/contact.pages.inc
+++ b/core/modules/contact/contact.pages.inc
@@ -5,14 +5,14 @@
* Page callbacks for the Contact module.
*/
-use Drupal\contact\Plugin\Core\Entity\Category;
+use Drupal\contact\Entity\Category;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Page callback: Presents the site-wide contact form.
*
- * @param Drupal\contact\Plugin\Core\Entity\Category $category
+ * @param Drupal\contact\Entity\Category $category
* (optional) The contact category to use.
*
* @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
diff --git a/core/modules/contact/lib/Drupal/contact/CategoryAccessController.php b/core/modules/contact/lib/Drupal/contact/CategoryAccessController.php
index ca6ca90e8dd4..ba0bab789fa0 100644
--- a/core/modules/contact/lib/Drupal/contact/CategoryAccessController.php
+++ b/core/modules/contact/lib/Drupal/contact/CategoryAccessController.php
@@ -13,7 +13,7 @@
/**
* Defines an access controller for the contact category entity.
*
- * @see \Drupal\contact\Plugin\Core\Entity\Category.
+ * @see \Drupal\contact\Entity\Category.
*/
class CategoryAccessController extends EntityAccessController {
diff --git a/core/modules/contact/lib/Drupal/contact/CategoryInterface.php b/core/modules/contact/lib/Drupal/contact/CategoryInterface.php
index 549b51573c80..0f3dd5bf2023 100644
--- a/core/modules/contact/lib/Drupal/contact/CategoryInterface.php
+++ b/core/modules/contact/lib/Drupal/contact/CategoryInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\contact\Plugin\Core\Entity\CategoryInterface.
+ * Contains \Drupal\contact\Entity\CategoryInterface.
*/
namespace Drupal\contact;
diff --git a/core/modules/contact/lib/Drupal/contact/Plugin/Core/Entity/Category.php b/core/modules/contact/lib/Drupal/contact/Entity/Category.php
similarity index 95%
rename from core/modules/contact/lib/Drupal/contact/Plugin/Core/Entity/Category.php
rename to core/modules/contact/lib/Drupal/contact/Entity/Category.php
index 0b3323f35238..194f12c3e340 100644
--- a/core/modules/contact/lib/Drupal/contact/Plugin/Core/Entity/Category.php
+++ b/core/modules/contact/lib/Drupal/contact/Entity/Category.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\contact\Plugin\Core\Entity\Category.
+ * Definition of Drupal\contact\Entity\Category.
*/
-namespace Drupal\contact\Plugin\Core\Entity;
+namespace Drupal\contact\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\EntityStorageControllerInterface;
diff --git a/core/modules/contact/lib/Drupal/contact/Plugin/Core/Entity/Message.php b/core/modules/contact/lib/Drupal/contact/Entity/Message.php
similarity index 96%
rename from core/modules/contact/lib/Drupal/contact/Plugin/Core/Entity/Message.php
rename to core/modules/contact/lib/Drupal/contact/Entity/Message.php
index a7ae2b3a2f12..0c398d921102 100644
--- a/core/modules/contact/lib/Drupal/contact/Plugin/Core/Entity/Message.php
+++ b/core/modules/contact/lib/Drupal/contact/Entity/Message.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains Drupal\contact\Plugin\Core\Entity\Message.
+ * Contains Drupal\contact\Entity\Message.
*/
-namespace Drupal\contact\Plugin\Core\Entity;
+namespace Drupal\contact\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/contact/lib/Drupal/contact/MessageInterface.php b/core/modules/contact/lib/Drupal/contact/MessageInterface.php
index b499ec081f8e..bf797e43a327 100644
--- a/core/modules/contact/lib/Drupal/contact/MessageInterface.php
+++ b/core/modules/contact/lib/Drupal/contact/MessageInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\contact\Plugin\Core\Entity\MessageInterface.
+ * Contains \Drupal\contact\Entity\MessageInterface.
*/
namespace Drupal\contact;
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/MessageEntityTest.php b/core/modules/contact/lib/Drupal/contact/Tests/MessageEntityTest.php
index c9e2e5d69c15..49c73d7ae529 100644
--- a/core/modules/contact/lib/Drupal/contact/Tests/MessageEntityTest.php
+++ b/core/modules/contact/lib/Drupal/contact/Tests/MessageEntityTest.php
@@ -6,13 +6,13 @@
namespace Drupal\contact\Tests;
-use Drupal\contact\Plugin\Core\Entity\Message;
+use Drupal\contact\Entity\Message;
use Drupal\simpletest\DrupalUnitTestBase;
/**
* Tests the message entity class.
*
- * @see \Drupal\contact\Plugin\Core\Entity\Message
+ * @see \Drupal\contact\Entity\Message
*/
class MessageEntityTest extends DrupalUnitTestBase {
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php b/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php
index 166a64bb43b6..1e835e26a4aa 100644
--- a/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php
+++ b/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php
@@ -24,7 +24,7 @@ class ContactFieldsTest extends ViewTestBase {
/**
* Contains the field definition array attached to contact used for this test.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
protected $field;
diff --git a/core/modules/content_translation/content_translation.admin.inc b/core/modules/content_translation/content_translation.admin.inc
index 63e71fc2d1c2..97cbfa9dd711 100644
--- a/core/modules/content_translation/content_translation.admin.inc
+++ b/core/modules/content_translation/content_translation.admin.inc
@@ -7,15 +7,15 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Language\Language;
-use Drupal\field\Plugin\Core\Entity\Field;
-use Drupal\field\Plugin\Core\Entity\FieldInstance;
+use Drupal\field\Entity\Field;
+use Drupal\field\Entity\FieldInstance;
/**
* Returns a form element to configure field synchronization.
*
- * @param \Drupal\field\Plugin\Core\Entity\Field $field
+ * @param \Drupal\field\Entity\Field $field
* A field definition array.
- * @param \Drupal\field\Plugin\Core\Entity\FieldInstance $instance
+ * @param \Drupal\field\Entity\FieldInstance $instance
* A field instance definition object.
*
* @return array
diff --git a/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php b/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php
index af66e0deda70..867e67d2f059 100644
--- a/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php
+++ b/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php
@@ -26,14 +26,14 @@ class DatetimeFieldTest extends WebTestBase {
/**
* A field to use in this test class.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
protected $field;
/**
* The instance used in this test class.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
protected $instance;
diff --git a/core/modules/edit/edit.module b/core/modules/edit/edit.module
index a7fbb5d84259..a09889ccc83f 100644
--- a/core/modules/edit/edit.module
+++ b/core/modules/edit/edit.module
@@ -14,7 +14,7 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\edit\Form\EditFieldForm;
use Drupal\Component\Utility\NestedArray;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
+use Drupal\entity\Entity\EntityDisplay;
use Drupal\user\TempStoreFactory;
/**
diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index af2b8ea07584..e9a44f06b8c9 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -5,8 +5,8 @@
* Adds bindings for client-side "text editors" to text formats.
*/
-use Drupal\file\Plugin\Core\Entity\File;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\file\Entity\File;
+use Drupal\editor\Entity\Editor;
use Drupal\Component\Utility\NestedArray;
/**
@@ -319,7 +319,7 @@ function editor_form_filter_admin_format_submit($form, &$form_state) {
/**
* Loads an individual configured text editor based on text format ID.
*
- * @return \Drupal\editor\Plugin\Core\Entity\Editor|null
+ * @return \Drupal\editor\Entity\Editor|null
* A text editor object, or NULL.
*/
function editor_load($format_id) {
diff --git a/core/modules/editor/lib/Drupal/editor/EditorController.php b/core/modules/editor/lib/Drupal/editor/EditorController.php
index e53a4c254c3f..488c4895ec29 100644
--- a/core/modules/editor/lib/Drupal/editor/EditorController.php
+++ b/core/modules/editor/lib/Drupal/editor/EditorController.php
@@ -15,7 +15,7 @@
use Drupal\editor\Ajax\GetUntransformedTextCommand;
use Drupal\editor\Form\EditorImageDialog;
use Drupal\editor\Form\EditorLinkDialog;
-use Drupal\filter\Plugin\Core\Entity\FilterFormat;
+use Drupal\filter\Entity\FilterFormat;
/**
* Returns responses for Editor module routes.
diff --git a/core/modules/editor/lib/Drupal/editor/EditorInterface.php b/core/modules/editor/lib/Drupal/editor/EditorInterface.php
index de6948851637..ffd457e7db43 100644
--- a/core/modules/editor/lib/Drupal/editor/EditorInterface.php
+++ b/core/modules/editor/lib/Drupal/editor/EditorInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\editor\Plugin\Core\Entity\EditPluginInterface.
+ * Contains \Drupal\editor\Entity\EditPluginInterface.
*/
namespace Drupal\editor;
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/Core/Entity/Editor.php b/core/modules/editor/lib/Drupal/editor/Entity/Editor.php
similarity index 95%
rename from core/modules/editor/lib/Drupal/editor/Plugin/Core/Entity/Editor.php
rename to core/modules/editor/lib/Drupal/editor/Entity/Editor.php
index 710b991d91f4..1183f80f8095 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/Core/Entity/Editor.php
+++ b/core/modules/editor/lib/Drupal/editor/Entity/Editor.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\editor\Plugin\Core\Entity\Editor.
+ * Contains \Drupal\editor\Entity\Editor.
*/
-namespace Drupal\editor\Plugin\Core\Entity;
+namespace Drupal\editor\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php b/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php
index dcc78a5e828d..b20f35f50c81 100644
--- a/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php
+++ b/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php
@@ -8,7 +8,7 @@
namespace Drupal\editor\Form;
use Drupal\Core\Form\FormInterface;
-use Drupal\filter\Plugin\Core\Entity\FilterFormat;
+use Drupal\filter\Entity\FilterFormat;
use Drupal\Core\Ajax\AjaxResponse;
use Drupal\Core\Ajax\HtmlCommand;
use Drupal\editor\Ajax\EditorDialogSave;
@@ -29,7 +29,7 @@ public function getFormID() {
/**
* {@inheritdoc}
*
- * @param \Drupal\filter\Plugin\Core\Entity\FilterFormat $filter_format
+ * @param \Drupal\filter\Entity\FilterFormat $filter_format
* The filter format for which this dialog corresponds.
*/
public function buildForm(array $form, array &$form_state, FilterFormat $filter_format = NULL) {
diff --git a/core/modules/editor/lib/Drupal/editor/Form/EditorLinkDialog.php b/core/modules/editor/lib/Drupal/editor/Form/EditorLinkDialog.php
index 3be9c82b033e..e79668709d1f 100644
--- a/core/modules/editor/lib/Drupal/editor/Form/EditorLinkDialog.php
+++ b/core/modules/editor/lib/Drupal/editor/Form/EditorLinkDialog.php
@@ -8,7 +8,7 @@
namespace Drupal\editor\Form;
use Drupal\Core\Form\FormInterface;
-use Drupal\filter\Plugin\Core\Entity\FilterFormat;
+use Drupal\filter\Entity\FilterFormat;
use Drupal\Core\Ajax\AjaxResponse;
use Drupal\Core\Ajax\HtmlCommand;
use Drupal\editor\Ajax\EditorDialogSave;
@@ -29,7 +29,7 @@ public function getFormID() {
/**
* {@inheritdoc}
*
- * @param \Drupal\filter\Plugin\Core\Entity\FilterFormat $filter_format
+ * @param \Drupal\filter\Entity\FilterFormat $filter_format
* The filter format for which this dialog corresponds.
*/
public function buildForm(array $form, array &$form_state, FilterFormat $filter_format = NULL) {
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php b/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php
index 6993ed68a041..eabb3e1b6dab 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php
@@ -8,7 +8,7 @@
namespace Drupal\editor\Plugin;
use Drupal\Component\Plugin\PluginBase;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
use Drupal\editor\Plugin\EditorPluginInterface;
/**
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php b/core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php
index c64a303aaa4c..87f8840596bf 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php
@@ -8,7 +8,7 @@
namespace Drupal\editor\Plugin;
use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\editor\Plugin\Core\Entity\Editor;
+use Drupal\editor\Entity\Editor;
/**
* Defines an interface for configurable text editors.
@@ -24,7 +24,7 @@ interface EditorPluginInterface extends PluginInspectionInterface {
*
* @return array
* An array of settings as they would be stored by a configured text editor
- * entity (\Drupal\editor\Plugin\Core\Entity\Editor).
+ * entity (\Drupal\editor\Entity\Editor).
*/
function getDefaultSettings();
@@ -40,7 +40,7 @@ function getDefaultSettings();
* An empty form array to be populated with a configuration form, if any.
* @param array $form_state
* The state of the entire filter administration form.
- * @param \Drupal\editor\Plugin\Core\Entity\Editor $editor
+ * @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
*
* @return array
@@ -83,7 +83,7 @@ function settingsFormSubmit(array $form, array &$form_state);
* of the text editor into JavaScript variables that will be accessible when
* the text editor is loaded.
*
- * @param \Drupal\editor\Plugin\Core\Entity\Editor $editor
+ * @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
*
* @return array
@@ -102,7 +102,7 @@ function getJSSettings(Editor $editor);
* different library for different configurations, instead of being forced to
* always use the same method.
*
- * @param \Drupal\editor\Plugin\Core\Entity\Editor $editor
+ * @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
*
* @return array
diff --git a/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php b/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php
index d87a4e892d50..ba260f205ea1 100644
--- a/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php
+++ b/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php
@@ -10,7 +10,7 @@
use Drupal\editor\Plugin\EditorBase;
use Drupal\editor\Annotation\Editor;
use Drupal\Core\Annotation\Translation;
-use Drupal\editor\Plugin\Core\Entity\Editor as EditorEntity;
+use Drupal\editor\Entity\Editor as EditorEntity;
/**
* Defines a Unicorn-powered text editor for Drupal.
diff --git a/core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php b/core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php
index 2d76d7616851..e6a2bc04c7a8 100644
--- a/core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php
+++ b/core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php
@@ -25,14 +25,14 @@ class EmailFieldTest extends WebTestBase {
/**
* A field to use in this test class.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
protected $field;
/**
* The instance used in this test class.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
protected $instance;
diff --git a/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityDisplay.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityDisplay.php
similarity index 94%
rename from core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityDisplay.php
rename to core/modules/entity/lib/Drupal/entity/Entity/EntityDisplay.php
index 78963bc42fa9..29bf629fb20d 100644
--- a/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityDisplay.php
+++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityDisplay.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\entity\Plugin\Core\Entity\EntityDisplay.
+ * Contains \Drupal\entity\Entity\EntityDisplay.
*/
-namespace Drupal\entity\Plugin\Core\Entity;
+namespace Drupal\entity\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityFormDisplay.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php
similarity index 95%
rename from core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityFormDisplay.php
rename to core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php
index 9a3f0a63d09a..6b0151042fa2 100644
--- a/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityFormDisplay.php
+++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\entity\Plugin\Core\Entity\EntityFormDisplay.
+ * Contains \Drupal\entity\Entity\EntityFormDisplay.
*/
-namespace Drupal\entity\Plugin\Core\Entity;
+namespace Drupal\entity\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityFormMode.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php
similarity index 95%
rename from core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityFormMode.php
rename to core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php
index 9d96994f55c9..f2aa4bd1daaf 100644
--- a/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityFormMode.php
+++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\entity\Plugin\Core\Entity\EntityFormMode.
+ * Contains \Drupal\entity\Entity\EntityFormMode.
*/
-namespace Drupal\entity\Plugin\Core\Entity;
+namespace Drupal\entity\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityViewMode.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php
similarity index 95%
rename from core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityViewMode.php
rename to core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php
index fb94589a1590..e7f2a10c4f25 100644
--- a/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityViewMode.php
+++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\entity\Plugin\Core\Entity\EntityViewMode.
+ * Contains \Drupal\entity\Entity\EntityViewMode.
*/
-namespace Drupal\entity\Plugin\Core\Entity;
+namespace Drupal\entity\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayBaseInterface.php b/core/modules/entity/lib/Drupal/entity/EntityDisplayBaseInterface.php
index 06647e76e618..7bddb2a0840e 100644
--- a/core/modules/entity/lib/Drupal/entity/EntityDisplayBaseInterface.php
+++ b/core/modules/entity/lib/Drupal/entity/EntityDisplayBaseInterface.php
@@ -23,7 +23,7 @@ interface EntityDisplayBaseInterface extends ConfigEntityInterface {
* @param $view_mode
* The view mode for the new object.
*
- * @return \Drupal\entity\Plugin\Core\Entity\EntityDisplay
+ * @return \Drupal\entity\Entity\EntityDisplay
* The new object.
*/
public function createCopy($view_mode);
@@ -56,7 +56,7 @@ public function getComponent($name);
* @param array $options
* The display options.
*
- * @return \Drupal\entity\Plugin\Core\Entity\EntityDisplay
+ * @return \Drupal\entity\Entity\EntityDisplay
* The EntityDisplay object.
*/
public function setComponent($name, array $options = array());
@@ -67,7 +67,7 @@ public function setComponent($name, array $options = array());
* @param string $name
* The name of the component.
*
- * @return \Drupal\entity\Plugin\Core\Entity\EntityDisplay
+ * @return \Drupal\entity\Entity\EntityDisplay
* The EntityDisplay object.
*/
public function removeComponent($name);
diff --git a/core/modules/field/field.attach.inc b/core/modules/field/field.attach.inc
index 5bab381ec444..fc86871177b3 100644
--- a/core/modules/field/field.attach.inc
+++ b/core/modules/field/field.attach.inc
@@ -7,8 +7,8 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityNG;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
-use Drupal\entity\Plugin\Core\Entity\EntityFormDisplay;
+use Drupal\entity\Entity\EntityDisplay;
+use Drupal\entity\Entity\EntityFormDisplay;
use Drupal\Core\Language\Language;
use Drupal\Core\Entity\Field\PrepareCacheInterface;
@@ -382,7 +382,7 @@ function _field_invoke_get_instances($entity_type, $bundle, $options) {
*
* Used to invoke methods on an instance's widget.
*
- * @param \Drupal\entity\Plugin\Core\Entity\EntityFormDisplay $form_display
+ * @param \Drupal\entity\Entity\EntityFormDisplay $form_display
* An EntityFormDisplay object.
*
* @return callable $target_function
@@ -1061,7 +1061,7 @@ function field_attach_prepare_view($entity_type, array $entities, array $display
*
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity with fields to render.
- * @param \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display
+ * @param \Drupal\entity\Entity\EntityDisplay $display
* The entity display object.
* @param $langcode
* The language the field values are to be shown in. If no language is
diff --git a/core/modules/field/field.crud.inc b/core/modules/field/field.crud.inc
index c66fd549cc43..ff059bc132f5 100644
--- a/core/modules/field/field.crud.inc
+++ b/core/modules/field/field.crud.inc
@@ -6,8 +6,8 @@
*/
use Drupal\Core\Entity\EntityInterface;
-use Drupal\field\Plugin\Core\Entity\Field;
-use Drupal\field\Plugin\Core\Entity\FieldInstance;
+use Drupal\field\Entity\Field;
+use Drupal\field\Entity\FieldInstance;
use Drupal\field\FieldException;
/**
diff --git a/core/modules/field/field.info.inc b/core/modules/field/field.info.inc
index 824d74e7b66c..41e4e3864dac 100644
--- a/core/modules/field/field.info.inc
+++ b/core/modules/field/field.info.inc
@@ -7,7 +7,7 @@
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Language\Language;
-use Drupal\field\Plugin\Core\Entity\FieldInstance;
+use Drupal\field\Entity\FieldInstance;
use Drupal\field\Field;
/**
diff --git a/core/modules/field/field.install b/core/modules/field/field.install
index c46346a097b6..d69237369838 100644
--- a/core/modules/field/field.install
+++ b/core/modules/field/field.install
@@ -6,7 +6,7 @@
*/
use Drupal\Component\Uuid\Uuid;
-use Drupal\field\Plugin\Core\Entity\Field;
+use Drupal\field\Entity\Field;
/**
* Creates a field by writing directly to configuration.
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php b/core/modules/field/lib/Drupal/field/Entity/Field.php
similarity index 99%
rename from core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php
rename to core/modules/field/lib/Drupal/field/Entity/Field.php
index e669900b20b9..cb2d4f0811f3 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php
+++ b/core/modules/field/lib/Drupal/field/Entity/Field.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\field\Plugin\Core\Entity\Field.
+ * Contains \Drupal\field\Entity\Field.
*/
-namespace Drupal\field\Plugin\Core\Entity;
+namespace Drupal\field\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
@@ -210,7 +210,7 @@ class Field extends ConfigEntityBase implements FieldInterface {
/**
* The original field.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
public $original = NULL;
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/FieldInstance.php b/core/modules/field/lib/Drupal/field/Entity/FieldInstance.php
similarity index 98%
rename from core/modules/field/lib/Drupal/field/Plugin/Core/Entity/FieldInstance.php
rename to core/modules/field/lib/Drupal/field/Entity/FieldInstance.php
index 1950a9f130ff..3d8635b37aeb 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/FieldInstance.php
+++ b/core/modules/field/lib/Drupal/field/Entity/FieldInstance.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\field\Plugin\Core\Entity\FieldInstance.
+ * Contains \Drupal\field\Entity\FieldInstance.
*/
-namespace Drupal\field\Plugin\Core\Entity;
+namespace Drupal\field\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
@@ -155,9 +155,9 @@ class FieldInstance extends ConfigEntityBase implements FieldInstanceInterface {
* The function will be called with the following arguments:
* - \Drupal\Core\Entity\EntityInterface $entity
* The entity being created.
- * - \Drupal\field\Plugin\Core\Entity\Field $field
+ * - \Drupal\field\Entity\Field $field
* The field object.
- * - \Drupal\field\Plugin\Core\Entity\FieldInstance $instance
+ * - \Drupal\field\Entity\FieldInstance $instance
* The field instance object.
* - string $langcode
* The language of the entity being created.
@@ -189,7 +189,7 @@ class FieldInstance extends ConfigEntityBase implements FieldInstanceInterface {
/**
* The field ConfigEntity object corresponding to $field_uuid.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
protected $field;
@@ -203,7 +203,7 @@ class FieldInstance extends ConfigEntityBase implements FieldInstanceInterface {
/**
* The original instance.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
public $original = NULL;
diff --git a/core/modules/field/lib/Drupal/field/FieldInterface.php b/core/modules/field/lib/Drupal/field/FieldInterface.php
index 132bc39c2156..f1a2ff737cdb 100644
--- a/core/modules/field/lib/Drupal/field/FieldInterface.php
+++ b/core/modules/field/lib/Drupal/field/FieldInterface.php
@@ -40,7 +40,7 @@ public function getSchema();
* The array of field columns, keyed by column name, in the same format
* returned by getSchema().
*
- * @see \Drupal\field\Plugin\Core\Entity\FieldInterface::getSchema()
+ * @see \Drupal\field\Entity\FieldInterface::getSchema()
*/
public function getColumns();
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php
index 92443245d419..b3c01506fa17 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php
@@ -34,7 +34,7 @@ class ConfigEntityReferenceItemBase extends EntityReferenceItem implements Confi
/**
* The Field instance definition.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
protected $instance;
@@ -44,7 +44,7 @@ class ConfigEntityReferenceItemBase extends EntityReferenceItem implements Confi
* Copied from \Drupal\field\Plugin\Type\FieldType\ConfigFieldItemBase,
* since we cannot extend it.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
public function getInstance() {
if (!isset($this->instance) && $parent = $this->getParent()) {
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigField.php b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigField.php
index 29ce02820463..b61b301714b3 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigField.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigField.php
@@ -19,7 +19,7 @@ class ConfigField extends Field implements ConfigFieldInterface {
/**
* The Field instance definition.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
protected $instance;
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldInterface.php b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldInterface.php
index cd91c47f3e22..090cda9512ab 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldInterface.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldInterface.php
@@ -17,7 +17,7 @@ interface ConfigFieldInterface extends FieldInterface {
/**
* Returns the field instance definition.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
public function getInstance();
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldItemBase.php b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldItemBase.php
index 388ccbe0c08a..4313b436f662 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldItemBase.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldItemBase.php
@@ -17,7 +17,7 @@ abstract class ConfigFieldItemBase extends FieldItemBase implements ConfigFieldI
/**
* The Field instance definition.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
public $instance;
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterPluginManager.php b/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterPluginManager.php
index 3b5c813e018c..c916a9f1510b 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterPluginManager.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterPluginManager.php
@@ -17,7 +17,7 @@
use Drupal\Core\Plugin\Discovery\CacheDecorator;
use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
use Drupal\Core\Plugin\Discovery\AlterDecorator;
-use Drupal\field\Plugin\Core\Entity\FieldInstance;
+use Drupal\field\Entity\FieldInstance;
/**
* Plugin type manager for field formatters.
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetInterface.php b/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetInterface.php
index 6c9e88db4344..833819a63067 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetInterface.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetInterface.php
@@ -8,7 +8,7 @@
namespace Drupal\field\Plugin\Type\Widget;
use Drupal\Core\Entity\EntityInterface;
-use Drupal\field\Plugin\Core\Entity\FieldInstance;
+use Drupal\field\Entity\FieldInstance;
use Symfony\Component\Validator\ConstraintViolationInterface;
use Drupal\Core\Entity\Field\FieldInterface;
diff --git a/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php b/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php
index 9637826407bc..58799f575b4c 100644
--- a/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php
@@ -7,7 +7,7 @@
namespace Drupal\field\Tests;
-use Drupal\field\Plugin\Core\Entity\FieldInstance;
+use Drupal\field\Entity\FieldInstance;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Language\Language;
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldAccessTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldAccessTest.php
index 16fabe529ad2..0f86ac50d326 100644
--- a/core/modules/field/lib/Drupal/field/Tests/FieldAccessTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FieldAccessTest.php
@@ -22,7 +22,7 @@ class FieldAccessTest extends FieldTestBase {
/**
* Node entity to use in this test.
*
- * @var \Drupal\node\Plugin\Core\Entity\Node
+ * @var \Drupal\node\Entity\Node
*/
protected $node;
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php
index e5f28d01a387..5d422af82d2f 100644
--- a/core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php
@@ -20,7 +20,7 @@ class FieldAttachStorageTest extends FieldUnitTestBase {
/**
* The field instance.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
protected $instance;
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php
index cade864d7fb7..0ba7eb55b4cc 100644
--- a/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php
@@ -14,7 +14,7 @@ class FieldInstanceCrudTest extends FieldUnitTestBase {
/**
* The field entity.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
protected $field;
diff --git a/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php b/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
index ebf9722c21b8..85c14e2c568c 100644
--- a/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
@@ -58,14 +58,14 @@ class TranslationTest extends FieldUnitTestBase {
/**
* The field to use in this test.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
protected $field;
/**
* The field instance to use in this test.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
protected $instance;
diff --git a/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php b/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php
index df93f12a75e8..69b4c48820b1 100644
--- a/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php
@@ -38,14 +38,14 @@ class TranslationWebTest extends FieldTestBase {
/**
* The field to use in this test.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
protected $field;
/**
* The field instance to use in this test.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
protected $instance;
diff --git a/core/modules/field/tests/modules/field_test/field_test.entity.inc b/core/modules/field/tests/modules/field_test/field_test.entity.inc
index 4cea03afb628..fded178f9fdb 100644
--- a/core/modules/field/tests/modules/field_test/field_test.entity.inc
+++ b/core/modules/field/tests/modules/field_test/field_test.entity.inc
@@ -6,7 +6,7 @@
*/
use Drupal\Core\Entity\EntityInterface;
-use Drupal\field_test\Plugin\Core\Entity\TestEntity;
+use Drupal\field_test\Entity\TestEntity;
/**
* Implements hook_entity_info().
diff --git a/core/modules/field_sql_storage/field_sql_storage.install b/core/modules/field_sql_storage/field_sql_storage.install
index 5c9eef2e92ab..523e0e0f552b 100644
--- a/core/modules/field_sql_storage/field_sql_storage.install
+++ b/core/modules/field_sql_storage/field_sql_storage.install
@@ -5,7 +5,7 @@
* Install, update, and uninstall functions for the Field SQL Storage module.
*/
-use Drupal\field\Plugin\Core\Entity\Field;
+use Drupal\field\Entity\Field;
/**
* Writes field data directly to SQL storage.
diff --git a/core/modules/field_sql_storage/field_sql_storage.module b/core/modules/field_sql_storage/field_sql_storage.module
index 5e3e0ddfcb8a..3e5e25f2bd93 100644
--- a/core/modules/field_sql_storage/field_sql_storage.module
+++ b/core/modules/field_sql_storage/field_sql_storage.module
@@ -8,7 +8,7 @@
use Drupal\Core\Database\Database;
use Drupal\Core\Entity\EntityInterface;
use Drupal\field\FieldUpdateForbiddenException;
-use Drupal\field\Plugin\Core\Entity\Field;
+use Drupal\field\Entity\Field;
/**
* Implements hook_help().
diff --git a/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php
index fce0a52c4f50..58d64b24151f 100644
--- a/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php
+++ b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php
@@ -38,14 +38,14 @@ class FieldSqlStorageTest extends EntityUnitTestBase {
/**
* A field to use in this class.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
protected $field;
/**
* A field instance to use in this test class.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
protected $instance;
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
index d2208a1ac686..799f95388e13 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
@@ -12,7 +12,7 @@
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\field_ui\OverviewBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\field\Plugin\Core\Entity\Field;
+use Drupal\field\Entity\Field;
/**
* Field UI field overview form.
diff --git a/core/modules/field_ui/tests/modules/field_ui_test/lib/Drupal/field_ui_test/Plugin/Core/Entity/FieldUITestNoBundle.php b/core/modules/field_ui/tests/modules/field_ui_test/lib/Drupal/field_ui_test/Entity/FieldUITestNoBundle.php
similarity index 83%
rename from core/modules/field_ui/tests/modules/field_ui_test/lib/Drupal/field_ui_test/Plugin/Core/Entity/FieldUITestNoBundle.php
rename to core/modules/field_ui/tests/modules/field_ui_test/lib/Drupal/field_ui_test/Entity/FieldUITestNoBundle.php
index 8e70264da2b6..5389036d22b0 100644
--- a/core/modules/field_ui/tests/modules/field_ui_test/lib/Drupal/field_ui_test/Plugin/Core/Entity/FieldUITestNoBundle.php
+++ b/core/modules/field_ui/tests/modules/field_ui_test/lib/Drupal/field_ui_test/Entity/FieldUITestNoBundle.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\field_ui_test\Plugin\Core\Entity\FieldUITestNoBundle.
+ * Contains \Drupal\field_ui_test\Entity\FieldUITestNoBundle.
*/
-namespace Drupal\field_ui_test\Plugin\Core\Entity;
+namespace Drupal\field_ui_test\Entity;
use Drupal\Core\Entity\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/file/file.api.php b/core/modules/file/file.api.php
index c71321454b36..2624623cc919 100644
--- a/core/modules/file/file.api.php
+++ b/core/modules/file/file.api.php
@@ -12,10 +12,10 @@
* This hook runs after a new file object has just been instantiated. It can be
* used to set initial values, e.g. to provide defaults.
*
- * @param \Drupal\file\Plugin\Core\Entity\File $file
+ * @param \Drupal\file\Entity\File $file
* The file object.
*/
-function hook_file_create(\Drupal\file\Plugin\Core\Entity\File $file) {
+function hook_file_create(\Drupal\file\Entity\File $file) {
if (!isset($file->foo)) {
$file->foo = 'some_initial_value';
}
diff --git a/core/modules/file/file.install b/core/modules/file/file.install
index 37b89aeaa4d8..39d671c14734 100644
--- a/core/modules/file/file.install
+++ b/core/modules/file/file.install
@@ -5,7 +5,7 @@
* Install, update and uninstall functions for File module.
*/
-use Drupal\field\Plugin\Core\Entity\Field;
+use Drupal\field\Entity\Field;
/**
* Implements hook_schema().
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index 018eef643a1d..e25a17bdbf34 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -5,7 +5,7 @@
* Defines a "managed_file" Form API field and a "file" field for Field module.
*/
-use Drupal\file\Plugin\Core\Entity\File;
+use Drupal\file\Entity\File;
use Drupal\Component\Utility\NestedArray;
use Drupal\Core\Template\Attribute;
use Symfony\Component\HttpFoundation\JsonResponse;
diff --git a/core/modules/file/lib/Drupal/file/Plugin/Core/Entity/File.php b/core/modules/file/lib/Drupal/file/Entity/File.php
similarity index 97%
rename from core/modules/file/lib/Drupal/file/Plugin/Core/Entity/File.php
rename to core/modules/file/lib/Drupal/file/Entity/File.php
index ae19af705a63..dfe97cb32631 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/Core/Entity/File.php
+++ b/core/modules/file/lib/Drupal/file/Entity/File.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\file\Plugin\Core\Entity\File.
+ * Definition of Drupal\file\Entity\File.
*/
-namespace Drupal\file\Plugin\Core\Entity;
+namespace Drupal\file\Entity;
use Drupal\Core\Entity\EntityNG;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/file/lib/Drupal/file/FileInterface.php b/core/modules/file/lib/Drupal/file/FileInterface.php
index 2339d88aee5b..ba818811d026 100644
--- a/core/modules/file/lib/Drupal/file/FileInterface.php
+++ b/core/modules/file/lib/Drupal/file/FileInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\file\Plugin\Core\Entity\FileInterface.
+ * Contains \Drupal\file\Entity\FileInterface.
*/
namespace Drupal\file;
diff --git a/core/modules/file/lib/Drupal/file/FileUsage/DatabaseFileUsageBackend.php b/core/modules/file/lib/Drupal/file/FileUsage/DatabaseFileUsageBackend.php
index 5b9b4175fc61..bff771943d54 100644
--- a/core/modules/file/lib/Drupal/file/FileUsage/DatabaseFileUsageBackend.php
+++ b/core/modules/file/lib/Drupal/file/FileUsage/DatabaseFileUsageBackend.php
@@ -9,7 +9,7 @@
use Drupal\Core\Database\Connection;
use Drupal\Core\Database\DatabaseExceptionWrapper;
-use Drupal\file\Plugin\Core\Entity\File;
+use Drupal\file\Entity\File;
/**
* Defines the database file usage backend. This is the default Drupal backend.
diff --git a/core/modules/file/lib/Drupal/file/FileUsage/FileUsageBase.php b/core/modules/file/lib/Drupal/file/FileUsage/FileUsageBase.php
index 1abe20def233..2111492cbaf6 100644
--- a/core/modules/file/lib/Drupal/file/FileUsage/FileUsageBase.php
+++ b/core/modules/file/lib/Drupal/file/FileUsage/FileUsageBase.php
@@ -7,7 +7,7 @@
namespace Drupal\file\FileUsage;
-use Drupal\file\Plugin\Core\Entity\File;
+use Drupal\file\Entity\File;
/**
* Defines the base class for database file usage backend.
diff --git a/core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php b/core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php
index 1e06dbb94e52..5be62fff1e16 100644
--- a/core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php
+++ b/core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php
@@ -7,7 +7,7 @@
namespace Drupal\file\FileUsage;
-use Drupal\file\Plugin\Core\Entity\File;
+use Drupal\file\Entity\File;
/**
* File usage backend interface.
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileItemTest.php b/core/modules/file/lib/Drupal/file/Tests/FileItemTest.php
index fd00c1139af1..3aacead96724 100644
--- a/core/modules/file/lib/Drupal/file/Tests/FileItemTest.php
+++ b/core/modules/file/lib/Drupal/file/Tests/FileItemTest.php
@@ -26,7 +26,7 @@ class FileItemTest extends FieldUnitTestBase {
/**
* Created file entity.
*
- * @var \Drupal\file\Plugin\Core\Entity\File
+ * @var \Drupal\file\Entity\File
*/
protected $file;
diff --git a/core/modules/file/tests/file_module_test.module b/core/modules/file/tests/file_module_test.module
index 19096f94c9c6..fc116ad7a6c1 100644
--- a/core/modules/file/tests/file_module_test.module
+++ b/core/modules/file/tests/file_module_test.module
@@ -6,7 +6,7 @@
*/
use Drupal\Core\Entity\EntityInterface;
-use Drupal\file\Plugin\Core\Entity\File;
+use Drupal\file\Entity\File;
/**
* Implements hook_menu().
diff --git a/core/modules/file/tests/file_test/file_test.module b/core/modules/file/tests/file_test/file_test.module
index b6b88dc885aa..90fc9006ff6f 100644
--- a/core/modules/file/tests/file_test/file_test.module
+++ b/core/modules/file/tests/file_test/file_test.module
@@ -8,7 +8,7 @@
* calling file_test_get_calls() or file_test_set_return().
*/
-use Drupal\file\Plugin\Core\Entity\File;
+use Drupal\file\Entity\File;
const FILE_URL_TEST_CDN_1 = 'http://cdn1.example.com';
const FILE_URL_TEST_CDN_2 = 'http://cdn2.example.com';
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 58d3a073117d..261225875c61 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -8,7 +8,7 @@
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Language\Language;
use Drupal\Core\Template\Attribute;
-use Drupal\filter\Plugin\Core\Entity\FilterFormat;
+use Drupal\filter\Entity\FilterFormat;
/**
* Non-HTML markup language filters that generate HTML.
@@ -747,7 +747,7 @@ function check_markup($text, $format_id = NULL, $langcode = '', $cache = FALSE,
// Cache the filtered text. This cache is infinitely valid. It becomes
// obsolete when $text changes (which leads to a new $cache_id). It is
// automatically flushed when the text format is updated.
- // @see \Drupal\filter\Plugin\Core\Entity\FilterFormat::save()
+ // @see \Drupal\filter\Entity\FilterFormat::save()
if ($cache) {
cache('filter')->set($cache_id, $text, CacheBackendInterface::CACHE_PERMANENT, array('filter_format' => $format->format));
}
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Core/Entity/FilterFormat.php b/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php
similarity index 98%
rename from core/modules/filter/lib/Drupal/filter/Plugin/Core/Entity/FilterFormat.php
rename to core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php
index 7541b53cfd31..cc7a3c7db7c1 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Core/Entity/FilterFormat.php
+++ b/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\filter\Plugin\Core\Entity\FilterFormat.
+ * Contains \Drupal\filter\Entity\FilterFormat.
*/
-namespace Drupal\filter\Plugin\Core\Entity;
+namespace Drupal\filter\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatInterface.php b/core/modules/filter/lib/Drupal/filter/FilterFormatInterface.php
index 6b598cca2170..7517c446476e 100644
--- a/core/modules/filter/lib/Drupal/filter/FilterFormatInterface.php
+++ b/core/modules/filter/lib/Drupal/filter/FilterFormatInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\filter\Plugin\Core\Entity\FilterFormatInterface.
+ * Contains \Drupal\filter\Entity\FilterFormatInterface.
*/
namespace Drupal\filter;
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php b/core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php
index ee4ba2bbfb75..40156e4c385b 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php
@@ -20,7 +20,7 @@
* formats as needed. Individual filters can be enabled and configured
* differently for each text format.
*
- * @see \Drupal\filter\Plugin\Core\Entity\FilterFormat
+ * @see \Drupal\filter\Entity\FilterFormat
*
* Filtering is a two-step process. First, the content is 'prepared' by calling
* the FilterInterface::prepare() method for every filter. The purpose is to
diff --git a/core/modules/forum/forum.admin.inc b/core/modules/forum/forum.admin.inc
index c63b21f53ebc..451f7d1e476b 100644
--- a/core/modules/forum/forum.admin.inc
+++ b/core/modules/forum/forum.admin.inc
@@ -5,7 +5,7 @@
* Administrative page callbacks for the Forum module.
*/
-use Drupal\taxonomy\Plugin\Core\Entity\Term;
+use Drupal\taxonomy\Entity\Term;
/**
* Form constructor for the forum overview form.
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 886423644440..41d26040ead3 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -7,7 +7,7 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\node\NodeInterface;
-use Drupal\taxonomy\Plugin\Core\Entity\Term;
+use Drupal\taxonomy\Entity\Term;
/**
* Implements hook_help().
diff --git a/core/modules/forum/lib/Drupal/forum/Form/DeleteForm.php b/core/modules/forum/lib/Drupal/forum/Form/DeleteForm.php
index 7c4ba56bd190..ded6bb5ceb21 100644
--- a/core/modules/forum/lib/Drupal/forum/Form/DeleteForm.php
+++ b/core/modules/forum/lib/Drupal/forum/Form/DeleteForm.php
@@ -8,7 +8,7 @@
namespace Drupal\forum\Form;
use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\taxonomy\Plugin\Core\Entity\Term;
+use Drupal\taxonomy\Entity\Term;
use Symfony\Component\HttpFoundation\Request;
/**
@@ -19,7 +19,7 @@ class DeleteForm extends ConfirmFormBase {
/**
* The taxonomy term being deleted.
*
- * @var \Drupal\taxonomy\Plugin\Core\Entity\Term
+ * @var \Drupal\taxonomy\Entity\Term
*/
protected $taxonomyTerm;
diff --git a/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php b/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php
index ea55fd9664bd..0c1bcaa7da4d 100644
--- a/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php
+++ b/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php
@@ -51,7 +51,7 @@ abstract class NormalizerTestBase extends DrupalUnitTestBase {
*
* @var string
*/
- protected $entityClass = 'Drupal\entity_test\Plugin\Core\Entity\EntityTest';
+ protected $entityClass = 'Drupal\entity_test\Entity\EntityTest';
/**
* Overrides \Drupal\simpletest\DrupalUnitTestBase::setup().
diff --git a/core/modules/image/config/schema/image.schema.yml b/core/modules/image/config/schema/image.schema.yml
index 871c0cc9e47f..658ee8c4dea2 100644
--- a/core/modules/image/config/schema/image.schema.yml
+++ b/core/modules/image/config/schema/image.schema.yml
@@ -12,7 +12,7 @@ image.size:
label: 'Height'
# Image styles (multiple).
-# Plugin \Drupal\image\Plugin\Core\Entity\ImageStyle
+# Plugin \Drupal\image\Entity\ImageStyle
image.style.*:
type: mapping
label: 'Image style'
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index 28b7bc241943..03b8c95b5e3e 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -6,10 +6,10 @@
*/
use Drupal\Core\Entity\EntityInterface;
-use Drupal\field\Plugin\Core\Entity\Field;
-use Drupal\field\Plugin\Core\Entity\FieldInstance;
-use Drupal\file\Plugin\Core\Entity\File;
-use Drupal\image\Plugin\Core\Entity\ImageStyle;
+use Drupal\field\Entity\Field;
+use Drupal\field\Entity\FieldInstance;
+use Drupal\file\Entity\File;
+use Drupal\image\Entity\ImageStyle;
use Drupal\field\FieldInterface;
use Drupal\field\FieldInstanceInterface;
diff --git a/core/modules/image/lib/Drupal/image/Plugin/Core/Entity/ImageStyle.php b/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php
similarity index 99%
rename from core/modules/image/lib/Drupal/image/Plugin/Core/Entity/ImageStyle.php
rename to core/modules/image/lib/Drupal/image/Entity/ImageStyle.php
index 25e0b81fea4b..4d12539d958c 100644
--- a/core/modules/image/lib/Drupal/image/Plugin/Core/Entity/ImageStyle.php
+++ b/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\image\Plugin\Core\Entity\ImageStyle.
+ * Contains \Drupal\image\Entity\ImageStyle.
*/
-namespace Drupal\image\Plugin\Core\Entity;
+namespace Drupal\image\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/image/lib/Drupal/image/ImageStyleAccessController.php b/core/modules/image/lib/Drupal/image/ImageStyleAccessController.php
index 9d5fb5ff2d2f..deb9123ed205 100644
--- a/core/modules/image/lib/Drupal/image/ImageStyleAccessController.php
+++ b/core/modules/image/lib/Drupal/image/ImageStyleAccessController.php
@@ -14,7 +14,7 @@
/**
* Defines an access controller for the image style entity.
*
- * @see \Drupal\image\Plugin\Core\Entity\ImageStyle
+ * @see \Drupal\image\Entity\ImageStyle
*/
class ImageStyleAccessController extends EntityAccessController {
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
index a0a746faa083..f926abcf0723 100644
--- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
+++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
@@ -56,7 +56,7 @@ public function testDefaultImages() {
// The instance default image id should be 2.
$this->assertEqual($instance->getFieldSetting('default_image'), $default_images['instance']->id());
- // Also test \Drupal\field\Plugin\Core\Entity\FieldInstance::getFieldSetting().
+ // Also test \Drupal\field\Entity\FieldInstance::getFieldSetting().
$instance_field_settings = $instance->getFieldSettings();
$this->assertEqual($instance_field_settings['default_image'], $default_images['instance']->id());
@@ -65,7 +65,7 @@ public function testDefaultImages() {
// The field default image id should be 1.
$this->assertEqual($field->getFieldSetting('default_image'), $default_images['field']->id());
- // Also test \Drupal\field\Plugin\Core\Entity\Field::getFieldSettings().
+ // Also test \Drupal\field\Entity\Field::getFieldSettings().
$field_field_settings = $field->getFieldSettings();
$this->assertEqual($field_field_settings['default_image'], $default_images['field']->id());
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php
index fdd368604d0d..8a51694ac7b1 100644
--- a/core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php
+++ b/core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php
@@ -26,7 +26,7 @@ class ImageItemTest extends FieldUnitTestBase {
/**
* Created file entity.
*
- * @var \Drupal\file\Plugin\Core\Entity\File
+ * @var \Drupal\file\Entity\File
*/
protected $image;
diff --git a/core/modules/language/lib/Drupal/language/Plugin/Core/Entity/Language.php b/core/modules/language/lib/Drupal/language/Entity/Language.php
similarity index 95%
rename from core/modules/language/lib/Drupal/language/Plugin/Core/Entity/Language.php
rename to core/modules/language/lib/Drupal/language/Entity/Language.php
index 2d7460d55272..15c6a67f4f44 100644
--- a/core/modules/language/lib/Drupal/language/Plugin/Core/Entity/Language.php
+++ b/core/modules/language/lib/Drupal/language/Entity/Language.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\language\Plugin\Core\Entity\Language.
+ * Contains \Drupal\language\Entity\Language.
*/
-namespace Drupal\language\Plugin\Core\Entity;
+namespace Drupal\language\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/language/lib/Drupal/language/LanguageInterface.php b/core/modules/language/lib/Drupal/language/LanguageInterface.php
index 35db8878ef38..20ca26cc2a8c 100644
--- a/core/modules/language/lib/Drupal/language/LanguageInterface.php
+++ b/core/modules/language/lib/Drupal/language/LanguageInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\language\Plugin\Core\Entity\LanguageInterface.
+ * Contains \Drupal\language\Entity\LanguageInterface.
*/
namespace Drupal\language;
diff --git a/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/Display.php b/core/modules/layout/lib/Drupal/layout/Entity/Display.php
similarity index 98%
rename from core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/Display.php
rename to core/modules/layout/lib/Drupal/layout/Entity/Display.php
index 5fbdfc83e41d..f9e3c22b2c5e 100644
--- a/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/Display.php
+++ b/core/modules/layout/lib/Drupal/layout/Entity/Display.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\layout\Plugin\Core\Entity\Display.
+ * Definition of Drupal\layout\Entity\Display.
*/
-namespace Drupal\layout\Plugin\Core\Entity;
+namespace Drupal\layout\Entity;
use Drupal\layout\Config\DisplayBase;
use Drupal\layout\Config\BoundDisplayInterface;
diff --git a/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/UnboundDisplay.php b/core/modules/layout/lib/Drupal/layout/Entity/UnboundDisplay.php
similarity index 93%
rename from core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/UnboundDisplay.php
rename to core/modules/layout/lib/Drupal/layout/Entity/UnboundDisplay.php
index d2f4880fdab7..a4ae5e07eea1 100644
--- a/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/UnboundDisplay.php
+++ b/core/modules/layout/lib/Drupal/layout/Entity/UnboundDisplay.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\layout\Plugin\Core\Entity\Display.
+ * Definition of Drupal\layout\Entity\Display.
*/
-namespace Drupal\layout\Plugin\Core\Entity;
+namespace Drupal\layout\Entity;
use Drupal\layout\Config\DisplayBase;
use Drupal\layout\Config\BoundDisplayInterface;
diff --git a/core/modules/layout/lib/Drupal/layout/Tests/DisplayInternalLogicTest.php b/core/modules/layout/lib/Drupal/layout/Tests/DisplayInternalLogicTest.php
index 07a77bf1a8cd..4c1538b03dda 100644
--- a/core/modules/layout/lib/Drupal/layout/Tests/DisplayInternalLogicTest.php
+++ b/core/modules/layout/lib/Drupal/layout/Tests/DisplayInternalLogicTest.php
@@ -8,8 +8,8 @@
namespace Drupal\layout\Tests;
use Drupal\simpletest\WebTestBase;
-use Drupal\layout\Plugin\Core\Entity\Display;
-use Drupal\layout\Plugin\Core\Entity\UnboundDisplay;
+use Drupal\layout\Entity\Display;
+use Drupal\layout\Entity\UnboundDisplay;
/**
* Tests the API and internal logic offered by Displays.
@@ -26,21 +26,21 @@ class DisplayInternalLogicTest extends WebTestBase {
/**
* The twocol test display.
*
- * @var \Drupal\layout\Plugin\Core\Entity\Display
+ * @var \Drupal\layout\Entity\Display
*/
public $twocol;
/**
* The onecol test display.
*
- * @var \Drupal\layout\Plugin\Core\Entity\Display
+ * @var \Drupal\layout\Entity\Display
*/
public $onecol;
/**
* The unbound test display.
*
- * @var \Drupal\layout\Plugin\Core\Entity\UnboundDisplay
+ * @var \Drupal\layout\Entity\UnboundDisplay
*/
public $unbound;
diff --git a/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php b/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
index b4033ff11534..c3c62ef314c9 100644
--- a/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
+++ b/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
@@ -25,14 +25,14 @@ class LinkFieldTest extends WebTestBase {
/**
* A field to use in this test class.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
protected $field;
/**
* The instance used in this test class.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
protected $instance;
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
index 83f2bc3cb1a3..6c894552fc5a 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
@@ -452,7 +452,7 @@ public function testMenuBundles() {
* @param string $menu_name Menu name.
* @param string $weight Menu weight
*
- * @return \Drupal\menu_link\Plugin\Core\Entity\MenuLink $menu_link
+ * @return \Drupal\menu_link\Entity\MenuLink $menu_link
* A menu link entity.
*/
function addMenuLink($plid = 0, $link = '<front>', $menu_name = 'tools', $expanded = TRUE, $weight = '0') {
diff --git a/core/modules/menu/menu.api.php b/core/modules/menu/menu.api.php
index 7b949ad2a5d7..b18d9cc691d3 100644
--- a/core/modules/menu/menu.api.php
+++ b/core/modules/menu/menu.api.php
@@ -17,7 +17,7 @@
* Contributed modules may use the information to perform actions based on the
* information entered into the menu system.
*
- * @param \Drupal\system\Plugin\Core\Entity\Menu $menu
+ * @param \Drupal\system\Entity\Menu $menu
* A menu entity.
*
* @see hook_menu_update()
@@ -37,7 +37,7 @@ function hook_menu_insert($menu) {
* Contributed modules may use the information to perform actions based on the
* information entered into the menu system.
*
- * @param \Drupal\system\Plugin\Core\Entity\Menu $menu
+ * @param \Drupal\system\Entity\Menu $menu
* A menu entity.
*
* @see hook_menu_insert()
@@ -58,7 +58,7 @@ function hook_menu_update($menu) {
* information to perform actions based on the information entered into the menu
* system.
*
- * @param \Drupal\system\Plugin\Core\Entity\Menu $menu
+ * @param \Drupal\system\Entity\Menu $menu
* A menu entity.
*
* @see hook_menu_insert()
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index a9a50a260e8f..4906043a840b 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -13,9 +13,9 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\block\BlockPluginInterface;
-use Drupal\system\Plugin\Core\Entity\Menu;
+use Drupal\system\Entity\Menu;
use Symfony\Component\HttpFoundation\JsonResponse;
-use Drupal\menu_link\Plugin\Core\Entity\MenuLink;
+use Drupal\menu_link\Entity\MenuLink;
use Drupal\menu_link\MenuLinkStorageController;
use Drupal\node\NodeInterface;
@@ -155,7 +155,7 @@ function menu_entity_bundle_info() {
/**
* Entity URI callback.
*
- * @param \Drupal\system\Plugin\Core\Entity\Menu $menu
+ * @param \Drupal\system\Entity\Menu $menu
* A Menu entity.
*/
function menu_uri(Menu $menu) {
@@ -293,7 +293,7 @@ function menu_menu_delete(Menu $menu) {
*
* @param array $menus
* An array of menu names and titles, such as from menu_get_menus().
- * @param \Drupal\menu_link\Plugin\Core\Entity\MenuLink $menu_link
+ * @param \Drupal\menu_link\Entity\MenuLink $menu_link
* The menu link for which to generate a list of parents.
* If $menu_link->id() == 0 then the complete tree is returned.
* @param string $type
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
similarity index 99%
rename from core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
rename to core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
index 3ff0fdf81ad7..f51b5854eb13 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\menu_link\Plugin\Core\Entity\MenuLink.
+ * Contains \Drupal\menu_link\Entity\MenuLink.
*/
-namespace Drupal\menu_link\Plugin\Core\Entity;
+namespace Drupal\menu_link\Entity;
use Drupal\menu_link\MenuLinkInterface;
use Symfony\Component\Routing\Route;
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php
index 664e7dabe12e..a1c2c6931146 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php
@@ -14,7 +14,7 @@
/**
* Defines an access controller for the menu link entity.
*
- * @see \Drupal\menu_link\Plugin\Core\Entity\MenuLink
+ * @see \Drupal\menu_link\Entity\MenuLink
*/
class MenuLinkAccessController extends EntityAccessController {
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php
index c185dc4e9b75..f4c4e0e5d721 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\menu_link\Plugin\Core\Entity\MenuLinkInterface.
+ * Contains \Drupal\menu_link\Entity\MenuLinkInterface.
*/
namespace Drupal\menu_link;
diff --git a/core/modules/menu_link/menu_link.api.php b/core/modules/menu_link/menu_link.api.php
index 415b6035a06c..bfb8a2e462aa 100644
--- a/core/modules/menu_link/menu_link.api.php
+++ b/core/modules/menu_link/menu_link.api.php
@@ -42,12 +42,12 @@ function hook_menu_link_load($menu_links) {
/**
* Alter the data of a menu link entity before it is created or updated.
*
- * @param \Drupal\menu_link\Plugin\Core\Entity\MenuLink $menu_link
+ * @param \Drupal\menu_link\Entity\MenuLink $menu_link
* A menu link entity.
*
* @see hook_menu_link_load()
*/
-function hook_menu_link_presave(\Drupal\menu_link\Plugin\Core\Entity\MenuLink $menu_link) {
+function hook_menu_link_presave(\Drupal\menu_link\Entity\MenuLink $menu_link) {
// Make all new admin links hidden (a.k.a disabled).
if (strpos($menu_link->link_path, 'admin') === 0 && $menu_link->isNew()) {
$menu_link->hidden = 1;
@@ -71,14 +71,14 @@ function hook_menu_link_presave(\Drupal\menu_link\Plugin\Core\Entity\MenuLink $m
* created. Contributed modules may use the information to perform
* actions based on the information entered into the menu system.
*
- * @param \Drupal\menu_link\Plugin\Core\Entity\MenuLink $menu_link
+ * @param \Drupal\menu_link\Entity\MenuLink $menu_link
* A menu link entity.
*
* @see hook_menu_link_presave()
* @see hook_menu_link_update()
* @see hook_menu_link_delete()
*/
-function hook_menu_link_insert(\Drupal\menu_link\Plugin\Core\Entity\MenuLink $menu_link) {
+function hook_menu_link_insert(\Drupal\menu_link\Entity\MenuLink $menu_link) {
// In our sample case, we track menu items as editing sections
// of the site. These are stored in our table as 'disabled' items.
$record['mlid'] = $menu_link->id();
@@ -94,14 +94,14 @@ function hook_menu_link_insert(\Drupal\menu_link\Plugin\Core\Entity\MenuLink $me
* updated. Contributed modules may use the information to perform
* actions based on the information entered into the menu system.
*
- * @param \Drupal\menu_link\Plugin\Core\Entity\MenuLink $menu_link
+ * @param \Drupal\menu_link\Entity\MenuLink $menu_link
* A menu link entity.
*
* @see hook_menu_link_presave()
* @see hook_menu_link_insert()
* @see hook_menu_link_delete()
*/
-function hook_menu_link_update(\Drupal\menu_link\Plugin\Core\Entity\MenuLink $menu_link) {
+function hook_menu_link_update(\Drupal\menu_link\Entity\MenuLink $menu_link) {
// If the parent menu has changed, update our record.
$menu_name = db_query("SELECT menu_name FROM {menu_example} WHERE mlid = :mlid", array(':mlid' => $menu_link->id()))->fetchField();
if ($menu_name != $menu_link->menu_name) {
@@ -119,14 +119,14 @@ function hook_menu_link_update(\Drupal\menu_link\Plugin\Core\Entity\MenuLink $me
* deleted. Contributed modules may use the information to perform
* actions based on the information entered into the menu system.
*
- * @param \Drupal\menu_link\Plugin\Core\Entity\MenuLink $menu_link
+ * @param \Drupal\menu_link\Entity\MenuLink $menu_link
* A menu link entity.
*
* @see hook_menu_link_presave()
* @see hook_menu_link_insert()
* @see hook_menu_link_update()
*/
-function hook_menu_link_delete(\Drupal\menu_link\Plugin\Core\Entity\MenuLink $menu_link) {
+function hook_menu_link_delete(\Drupal\menu_link\Entity\MenuLink $menu_link) {
// Delete the record from our table.
db_delete('menu_example')
->condition('mlid', $menu_link->id())
diff --git a/core/modules/menu_link/menu_link.module b/core/modules/menu_link/menu_link.module
index 4ff3121dba17..105e502d2023 100644
--- a/core/modules/menu_link/menu_link.module
+++ b/core/modules/menu_link/menu_link.module
@@ -5,7 +5,7 @@
* Enables users to create menu links.
*/
-use Drupal\menu_link\Plugin\Core\Entity\MenuLink;
+use Drupal\menu_link\Entity\MenuLink;
function menu_link_help($path, $arg) {
switch ($path) {
@@ -20,7 +20,7 @@ function menu_link_help($path, $arg) {
/**
* Entity URI callback.
*
- * @param \Drupal\menu_link\Plugin\Core\Entity\MenuLink $menu_link
+ * @param \Drupal\menu_link\Entity\MenuLink $menu_link
* A menu link entity.
*/
function menu_link_uri(MenuLink $menu_link) {
@@ -41,7 +41,7 @@ function menu_link_uri(MenuLink $menu_link) {
* @param bool $reset
* (optional) Whether to reset the menu_link_load_multiple() cache.
*
- * @return \Drupal\menu_link\Plugin\Core\Entity\MenuLink|null
+ * @return \Drupal\menu_link\Entity\MenuLink|null
* A menu link entity, or NULL if there is no entity with the given ID.
*/
function menu_link_load($mlid = NULL, $reset = FALSE) {
@@ -56,7 +56,7 @@ function menu_link_load($mlid = NULL, $reset = FALSE) {
* @param bool $reset
* (optional) Whether to reset the internal cache.
*
- * @return array<\Drupal\menu_link\Plugin\Core\Entity\MenuLink>
+ * @return array<\Drupal\menu_link\Entity\MenuLink>
* An array of menu link entities indexed by entity IDs.
*
* @see menu_link_load()
@@ -123,7 +123,7 @@ function menu_link_delete_multiple(array $mlids, $force = FALSE, $prevent_repare
* After calling this function, rebuild the menu cache using
* menu_cache_clear_all().
*
- * @param \Drupal\menu_link\Plugin\Core\Entity\MenuLink $menu_link
+ * @param \Drupal\menu_link\Entity\MenuLink $menu_link
* The menu link entity to be saved.
*
* @return int|bool
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Core/Entity/Node.php b/core/modules/node/lib/Drupal/node/Entity/Node.php
similarity index 98%
rename from core/modules/node/lib/Drupal/node/Plugin/Core/Entity/Node.php
rename to core/modules/node/lib/Drupal/node/Entity/Node.php
index a79c796d7a28..0452e995ceda 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Core/Entity/Node.php
+++ b/core/modules/node/lib/Drupal/node/Entity/Node.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\node\Plugin\Core\Entity\Node.
+ * Definition of Drupal\node\Entity\Node.
*/
-namespace Drupal\node\Plugin\Core\Entity;
+namespace Drupal\node\Entity;
use Drupal\Core\Entity\EntityNG;
use Drupal\Core\Entity\EntityStorageControllerInterface;
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Core/Entity/NodeType.php b/core/modules/node/lib/Drupal/node/Entity/NodeType.php
similarity index 95%
rename from core/modules/node/lib/Drupal/node/Plugin/Core/Entity/NodeType.php
rename to core/modules/node/lib/Drupal/node/Entity/NodeType.php
index 464fbe0bcdd1..d89d4b046b20 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Core/Entity/NodeType.php
+++ b/core/modules/node/lib/Drupal/node/Entity/NodeType.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\node\Plugin\Core\Entity\NodeType.
+ * Contains \Drupal\node\Entity\NodeType.
*/
-namespace Drupal\node\Plugin\Core\Entity;
+namespace Drupal\node\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\EntityStorageControllerInterface;
@@ -106,14 +106,14 @@ class NodeType extends ConfigEntityBase implements NodeTypeInterface {
*
* @var bool
*
- * @see \Drupal\node\Plugin\Core\Entity\NodeType::$create_body_label
+ * @see \Drupal\node\Entity\NodeType::$create_body_label
*/
protected $create_body = TRUE;
/**
* The label to use for the Body field upon entity creation.
*
- * @see \Drupal\node\Plugin\Core\Entity\NodeType::$create_body
+ * @see \Drupal\node\Entity\NodeType::$create_body
*
* @var string
*/
diff --git a/core/modules/node/lib/Drupal/node/NodeAccessController.php b/core/modules/node/lib/Drupal/node/NodeAccessController.php
index 3e4d97b8aa96..b1f120aeeb4f 100644
--- a/core/modules/node/lib/Drupal/node/NodeAccessController.php
+++ b/core/modules/node/lib/Drupal/node/NodeAccessController.php
@@ -16,7 +16,7 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityNG;
use Drupal\Core\Session\AccountInterface;
-use Drupal\user\Plugin\Core\Entity\User;
+use Drupal\user\Entity\User;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
diff --git a/core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorage.php b/core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorage.php
index e7da48c9ff0d..b274a1f798b8 100644
--- a/core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorage.php
+++ b/core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorage.php
@@ -13,7 +13,7 @@
use Drupal\Core\Entity\EntityNG;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Session\AccountInterface;
-use Drupal\user\Plugin\Core\Entity\User;
+use Drupal\user\Entity\User;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
diff --git a/core/modules/node/lib/Drupal/node/NodeInterface.php b/core/modules/node/lib/Drupal/node/NodeInterface.php
index a9acd3470f48..249e1ec98fa2 100644
--- a/core/modules/node/lib/Drupal/node/NodeInterface.php
+++ b/core/modules/node/lib/Drupal/node/NodeInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\node\Plugin\Core\Entity\NodeInterface.
+ * Contains \Drupal\node\Entity\NodeInterface.
*/
namespace Drupal\node;
diff --git a/core/modules/node/lib/Drupal/node/NodeRenderController.php b/core/modules/node/lib/Drupal/node/NodeRenderController.php
index c5712923eb04..6da0b29fe9e3 100644
--- a/core/modules/node/lib/Drupal/node/NodeRenderController.php
+++ b/core/modules/node/lib/Drupal/node/NodeRenderController.php
@@ -9,7 +9,7 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityRenderController;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
+use Drupal\entity\Entity\EntityDisplay;
/**
* Render controller for nodes.
diff --git a/core/modules/node/lib/Drupal/node/NodeTypeAccessController.php b/core/modules/node/lib/Drupal/node/NodeTypeAccessController.php
index 55238a6c89a2..b7133bdd0f39 100644
--- a/core/modules/node/lib/Drupal/node/NodeTypeAccessController.php
+++ b/core/modules/node/lib/Drupal/node/NodeTypeAccessController.php
@@ -14,7 +14,7 @@
/**
* Defines an access controller for the node type entity.
*
- * @see \Drupal\node\Plugin\Core\Entity\NodeType.
+ * @see \Drupal\node\Entity\NodeType.
*/
class NodeTypeAccessController extends EntityAccessController {
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageAwareCombinationTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageAwareCombinationTest.php
index eef96b17ea3b..0459555471aa 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageAwareCombinationTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageAwareCombinationTest.php
@@ -31,14 +31,14 @@ class NodeAccessLanguageAwareCombinationTest extends NodeTestBase {
/**
* A normal authenticated user.
*
- * @var \Drupal\user\Plugin\Core\Entity\UserInterface.
+ * @var \Drupal\user\Entity\UserInterface.
*/
protected $web_user;
/**
* User 1.
*
- * @var \Drupal\user\Plugin\Core\Entity\UserInterface.
+ * @var \Drupal\user\Entity\UserInterface.
*/
protected $admin_user;
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTestBase.php b/core/modules/node/lib/Drupal/node/Tests/NodeTestBase.php
index 93eb3dd8d5c1..1043fb6fc9e1 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeTestBase.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeTestBase.php
@@ -40,7 +40,7 @@ function setUp() {
* and account, with each key as the name of an operation (e.g. 'view',
* 'delete') and each value a Boolean indicating whether access to that
* operation should be granted.
- * @param \Drupal\node\Plugin\Core\Entity\Node $node
+ * @param \Drupal\node\Entity\Node $node
* The node object to check.
* @param \Drupal\Core\Session\AccountInterface $account
* The user account for which to check access.
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/RowPluginTest.php b/core/modules/node/lib/Drupal/node/Tests/Views/RowPluginTest.php
index 4924f5693197..f5c59aeee985 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Views/RowPluginTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Views/RowPluginTest.php
@@ -86,7 +86,7 @@ protected function setUp() {
* (optional) An associative array of settings for the comment, as used in
* entity_create().
*
- * @return \Drupal\comment\Plugin\Core\Entity\Comment
+ * @return \Drupal\comment\Entity\Comment
* Returns the created and saved comment.
*/
public function drupalCreateComment(array $settings = array()) {
diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php
index 4fe295f467db..a6ec9ef4ae4c 100644
--- a/core/modules/node/node.api.php
+++ b/core/modules/node/node.api.php
@@ -788,7 +788,7 @@ function hook_node_submit(\Drupal\Core\Entity\EntityInterface $node, $form, &$fo
*
* @param \Drupal\Core\Entity\EntityInterface $node
* The node that is being assembled for rendering.
- * @param \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display
+ * @param \Drupal\entity\Entity\EntityDisplay $display
* The entity_display object holding the display options configured for the
* node components.
* @param string $view_mode
@@ -802,7 +802,7 @@ function hook_node_submit(\Drupal\Core\Entity\EntityInterface $node, $form, &$fo
*
* @ingroup node_api_hooks
*/
-function hook_node_view(\Drupal\Core\Entity\EntityInterface $node, \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display, $view_mode, $langcode) {
+function hook_node_view(\Drupal\Core\Entity\EntityInterface $node, \Drupal\entity\Entity\EntityDisplay $display, $view_mode, $langcode) {
// Only do the extra work if the component is configured to be displayed.
// This assumes a 'mymodule_addition' extra field has been defined for the
// node type in hook_field_extra_fields().
@@ -831,7 +831,7 @@ function hook_node_view(\Drupal\Core\Entity\EntityInterface $node, \Drupal\entit
* A renderable array representing the node content.
* @param \Drupal\Core\Entity\EntityInterface $node
* The node being rendered.
- * @param \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display
+ * @param \Drupal\entity\Entity\EntityDisplay $display
* The entity_display object holding the display options configured for the
* node components.
*
@@ -840,7 +840,7 @@ function hook_node_view(\Drupal\Core\Entity\EntityInterface $node, \Drupal\entit
*
* @ingroup node_api_hooks
*/
-function hook_node_view_alter(&$build, \Drupal\Core\Entity\EntityInterface $node, \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display) {
+function hook_node_view_alter(&$build, \Drupal\Core\Entity\EntityInterface $node, \Drupal\entity\Entity\EntityDisplay $display) {
if ($build['#view_mode'] == 'full' && isset($build['an_additional_field'])) {
// Change its weight.
$build['an_additional_field']['#weight'] = -10;
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index a47b72bad626..2353be3f3e69 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -20,8 +20,8 @@
use Drupal\node\NodeTypeInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Template\Attribute;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
-use Drupal\file\Plugin\Core\Entity\File;
+use Drupal\entity\Entity\EntityDisplay;
+use Drupal\file\Entity\File;
use Drupal\user\UserInterface;
/**
diff --git a/core/modules/node/tests/Drupal/node/Tests/Plugin/views/field/NodeBulkFormTest.php b/core/modules/node/tests/Drupal/node/Tests/Plugin/views/field/NodeBulkFormTest.php
index 56b750d151eb..fba2490a8635 100644
--- a/core/modules/node/tests/Drupal/node/Tests/Plugin/views/field/NodeBulkFormTest.php
+++ b/core/modules/node/tests/Drupal/node/Tests/Plugin/views/field/NodeBulkFormTest.php
@@ -32,7 +32,7 @@ public function testConstructor() {
$actions = array();
for ($i = 1; $i <= 2; $i++) {
- $action = $this->getMockBuilder('Drupal\system\Plugin\Core\Entity\Action')
+ $action = $this->getMockBuilder('Drupal\system\Entity\Action')
->disableOriginalConstructor()
->getMock();
$action->expects($this->any())
@@ -41,7 +41,7 @@ public function testConstructor() {
$actions[$i] = $action;
}
- $action = $this->getMockBuilder('Drupal\system\Plugin\Core\Entity\Action')
+ $action = $this->getMockBuilder('Drupal\system\Entity\Action')
->disableOriginalConstructor()
->getMock();
$action->expects($this->any())
diff --git a/core/modules/node/tests/modules/node_test/lib/Drupal/node_test/NodeTest.php b/core/modules/node/tests/modules/node_test/lib/Drupal/node_test/NodeTest.php
index a77ca7674f22..d224a9097a8e 100644
--- a/core/modules/node/tests/modules/node_test/lib/Drupal/node_test/NodeTest.php
+++ b/core/modules/node/tests/modules/node_test/lib/Drupal/node_test/NodeTest.php
@@ -7,7 +7,7 @@
namespace Drupal\node_test;
-use Drupal\node\Plugin\Core\Entity\Node;
+use Drupal\node\Entity\Node;
use Drupal\Core\Entity\EntityStorageControllerInterface;
/**
diff --git a/core/modules/node/tests/modules/node_test/node_test.module b/core/modules/node/tests/modules/node_test/node_test.module
index c0622a48ed4c..3da1eea03517 100644
--- a/core/modules/node/tests/modules/node_test/node_test.module
+++ b/core/modules/node/tests/modules/node_test/node_test.module
@@ -9,7 +9,7 @@
*/
use Drupal\Core\Entity\EntityInterface;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
+use Drupal\entity\Entity\EntityDisplay;
use Drupal\node\NodeInterface;
/**
diff --git a/core/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php b/core/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php
index ad947e4fa04d..1edfd9fe3209 100644
--- a/core/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php
+++ b/core/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php
@@ -25,14 +25,14 @@ class NumberFieldTest extends WebTestBase {
/**
* A field to use in this class.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
protected $field;
/**
* A field instance to use in this test class.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
protected $instance;
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUnitTestBase.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUnitTestBase.php
index 748ee6e4a20a..eda24da9df7f 100644
--- a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUnitTestBase.php
+++ b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUnitTestBase.php
@@ -39,14 +39,14 @@ class OptionsFieldUnitTestBase extends FieldUnitTestBase {
/**
* The list field used in the test.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
protected $field;
/**
* The list field instance used in the test.
*
- * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+ * @var \Drupal\field\Entity\FieldInstance
*/
protected $instance;
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php
index dbc1876f05ae..db77e611f183 100644
--- a/core/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php
+++ b/core/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php
@@ -25,21 +25,21 @@ class OptionsWidgetsTest extends FieldTestBase {
/**
* A field with cardinality 1 to use in this test class.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
protected $card_1;
/**
* A field with cardinality 2 to use in this test class.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
protected $card_2;
/**
* A boolean field to use in this test class.
*
- * @var \Drupal\field\Plugin\Core\Entity\Field
+ * @var \Drupal\field\Entity\Field
*/
protected $bool;
diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module
index 52edcf8c2a2f..3f6fbad5fcf0 100644
--- a/core/modules/overlay/overlay.module
+++ b/core/modules/overlay/overlay.module
@@ -8,7 +8,7 @@
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Drupal\block\Plugin\Core\Entity\Block;
+use Drupal\block\Entity\Block;
use Drupal\Core\Session\AccountInterface;
/**
diff --git a/core/modules/path/path.module b/core/modules/path/path.module
index 683f637e0469..9a52a9853129 100644
--- a/core/modules/path/path.module
+++ b/core/modules/path/path.module
@@ -7,7 +7,7 @@
use Drupal\Core\Language\Language;
use Drupal\node\NodeInterface;
-use Drupal\taxonomy\Plugin\Core\Entity\Term;
+use Drupal\taxonomy\Entity\Term;
/**
* Implements hook_help().
diff --git a/core/modules/picture/lib/Drupal/picture/Plugin/Core/Entity/PictureMapping.php b/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php
similarity index 99%
rename from core/modules/picture/lib/Drupal/picture/Plugin/Core/Entity/PictureMapping.php
rename to core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php
index e10f86f8f695..fb266fa5afe2 100644
--- a/core/modules/picture/lib/Drupal/picture/Plugin/Core/Entity/PictureMapping.php
+++ b/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php
@@ -5,7 +5,7 @@
* Definition of Drupal\picture\PictureMapping.
*/
-namespace Drupal\picture\Plugin\Core\Entity;
+namespace Drupal\picture\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/picture/lib/Drupal/picture/PictureMappingInterface.php b/core/modules/picture/lib/Drupal/picture/PictureMappingInterface.php
index 7ebf2d4eb093..ca03918511a0 100644
--- a/core/modules/picture/lib/Drupal/picture/PictureMappingInterface.php
+++ b/core/modules/picture/lib/Drupal/picture/PictureMappingInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\picture\Plugin\Core\Entity\PictureMappingInterface.
+ * Contains \Drupal\picture\Entity\PictureMappingInterface.
*/
namespace Drupal\picture;
diff --git a/core/modules/picture/lib/Drupal/picture/Tests/PictureAdminUITest.php b/core/modules/picture/lib/Drupal/picture/Tests/PictureAdminUITest.php
index e61cac6c0365..286372c42fb3 100644
--- a/core/modules/picture/lib/Drupal/picture/Tests/PictureAdminUITest.php
+++ b/core/modules/picture/lib/Drupal/picture/Tests/PictureAdminUITest.php
@@ -8,7 +8,7 @@
namespace Drupal\picture\Tests;
use Drupal\simpletest\WebTestBase;
-use Drupal\breakpoint\Plugin\Core\Entity\Breakpoint;
+use Drupal\breakpoint\Entity\Breakpoint;
/**
* Tests for breakpoint sets admin interface.
diff --git a/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php b/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php
index e23dbc536c15..6b3c18f89d64 100644
--- a/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php
+++ b/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php
@@ -8,7 +8,7 @@
namespace Drupal\picture\Tests;
use Drupal\Core\Language\Language;
-use Drupal\breakpoint\Plugin\Core\Entity\Breakpoint;
+use Drupal\breakpoint\Entity\Breakpoint;
use Drupal\image\Tests\ImageFieldTestBase;
/**
diff --git a/core/modules/picture/picture.module b/core/modules/picture/picture.module
index a15e06a4fb05..07e616a875b8 100644
--- a/core/modules/picture/picture.module
+++ b/core/modules/picture/picture.module
@@ -5,7 +5,7 @@
* Picture display formatter for image fields.
*/
-use Drupal\picture\Plugin\Core\Entity\PictureMapping;
+use Drupal\picture\Entity\PictureMapping;
use \Drupal\Core\Template\Attribute;
/**
diff --git a/core/modules/rdf/lib/Drupal/rdf/Plugin/Core/Entity/RdfMapping.php b/core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php
similarity index 96%
rename from core/modules/rdf/lib/Drupal/rdf/Plugin/Core/Entity/RdfMapping.php
rename to core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php
index 4d6245aee06b..4a5972e249cc 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Plugin/Core/Entity/RdfMapping.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\rdf\Plugin\Core\Entity\RdfMapping.
+ * Contains \Drupal\rdf\Entity\RdfMapping.
*/
-namespace Drupal\rdf\Plugin\Core\Entity;
+namespace Drupal\rdf\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/rdf/lib/Drupal/rdf/RdfMappingInterface.php b/core/modules/rdf/lib/Drupal/rdf/RdfMappingInterface.php
index 19b1e13523f8..458cd2d74ded 100644
--- a/core/modules/rdf/lib/Drupal/rdf/RdfMappingInterface.php
+++ b/core/modules/rdf/lib/Drupal/rdf/RdfMappingInterface.php
@@ -58,7 +58,7 @@ public function getBundleMapping();
* @param array $mapping
* The bundle mapping.
*
- * @return \Drupal\rdf\Plugin\Core\Entity\RdfMapping
+ * @return \Drupal\rdf\Entity\RdfMapping
* The RdfMapping object.
*/
public function setBundleMapping(array $mapping);
@@ -103,7 +103,7 @@ public function getFieldMapping($field_name);
* @param array $mapping
* The field mapping.
*
- * @return \Drupal\rdf\Plugin\Core\Entity\RdfMapping
+ * @return \Drupal\rdf\Entity\RdfMapping
* The RdfMapping object.
*/
public function setFieldMapping($field_name, array $mapping = array());
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
index 6aeac22131a5..44e147c5fad6 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
@@ -329,7 +329,7 @@ function _testBasicCommentRdfaMarkup($graph, $comment, $account = array()) {
* @param $pid
* Comment id of the parent comment in a thread.
*
- * @return \Drupal\comment\Plugin\Core\Entity\Comment
+ * @return \Drupal\comment\Entity\Comment
* The saved comment.
*/
function saveComment($nid, $uid, $contact = NULL, $pid = 0) {
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php
index 62767a623267..f4d2eb87f5ae 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php
@@ -503,7 +503,7 @@ protected function assertRdfaNodeCommentProperties($graph) {
* @param string $bundle
* The bundle of the comment.
*
- * @return \Drupal\comment\Plugin\Core\Entity\Comment
+ * @return \Drupal\comment\Entity\Comment
* The saved comment.
*/
protected function saveComment($nid, $uid, $contact = NULL, $pid = 0, $bundle = '') {
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyTermFieldAttributesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyTermFieldAttributesTest.php
index 70bdda044af8..5d298d909d64 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyTermFieldAttributesTest.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyTermFieldAttributesTest.php
@@ -147,7 +147,7 @@ function testNodeTeaser() {
*
* @param string $field_name
* The name of the field to create.
- * @param \Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary
+ * @param \Drupal\taxonomy\Entity\Vocabulary $vocabulary
* The vocabulary that the field should use.
*
* @todo Move this to TaxonomyTestBase, like the other field modules.
diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index 16f4b911ac92..27cda8baf13f 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -64,7 +64,7 @@ function rdf_help($path, $arg) {
* @param string $bundle
* The bundle.
*
- * @return \Drupal\rdf\Plugin\Core\Entity\RdfMapping
+ * @return \Drupal\rdf\Entity\RdfMapping
* The RdfMapping object.
*/
function rdf_get_mapping($entity_type, $bundle) {
diff --git a/core/modules/rest/rest.api.php b/core/modules/rest/rest.api.php
index 0e9409824641..2f3f6ee2c0d8 100644
--- a/core/modules/rest/rest.api.php
+++ b/core/modules/rest/rest.api.php
@@ -22,7 +22,7 @@ function hook_rest_resource_alter(&$definitions) {
// class.
$definitions['entity:node']['class'] = 'Drupal\mymodule\Plugin\rest\resource\NodeResource';
// Serialized nodes should be expanded to my specific node class.
- $definitions['entity:node']['serialization_class'] = 'Drupal\mymodule\Plugin\Core\Entity\MyNode';
+ $definitions['entity:node']['serialization_class'] = 'Drupal\mymodule\Entity\MyNode';
}
// We don't want Views to show up in the array of plugins at all.
unset($definitions['entity:view']);
diff --git a/core/modules/serialization/lib/Drupal/serialization/Tests/EntityResolverTest.php b/core/modules/serialization/lib/Drupal/serialization/Tests/EntityResolverTest.php
index 48d0293e61cf..fa20263f8388 100644
--- a/core/modules/serialization/lib/Drupal/serialization/Tests/EntityResolverTest.php
+++ b/core/modules/serialization/lib/Drupal/serialization/Tests/EntityResolverTest.php
@@ -89,7 +89,7 @@ function testUuidEntityResolver() {
),
);
- $denormalized = $this->container->get('serializer')->denormalize($data, 'Drupal\entity_test\Plugin\Core\Entity\EntityTestMulRev', $this->format);
+ $denormalized = $this->container->get('serializer')->denormalize($data, 'Drupal\entity_test\Entity\EntityTestMulRev', $this->format);
$field_value = $denormalized->get('field_test_entity_reference')->getValue();
$this->assertEqual($field_value[0]['target_id'], 1, 'Entity reference resolved using UUID.');
}
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Core/Entity/ShortcutSet.php b/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php
similarity index 97%
rename from core/modules/shortcut/lib/Drupal/shortcut/Plugin/Core/Entity/ShortcutSet.php
rename to core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php
index d55c61ba1f9f..392c3d8efbd1 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Core/Entity/ShortcutSet.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\shortcut\Plugin\Core\Entity\ShortcutSet.
+ * Contains \Drupal\shortcut\Entity\ShortcutSet.
*/
-namespace Drupal\shortcut\Plugin\Core\Entity;
+namespace Drupal\shortcut\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php b/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php
index 9546e7d021f6..75773dee783c 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php
@@ -8,7 +8,7 @@
namespace Drupal\shortcut\Form;
use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\menu_link\Plugin\Core\Entity\MenuLink;
+use Drupal\menu_link\Entity\MenuLink;
use Symfony\Component\HttpFoundation\Request;
/**
@@ -19,7 +19,7 @@ class LinkDelete extends ConfirmFormBase {
/**
* The menu link to delete.
*
- * @var \Drupal\menu_link\Plugin\Core\Entity\MenuLink
+ * @var \Drupal\menu_link\Entity\MenuLink
*/
protected $menuLink;
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetInterface.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetInterface.php
index d2849fca7d83..5fa358a4fd94 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetInterface.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\shortcut\Plugin\Core\Entity\ShortcutSetInterface.
+ * Contains \Drupal\shortcut\Entity\ShortcutSetInterface.
*/
namespace Drupal\shortcut;
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorageControllerInterface.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorageControllerInterface.php
index 2973d6d8ceb2..b4e9d9769ba4 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorageControllerInterface.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorageControllerInterface.php
@@ -51,7 +51,7 @@ public function deleteAssignedShortcutSets(ShortcutSetInterface $entity);
/**
* Get the name of the set assigned to this user.
*
- * @param \Drupal\user\Plugin\Core\Entity\User
+ * @param \Drupal\user\Entity\User
* The user account.
*
* @return string
diff --git a/core/modules/shortcut/shortcut.admin.inc b/core/modules/shortcut/shortcut.admin.inc
index b4067875db60..ff3113870951 100644
--- a/core/modules/shortcut/shortcut.admin.inc
+++ b/core/modules/shortcut/shortcut.admin.inc
@@ -178,7 +178,7 @@ function shortcut_set_switch_submit($form, &$form_state) {
* An associative array containing the structure of the form.
* @param $form_state
* An associative array containing the current state of the form.
- * @param $shortcut_set Drupal\shortcut\Plugin\Core\Entity\Shortcut
+ * @param $shortcut_set Drupal\shortcut\Entity\Shortcut
* An object representing the shortcut set to which the link will be added.
*
* @return
@@ -326,7 +326,7 @@ function shortcut_link_add_submit($form, &$form_state) {
*
* @param $link
* An array representing a shortcut link.
- * @param $shortcut_set Drupal\shortcut\Plugin\Core\Entity\Shortcut
+ * @param $shortcut_set Drupal\shortcut\Entity\Shortcut
* An object representing the shortcut set which the link will be added to.
* The links in the shortcut set will be re-weighted so that the new link is
* at the end, and some existing links may be disabled (if the $limit
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index 57ff7d73388a..15e8959aa971 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -5,7 +5,7 @@
* Allows users to manage customizable lists of shortcut links.
*/
-use Drupal\shortcut\Plugin\Core\Entity\Shortcut;
+use Drupal\shortcut\Entity\Shortcut;
/**
* Implements hook_help().
@@ -161,7 +161,7 @@ function shortcut_admin_paths() {
/**
* Access callback for editing a shortcut set.
*
- * @param $shortcut_set Drupal\shortcut\Plugin\Core\Entity\Shortcut
+ * @param $shortcut_set Drupal\shortcut\Entity\Shortcut
* (optional) The shortcut set to be edited. If not set, the current user's
* shortcut set will be used.
*
@@ -278,7 +278,7 @@ function shortcut_set_reset_link_weights(&$shortcut_set) {
/**
* Assigns a user to a particular shortcut set.
*
- * @param $shortcut_set Drupal\shortcut\Plugin\Core\Entity\Shortcut
+ * @param $shortcut_set Drupal\shortcut\Entity\Shortcut
* An object representing the shortcut set.
* @param $account
* A user account that will be assigned to use the set.
@@ -423,7 +423,7 @@ function shortcut_valid_link($path) {
/**
* Returns an array of shortcut links, suitable for rendering.
*
- * @param $shortcut_set Drupal\shortcut\Plugin\Core\Entity\Shortcut
+ * @param $shortcut_set Drupal\shortcut\Entity\Shortcut
* (optional) An object representing the set whose links will be displayed.
* If not provided, the user's current set will be displayed.
* @return
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index f1f5336cbfcd..4aec435b42a0 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -237,7 +237,7 @@ function drupalGetNodeByTitle($title, $reset = FALSE) {
* - revision: 1. (Backwards-compatible binary flag indicating whether a
* new revision should be created; use 1 to specify a new revision.)
*
- * @return \Drupal\node\Plugin\Core\Entity\Node
+ * @return \Drupal\node\Entity\Node
* The created node entity.
*/
protected function drupalCreateNode(array $settings = array()) {
@@ -301,7 +301,7 @@ protected function drupalCreateNode(array $settings = array()) {
* An array of settings to change from the defaults.
* Example: 'type' => 'foo'.
*
- * @return \Drupal\node\Plugin\Core\Entity\NodeType
+ * @return \Drupal\node\Entity\NodeType
* Created content type.
*/
protected function drupalCreateContentType(array $values = array()) {
@@ -355,7 +355,7 @@ protected function drupalCreateContentType(array $values = array()) {
* - theme: The default theme.
* - visibility: Empty array.
*
- * @return \Drupal\block\Plugin\Core\Entity\Block
+ * @return \Drupal\block\Entity\Block
* The block entity.
*
* @todo
@@ -465,7 +465,7 @@ protected function drupalCompareFiles($file1, $file2) {
* @param string $name
* The user name.
*
- * @return \Drupal\user\Plugin\Core\Entity\User|false
+ * @return \Drupal\user\Entity\User|false
* A fully loaded user object with pass_raw property, or FALSE if account
* creation fails.
*/
diff --git a/core/modules/simpletest/tests/Drupal/simpletest/Tests/phpunit_error.xml b/core/modules/simpletest/tests/Drupal/simpletest/Tests/phpunit_error.xml
index 95bde5dd11ea..82386aea74c1 100644
--- a/core/modules/simpletest/tests/Drupal/simpletest/Tests/phpunit_error.xml
+++ b/core/modules/simpletest/tests/Drupal/simpletest/Tests/phpunit_error.xml
@@ -20,19 +20,19 @@ Undefined index: foo
<testsuite name="Drupal\Tests\Core\Route\RoleAccessCheckTest" file="/var/www/d8/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTestkTest.php" namespace="Drupal\Tests\Core\Route" fullPackage="Drupal.Tests.Core.Route" tests="3" assertions="3" failures="3" errors="0" time="0.009176">
<testsuite name="Drupal\Tests\Core\Route\RoleAccessCheckTest::testRoleAccess" tests="3" assertions="3" failures="3" errors="0" time="0.009176">
<testcase name="testRoleAccess with data set #0" assertions="1" time="0.004519">
- <failure type="PHPUnit_Framework_ExpectationFailedException">Drupal\Tests\Core\Route\RoleAccessCheckTest::testRoleAccess with data set #0 ('role_test_1', array(Drupal\user\Plugin\Core\Entity\User, Drupal\user\Plugin\Core\Entity\User))
+ <failure type="PHPUnit_Framework_ExpectationFailedException">Drupal\Tests\Core\Route\RoleAccessCheckTest::testRoleAccess with data set #0 ('role_test_1', array(Drupal\user\Entity\User, Drupal\user\Entity\User))
Access granted for user with the roles role_test_1 on path: role_test_1
Failed asserting that false is true.
</failure>
</testcase>
<testcase name="testRoleAccess with data set #1" assertions="1" time="0.002354">
- <failure type="PHPUnit_Framework_ExpectationFailedException">Drupal\Tests\Core\Route\RoleAccessCheckTest::testRoleAccess with data set #1 ('role_test_2', array(Drupal\user\Plugin\Core\Entity\User, Drupal\user\Plugin\Core\Entity\User))
+ <failure type="PHPUnit_Framework_ExpectationFailedException">Drupal\Tests\Core\Route\RoleAccessCheckTest::testRoleAccess with data set #1 ('role_test_2', array(Drupal\user\Entity\User, Drupal\user\Entity\User))
Access granted for user with the roles role_test_2 on path: role_test_2
Failed asserting that false is true.
</failure>
</testcase>
<testcase name="testRoleAccess with data set #2" assertions="1" time="0.002303">
- <failure type="PHPUnit_Framework_ExpectationFailedException">Drupal\Tests\Core\Route\RoleAccessCheckTest::testRoleAccess with data set #2 ('role_test_3', array(Drupal\user\Plugin\Core\Entity\User))
+ <failure type="PHPUnit_Framework_ExpectationFailedException">Drupal\Tests\Core\Route\RoleAccessCheckTest::testRoleAccess with data set #2 ('role_test_3', array(Drupal\user\Entity\User))
Access granted for user with the roles role_test_1, role_test_2 on path: role_test_3
Failed asserting that false is true.
</failure>
diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/Views/IntegrationTest.php b/core/modules/statistics/lib/Drupal/statistics/Tests/Views/IntegrationTest.php
index f5f943aa4ecb..a16f824b71d7 100644
--- a/core/modules/statistics/lib/Drupal/statistics/Tests/Views/IntegrationTest.php
+++ b/core/modules/statistics/lib/Drupal/statistics/Tests/Views/IntegrationTest.php
@@ -35,7 +35,7 @@ class IntegrationTest extends ViewTestBase {
/**
* Stores the node object which is used by the test.
*
- * @var \Drupal\node\Plugin\Core\Entity\Node
+ * @var \Drupal\node\Entity\Node
*/
protected $node;
diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module
index 1faf13ea520c..81e1fd9ce5ae 100644
--- a/core/modules/statistics/statistics.module
+++ b/core/modules/statistics/statistics.module
@@ -6,7 +6,7 @@
*/
use Drupal\Core\Entity\EntityInterface;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
+use Drupal\entity\Entity\EntityDisplay;
/**
* Implements hook_help().
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Core/Entity/Action.php b/core/modules/system/lib/Drupal/system/Entity/Action.php
similarity index 97%
rename from core/modules/system/lib/Drupal/system/Plugin/Core/Entity/Action.php
rename to core/modules/system/lib/Drupal/system/Entity/Action.php
index 07591aa6ef68..5e3b5751bbc2 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Core/Entity/Action.php
+++ b/core/modules/system/lib/Drupal/system/Entity/Action.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\system\Plugin\Core\Entity\Action.
+ * Contains \Drupal\system\Entity\Action.
*/
-namespace Drupal\system\Plugin\Core\Entity;
+namespace Drupal\system\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Core/Entity/DateFormat.php b/core/modules/system/lib/Drupal/system/Entity/DateFormat.php
similarity index 97%
rename from core/modules/system/lib/Drupal/system/Plugin/Core/Entity/DateFormat.php
rename to core/modules/system/lib/Drupal/system/Entity/DateFormat.php
index e853b9bb66ea..7762b8804932 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Core/Entity/DateFormat.php
+++ b/core/modules/system/lib/Drupal/system/Entity/DateFormat.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\system\Plugin\Core\Entity\DateFormat.
+ * Contains \Drupal\system\Entity\DateFormat.
*/
-namespace Drupal\system\Plugin\Core\Entity;
+namespace Drupal\system\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Datetime\DrupalDateTime;
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Core/Entity/Menu.php b/core/modules/system/lib/Drupal/system/Entity/Menu.php
similarity index 91%
rename from core/modules/system/lib/Drupal/system/Plugin/Core/Entity/Menu.php
rename to core/modules/system/lib/Drupal/system/Entity/Menu.php
index ef690c2f5f05..7b2be7bdb4c8 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Core/Entity/Menu.php
+++ b/core/modules/system/lib/Drupal/system/Entity/Menu.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\system\Plugin\Core\Entity\Menu.
+ * Contains \Drupal\system\Entity\Menu.
*/
-namespace Drupal\system\Plugin\Core\Entity;
+namespace Drupal\system\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/system/lib/Drupal/system/MenuInterface.php b/core/modules/system/lib/Drupal/system/MenuInterface.php
index 11eca2c250ab..cd6e73e616ff 100644
--- a/core/modules/system/lib/Drupal/system/MenuInterface.php
+++ b/core/modules/system/lib/Drupal/system/MenuInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\system\Plugin\Core\Entity\MenuInterface.
+ * Contains \Drupal\system\Entity\MenuInterface.
*/
namespace Drupal\system;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php
index faa7090b3589..9db6310abcf0 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php
@@ -12,7 +12,7 @@
/**
* Defines a test for testing aggregation support for entity query.
*
- * @see \Drupal\entity_test\Plugin\Core\Entity\EntityTest
+ * @see \Drupal\entity_test\Entity\EntityTest
*/
class EntityQueryAggregateTest extends EntityUnitTestBase {
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php
index 34fb4cc5b174..b3b25bbacbc0 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php
@@ -57,7 +57,7 @@ public function setUp() {
* (optional) Array of permission names to assign to user. The
* users_roles tables must be installed before this can be used.
*
- * @return \Drupal\user\Plugin\Core\Entity\User
+ * @return \Drupal\user\Entity\User
* The created user entity.
*/
protected function createUser($values = array(), $permissions = array()) {
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeAccessTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeAccessTest.php
index 4dafee64d21b..263e2fcd8c10 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeAccessTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeAccessTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Menu;
-use Drupal\menu_link\Plugin\Core\Entity\MenuLink;
+use Drupal\menu_link\Entity\MenuLink;
use Drupal\simpletest\DrupalUnitTestBase;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Symfony\Component\Routing\Route;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php
index 1a7de01f1ebf..8b6c4a136dbe 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Menu;
-use Drupal\menu_link\Plugin\Core\Entity\MenuLink;
+use Drupal\menu_link\Entity\MenuLink;
use Drupal\simpletest\UnitTestBase;
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigTransTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/TwigTransTest.php
index a772a0612f2a..6d87db5d8526 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigTransTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/TwigTransTest.php
@@ -29,7 +29,7 @@ class TwigTransTest extends WebTestBase {
/**
* An administrative user for testing.
*
- * @var \Drupal\user\Plugin\Core\Entity\User
+ * @var \Drupal\user\Entity\User
*/
protected $admin_user;
diff --git a/core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Plugin/Core/Entity/EntityCacheTest.php b/core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Entity/EntityCacheTest.php
similarity index 76%
rename from core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Plugin/Core/Entity/EntityCacheTest.php
rename to core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Entity/EntityCacheTest.php
index 0a43318d9e79..1aad43719dcf 100644
--- a/core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Plugin/Core/Entity/EntityCacheTest.php
+++ b/core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Entity/EntityCacheTest.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains Drupal\entity_cache_test_dependency\Plugin\Core\Entity\EntityCacheTest.
+ * Contains Drupal\entity_cache_test_dependency\Entity\EntityCacheTest.
*/
-namespace Drupal\entity_cache_test_dependency\Plugin\Core\Entity;
+namespace Drupal\entity_cache_test_dependency\Entity;
use Drupal\Core\Entity\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module
index 05498f7e07aa..b4014704a447 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -6,9 +6,9 @@
*/
use Drupal\Core\Entity\EntityInterface;
-use Drupal\entity\Plugin\Core\Entity\EntityFormDisplay;
-use Drupal\field\Plugin\Core\Entity\Field;
-use Drupal\field\Plugin\Core\Entity\FieldInstance;
+use Drupal\entity\Entity\EntityFormDisplay;
+use Drupal\field\Entity\Field;
+use Drupal\field\Entity\FieldInstance;
/**
* Filter that limits test entity list to revisable ones.
@@ -286,7 +286,7 @@ function entity_test_edit(EntityInterface $entity) {
* @param bool $reset
* A boolean indicating that the internal cache should be reset.
*
- * @return \Drupal\entity_test\Plugin\Core\Entity\EntityTest
+ * @return \Drupal\entity_test\Entity\EntityTest
* The loaded entity object, or NULL if the entity cannot be loaded.
*/
function entity_test_load($id, $reset = FALSE) {
@@ -301,7 +301,7 @@ function entity_test_load($id, $reset = FALSE) {
* @param bool $reset
* A boolean indicating that the internal cache should be reset.
*
- * @return \Drupal\entity_test\Plugin\Core\Entity\EntityTestRev
+ * @return \Drupal\entity_test\Entity\EntityTestRev
* The loaded entity object, or NULL if the entity cannot be loaded.
*/
function entity_test_rev_load($id, $reset = FALSE) {
@@ -316,7 +316,7 @@ function entity_test_rev_load($id, $reset = FALSE) {
* @param bool $reset
* A boolean indicating that the internal cache should be reset.
*
- * @return \Drupal\entity_test\Plugin\Core\Entity\EntityTestMul
+ * @return \Drupal\entity_test\Entity\EntityTestMul
* The loaded entity object, or FALSE if the entity cannot be loaded.
*/
function entity_test_mul_load($id, $reset = FALSE) {
@@ -331,7 +331,7 @@ function entity_test_mul_load($id, $reset = FALSE) {
* @param bool $reset
* A boolean indicating that the internal cache should be reset.
*
- * @return \Drupal\entity_test\Plugin\Core\Entity\EntityTestMulRev
+ * @return \Drupal\entity_test\Entity\EntityTestMulRev
* The loaded entity object, or NULL if the entity cannot be loaded.
*/
function entity_test_mulrev_load($id, $reset = FALSE) {
@@ -468,9 +468,9 @@ function entity_test_entity_test_mul_translation_delete(EntityInterface $transla
*
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity the field belongs to.
- * @param \Drupal\field\Plugin\Core\Entity\Field $field
+ * @param \Drupal\field\Entity\Field $field
* The field for which default values should be provided.
- * @param \Drupal\field\Plugin\Core\Entity\FieldInstance $instance
+ * @param \Drupal\field\Entity\FieldInstance $instance
* The field instance for which default values should be provided.
* @param string $langcode
* The field language code to fill-in with the default value.
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTest.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php
similarity index 95%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTest.php
rename to core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php
index 332b322a1c13..16c49d2f07c5 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTest.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\entity_test\Plugin\Core\Entity\EntityTest.
+ * Definition of Drupal\entity_test\Entity\EntityTest.
*/
-namespace Drupal\entity_test\Plugin\Core\Entity;
+namespace Drupal\entity_test\Entity;
use Drupal\Core\Entity\EntityNG;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestCache.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php
similarity index 95%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestCache.php
rename to core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php
index c40b11e17684..504bdc8bdecd 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestCache.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\entity_test\Plugin\Core\Entity\EntityTestCache.
+ * Contains \Drupal\entity_test\Entity\EntityTestCache.
*/
-namespace Drupal\entity_test\Plugin\Core\Entity;
+namespace Drupal\entity_test\Entity;
use Drupal\Core\Entity\EntityNG;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestDefaultAccess.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php
similarity index 82%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestDefaultAccess.php
rename to core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php
index a06333842b61..4893c83201d6 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestDefaultAccess.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\entity_test\Plugin\Core\Entity\EntityTestDefaultAccess.
+ * Contains \Drupal\entity_test\Entity\EntityTestDefaultAccess.
*/
-namespace Drupal\entity_test\Plugin\Core\Entity;
+namespace Drupal\entity_test\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestLabel.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php
similarity index 82%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestLabel.php
rename to core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php
index 516635ba46fb..224da5a5958f 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestLabel.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\entity_test\Plugin\Core\Entity\EntityTestLabel.
+ * Contains \Drupal\entity_test\Entity\EntityTestLabel.
*/
-namespace Drupal\entity_test\Plugin\Core\Entity;
+namespace Drupal\entity_test\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestLabelCallback.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php
similarity index 84%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestLabelCallback.php
rename to core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php
index 867fd746b565..1784aa28c453 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestLabelCallback.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\entity_test\Plugin\Core\Entity\EntityTestLabelCallback.
+ * Contains \Drupal\entity_test\Entity\EntityTestLabelCallback.
*/
-namespace Drupal\entity_test\Plugin\Core\Entity;
+namespace Drupal\entity_test\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestMul.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php
similarity index 85%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestMul.php
rename to core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php
index 99455a51e307..2da7b65ea272 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestMul.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php
@@ -2,12 +2,12 @@
/**
* @file
- * Definition of Drupal\entity_test\Plugin\Core\Entity\EntityTestMul.
+ * Definition of Drupal\entity_test\Entity\EntityTestMul.
*/
-namespace Drupal\entity_test\Plugin\Core\Entity;
+namespace Drupal\entity_test\Entity;
-use Drupal\entity_test\Plugin\Core\Entity\EntityTest;
+use Drupal\entity_test\Entity\EntityTest;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestMulRev.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php
similarity index 86%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestMulRev.php
rename to core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php
index b0bd877571f8..5ad480a10577 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestMulRev.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php
@@ -2,12 +2,12 @@
/**
* @file
- * Definition of Drupal\entity_test\Plugin\Core\Entity\EntityTestMulRev.
+ * Definition of Drupal\entity_test\Entity\EntityTestMulRev.
*/
-namespace Drupal\entity_test\Plugin\Core\Entity;
+namespace Drupal\entity_test\Entity;
-use Drupal\entity_test\Plugin\Core\Entity\EntityTestRev;
+use Drupal\entity_test\Entity\EntityTestRev;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestNoLabel.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php
similarity index 82%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestNoLabel.php
rename to core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php
index 0af450bff374..f56a5e0fa95a 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestNoLabel.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\entity_test\Plugin\Core\Entity\EntityTestNoLabel.
+ * Contains \Drupal\entity_test\Entity\EntityTestNoLabel.
*/
-namespace Drupal\entity_test\Plugin\Core\Entity;
+namespace Drupal\entity_test\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestRender.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRender.php
similarity index 85%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestRender.php
rename to core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRender.php
index 90222ba4b294..3c0869d63305 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestRender.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRender.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\entity_test\Plugin\Core\Entity\EntityTestRender.
+ * Contains \Drupal\entity_test\Entity\EntityTestRender.
*/
-namespace Drupal\entity_test\Plugin\Core\Entity;
+namespace Drupal\entity_test\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestRev.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php
similarity index 89%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestRev.php
rename to core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php
index 6209cf572b20..cec6c2aa9491 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestRev.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php
@@ -2,12 +2,12 @@
/**
* @file
- * Definition of Drupal\entity_test\Plugin\Core\Entity\EntityTestRev.
+ * Definition of Drupal\entity_test\Entity\EntityTestRev.
*/
-namespace Drupal\entity_test\Plugin\Core\Entity;
+namespace Drupal\entity_test\Entity;
-use Drupal\entity_test\Plugin\Core\Entity\EntityTest;
+use Drupal\entity_test\Entity\EntityTest;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestRenderController.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestRenderController.php
index a333fa97c557..0c56533fdf68 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestRenderController.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestRenderController.php
@@ -12,7 +12,7 @@
/**
* Defines an entity render controller for a test entity.
*
- * @see \Drupal\entity_test\Plugin\Core\Entity\EntityTestRender
+ * @see \Drupal\entity_test\Entity\EntityTestRender
*/
class EntityTestRenderController extends EntityRenderController {
diff --git a/core/modules/system/tests/modules/menu_test/menu_test.module b/core/modules/system/tests/modules/menu_test/menu_test.module
index fd9a90068bf8..02fa65badcc9 100644
--- a/core/modules/system/tests/modules/menu_test/menu_test.module
+++ b/core/modules/system/tests/modules/menu_test/menu_test.module
@@ -5,7 +5,7 @@
* Module that implements various hooks for menu tests.
*/
-use Drupal\menu_link\Plugin\Core\Entity\MenuLink;
+use Drupal\menu_link\Entity\MenuLink;
/**
* Implements hook_menu().
diff --git a/core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestFileUsage.php b/core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestFileUsage.php
index 93919dcae895..c9f061915caf 100644
--- a/core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestFileUsage.php
+++ b/core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestFileUsage.php
@@ -7,7 +7,7 @@
namespace Drupal\service_provider_test;
-use Drupal\file\Plugin\Core\Entity\File;
+use Drupal\file\Entity\File;
use Drupal\file\FileUsage\FileUsageBase;
class TestFileUsage extends FileUsageBase {
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Term.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php
similarity index 97%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Term.php
rename to core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php
index 40de15ab264b..9dd69d7ac282 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Term.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\taxonomy\Plugin\Core\Entity\Term.
+ * Definition of Drupal\taxonomy\Entity\Term.
*/
-namespace Drupal\taxonomy\Plugin\Core\Entity;
+namespace Drupal\taxonomy\Entity;
use Drupal\Core\Entity\EntityNG;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Vocabulary.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php
similarity index 97%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Vocabulary.php
rename to core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php
index abcb75bf5cef..cd4e0967f9ac 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Vocabulary.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\taxonomy\Plugin\Core\Entity\Vocabulary.
+ * Contains \Drupal\taxonomy\Entity\Vocabulary.
*/
-namespace Drupal\taxonomy\Plugin\Core\Entity;
+namespace Drupal\taxonomy\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\EntityStorageControllerInterface;
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermAccessController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/TermAccessController.php
index d945ef529579..1678df25fe38 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/TermAccessController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/TermAccessController.php
@@ -14,7 +14,7 @@
/**
* Defines an access controller for the taxonomy term entity.
*
- * @see \Drupal\taxonomy\Plugin\Core\Entity\Term
+ * @see \Drupal\taxonomy\Entity\Term
*/
class TermAccessController extends EntityAccessController {
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermRenderController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/TermRenderController.php
index e7f8882080e9..cf319d0e5a30 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/TermRenderController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/TermRenderController.php
@@ -9,7 +9,7 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityRenderController;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
+use Drupal\entity\Entity\EntityDisplay;
/**
* Render controller for taxonomy terms.
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php
index 20f69884a67a..20becd171d91 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php
@@ -23,7 +23,7 @@ class TermTranslationUITest extends ContentTranslationUITest {
/**
* The vocabulary used for creating terms.
*
- * @var \Drupal\taxonomy\Plugin\Core\Entity\Vocabulary
+ * @var \Drupal\taxonomy\Entity\Vocabulary
*/
protected $vocabulary;
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyAccessController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyAccessController.php
index ac5ebe99df83..23fb42ab14b2 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyAccessController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyAccessController.php
@@ -14,7 +14,7 @@
/**
* Defines an access controller for the vocabulary entity.
*
- * @see \Drupal\taxonomy\Plugin\Core\Entity\Vocabulary.
+ * @see \Drupal\taxonomy\Entity\Vocabulary.
*/
class VocabularyAccessController extends EntityAccessController {
diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc
index b61424e195f6..4e7c5c2b7677 100644
--- a/core/modules/taxonomy/taxonomy.admin.inc
+++ b/core/modules/taxonomy/taxonomy.admin.inc
@@ -5,7 +5,7 @@
* Administrative page callbacks for the taxonomy module.
*/
-use Drupal\taxonomy\Plugin\Core\Entity\Vocabulary;
+use Drupal\taxonomy\Entity\Vocabulary;
/**
* Page callback: provides the vocabulary creation form.
@@ -25,7 +25,7 @@ function taxonomy_vocabulary_add() {
* Display a tree of all the terms in a vocabulary, with options to edit
* each one. The form is made drag and drop by the theme function.
*
- * @param Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary
+ * @param Drupal\taxonomy\Entity\Vocabulary $vocabulary
* The taxonomy vocabulary entity to list terms for.
*
* @ingroup forms
diff --git a/core/modules/taxonomy/taxonomy.api.php b/core/modules/taxonomy/taxonomy.api.php
index 7b20e8583228..44b5c52fe189 100644
--- a/core/modules/taxonomy/taxonomy.api.php
+++ b/core/modules/taxonomy/taxonomy.api.php
@@ -18,10 +18,10 @@
* This hook runs after a new vocabulary object has just been instantiated. It
* can be used to set initial values, e.g. to provide defaults.
*
- * @param \Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary
+ * @param \Drupal\taxonomy\Entity\Vocabulary $vocabulary
* The vocabulary object.
*/
-function hook_taxonomy_vocabulary_create(\Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary) {
+function hook_taxonomy_vocabulary_create(\Drupal\taxonomy\Entity\Vocabulary $vocabulary) {
if (!isset($vocabulary->foo)) {
$vocabulary->foo = NULL;
}
@@ -52,10 +52,10 @@ function hook_taxonomy_vocabulary_load(array $vocabularies) {
* Modules implementing this hook can act on the vocabulary object before it is
* inserted or updated.
*
- * @param Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary
+ * @param Drupal\taxonomy\Entity\Vocabulary $vocabulary
* A taxonomy vocabulary entity.
*/
-function hook_taxonomy_vocabulary_presave(Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary) {
+function hook_taxonomy_vocabulary_presave(Drupal\taxonomy\Entity\Vocabulary $vocabulary) {
$vocabulary->foo = 'bar';
}
@@ -65,10 +65,10 @@ function hook_taxonomy_vocabulary_presave(Drupal\taxonomy\Plugin\Core\Entity\Voc
* Modules implementing this hook can act on the vocabulary object when saved
* to the database.
*
- * @param Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary
+ * @param Drupal\taxonomy\Entity\Vocabulary $vocabulary
* A taxonomy vocabulary entity.
*/
-function hook_taxonomy_vocabulary_insert(Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary) {
+function hook_taxonomy_vocabulary_insert(Drupal\taxonomy\Entity\Vocabulary $vocabulary) {
if ($vocabulary->id() == 'my_vocabulary') {
$vocabulary->weight = 100;
}
@@ -79,10 +79,10 @@ function hook_taxonomy_vocabulary_insert(Drupal\taxonomy\Plugin\Core\Entity\Voca
*
* Modules implementing this hook can act on the vocabulary object when updated.
*
- * @param Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary
+ * @param Drupal\taxonomy\Entity\Vocabulary $vocabulary
* A taxonomy vocabulary entity.
*/
-function hook_taxonomy_vocabulary_update(Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary) {
+function hook_taxonomy_vocabulary_update(Drupal\taxonomy\Entity\Vocabulary $vocabulary) {
db_update('mytable')
->fields(array('foo' => $vocabulary->foo))
->condition('vid', $vocabulary->id())
@@ -95,12 +95,12 @@ function hook_taxonomy_vocabulary_update(Drupal\taxonomy\Plugin\Core\Entity\Voca
* This hook is invoked before entity_bundle_delete() is called and before
* the vocabulary is actually removed.
*
- * @param Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary
+ * @param Drupal\taxonomy\Entity\Vocabulary $vocabulary
* The taxonomy vocabulary entity that is about to be deleted.
*
* @see hook_taxonomy_vocabulary_delete()
*/
-function hook_taxonomy_vocabulary_predelete(Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary) {
+function hook_taxonomy_vocabulary_predelete(Drupal\taxonomy\Entity\Vocabulary $vocabulary) {
db_delete('mytable_index')
->condition('vid', $vocabulary->id())
->execute();
@@ -112,12 +112,12 @@ function hook_taxonomy_vocabulary_predelete(Drupal\taxonomy\Plugin\Core\Entity\V
* This hook is invoked after entity_bundle_delete() has been called and after
* the vocabulary has been removed.
*
- * @param Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary
+ * @param Drupal\taxonomy\Entity\Vocabulary $vocabulary
* The taxonomy vocabulary entity that has been deleted.
*
* @see hook_taxonomy_vocabulary_predelete()
*/
-function hook_taxonomy_vocabulary_delete(Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary) {
+function hook_taxonomy_vocabulary_delete(Drupal\taxonomy\Entity\Vocabulary $vocabulary) {
db_delete('mytable')
->condition('vid', $vocabulary->id())
->execute();
@@ -129,10 +129,10 @@ function hook_taxonomy_vocabulary_delete(Drupal\taxonomy\Plugin\Core\Entity\Voca
* This hook runs after a new term object has just been instantiated. It can be
* used to set initial values, e.g. to provide defaults.
*
- * @param \Drupal\taxonomy\Plugin\Core\Entity\Term $term
+ * @param \Drupal\taxonomy\Entity\Term $term
* The term object.
*/
-function hook_taxonomy_term_create(\Drupal\taxonomy\Plugin\Core\Entity\Term $term) {
+function hook_taxonomy_term_create(\Drupal\taxonomy\Entity\Term $term) {
if (!isset($term->foo)) {
$term->foo = 'some_initial_value';
}
@@ -248,9 +248,9 @@ function hook_taxonomy_term_delete(Drupal\taxonomy\Term $term) {
* structure of $term->content is a renderable array as expected by
* drupal_render().
*
- * @param \Drupal\taxonomy\Plugin\Core\Entity\Term $term
+ * @param \Drupal\taxonomy\Entity\Term $term
* The term that is being assembled for rendering.
- * @param \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display
+ * @param \Drupal\entity\Entity\EntityDisplay $display
* The entity_display object holding the display options configured for the
* term components.
* @param $view_mode
@@ -260,7 +260,7 @@ function hook_taxonomy_term_delete(Drupal\taxonomy\Term $term) {
*
* @see hook_entity_view()
*/
-function hook_taxonomy_term_view(\Drupal\taxonomy\Plugin\Core\Entity\Term $term, \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display, $view_mode, $langcode) {
+function hook_taxonomy_term_view(\Drupal\taxonomy\Entity\Term $term, \Drupal\entity\Entity\EntityDisplay $display, $view_mode, $langcode) {
// Only do the extra work if the component is configured to be displayed.
// This assumes a 'mymodule_addition' extra field has been defined for the
// vocabulary in hook_field_extra_fields().
@@ -287,15 +287,15 @@ function hook_taxonomy_term_view(\Drupal\taxonomy\Plugin\Core\Entity\Term $term,
*
* @param $build
* A renderable array representing the taxonomy term content.
- * @param \Drupal\taxonomy\Plugin\Core\Entity\Term $term
+ * @param \Drupal\taxonomy\Entity\Term $term
* The taxonomy term being rendered.
- * @param \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display
+ * @param \Drupal\entity\Entity\EntityDisplay $display
* The entity_display object holding the display options configured for the
* term components.
*
* @see hook_entity_view_alter()
*/
-function hook_taxonomy_term_view_alter(&$build, \Drupal\taxonomy\Plugin\Core\Entity\Term $term, \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display) {
+function hook_taxonomy_term_view_alter(&$build, \Drupal\taxonomy\Entity\Term $term, \Drupal\entity\Entity\EntityDisplay $display) {
if ($build['#view_mode'] == 'full' && isset($build['an_additional_field'])) {
// Change its weight.
$build['an_additional_field']['#weight'] = -10;
diff --git a/core/modules/taxonomy/taxonomy.install b/core/modules/taxonomy/taxonomy.install
index f89db3ac0374..4d4c952b289e 100644
--- a/core/modules/taxonomy/taxonomy.install
+++ b/core/modules/taxonomy/taxonomy.install
@@ -6,7 +6,7 @@
*/
use Drupal\Component\Uuid\Uuid;
-use Drupal\field\Plugin\Core\Entity\Field;
+use Drupal\field\Entity\Field;
/**
* Implements hook_uninstall().
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 17bbb8cf6a6b..0bfa84d4d330 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -6,9 +6,9 @@
*/
use Drupal\taxonomy\VocabularyInterface;
-use Drupal\node\Plugin\Core\Entity\Node;
-use Drupal\taxonomy\Plugin\Core\Entity\Term;
-use Drupal\taxonomy\Plugin\Core\Entity\Vocabulary;
+use Drupal\node\Entity\Node;
+use Drupal\taxonomy\Entity\Term;
+use Drupal\taxonomy\Entity\Vocabulary;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\Field\FieldDefinitionInterface;
@@ -401,7 +401,7 @@ function taxonomy_check_vocabulary_hierarchy(VocabularyInterface $vocabulary, $c
/**
* Generates an array which displays a term detail page.
*
- * @param Drupal\taxonomy\Plugin\Core\Entity\Term $term
+ * @param Drupal\taxonomy\Entity\Term $term
* A taxonomy term object.
* @param string $view_mode
* View mode, e.g. 'full', 'teaser'...
@@ -483,7 +483,7 @@ function template_preprocess_taxonomy_term(&$variables) {
/**
* Returns whether the current page is the page of the passed-in term.
*
- * @param Drupal\taxonomy\Plugin\Core\Entity\Term $term
+ * @param Drupal\taxonomy\Entity\Term $term
* A taxonomy term entity.
*/
function taxonomy_term_is_page(Term $term) {
@@ -810,7 +810,7 @@ function taxonomy_vocabulary_load_multiple(array $vids = NULL) {
* Sorts vocabularies by its weight and label.
*
* @param array $vocabularies
- * An array of \Drupal\taxonomy\Plugin\Core\Entity\Vocabulary objects.
+ * An array of \Drupal\taxonomy\Entity\Vocabulary objects.
*/
function taxonomy_vocabulary_sort(array &$vocabularies = array()) {
// @todo Remove error suppressing when http://drupal.org/node/1799600 is
@@ -826,7 +826,7 @@ function taxonomy_vocabulary_sort(array &$vocabularies = array()) {
* @param int $vid
* The vocabulary's ID.
*
- * @return \Drupal\taxonomy\Plugin\Core\Entity\Vocabulary|null
+ * @return \Drupal\taxonomy\Entity\Vocabulary|null
* The taxonomy vocabulary entity, if exists, NULL otherwise. Results are
* statically cached.
*/
@@ -842,7 +842,7 @@ function taxonomy_vocabulary_load($vid) {
* @param $tid
* A term's ID
*
- * @return \Drupal\taxonomy\Plugin\Core\Entity\Term|null
+ * @return \Drupal\taxonomy\Entity\Term|null
* A taxonomy term entity, or NULL if the term was not found. Results are
* statically cached.
*/
@@ -1020,7 +1020,7 @@ function taxonomy_allowed_values(FieldDefinitionInterface $field_definition, Ent
/**
* Title callback for term pages.
*
- * @param Drupal\taxonomy\Plugin\Core\Entity\Term $term
+ * @param Drupal\taxonomy\Entity\Term $term
* A taxonomy term entity.
*
* @return
@@ -1122,7 +1122,7 @@ function taxonomy_node_insert(EntityInterface $node) {
* The index lists all terms that are related to a given node entity, and is
* therefore maintained at the entity level.
*
- * @param \Drupal\node\Plugin\Core\Entity\Node $node
+ * @param \Drupal\node\Entity\Node $node
* The node entity.
*/
function taxonomy_build_node_index($node) {
diff --git a/core/modules/taxonomy/taxonomy.pages.inc b/core/modules/taxonomy/taxonomy.pages.inc
index 4baf150ed2a5..93f628d7e8bc 100644
--- a/core/modules/taxonomy/taxonomy.pages.inc
+++ b/core/modules/taxonomy/taxonomy.pages.inc
@@ -5,14 +5,14 @@
* Page callbacks for the taxonomy module.
*/
-use Drupal\taxonomy\Plugin\Core\Entity\Term;
-use Drupal\taxonomy\Plugin\Core\Entity\Vocabulary;
+use Drupal\taxonomy\Entity\Term;
+use Drupal\taxonomy\Entity\Vocabulary;
use Symfony\Component\HttpFoundation\JsonResponse;
/**
* Menu callback; displays all nodes associated with a term.
*
- * @param Drupal\taxonomy\Plugin\Core\Entity\Term $term
+ * @param Drupal\taxonomy\Entity\Term $term
* The taxonomy term entity.
*/
function taxonomy_term_page(Term $term) {
@@ -65,7 +65,7 @@ function taxonomy_term_page(Term $term) {
/**
* Generate the content feed for a taxonomy term.
*
- * @param Drupal\taxonomy\Plugin\Core\Entity\Term $term
+ * @param Drupal\taxonomy\Entity\Term $term
* The taxonomy term entity.
*/
function taxonomy_term_feed(Term $term) {
diff --git a/core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php b/core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php
index 0a2b9008f96d..3b19cb2e9a2c 100644
--- a/core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php
+++ b/core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php
@@ -9,7 +9,7 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Language\Language;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
+use Drupal\entity\Entity\EntityDisplay;
use Drupal\simpletest\DrupalUnitTestBase;
/**
@@ -117,7 +117,7 @@ protected function createEntity($values = array()) {
*
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity object with attached fields to render.
- * @param \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display
+ * @param \Drupal\entity\Entity\EntityDisplay $display
* The display to render the fields in.
*/
protected function renderEntityFields(EntityInterface $entity, EntityDisplay $display) {
diff --git a/core/modules/tour/lib/Drupal/tour/Plugin/Core/Entity/Tour.php b/core/modules/tour/lib/Drupal/tour/Entity/Tour.php
similarity index 96%
rename from core/modules/tour/lib/Drupal/tour/Plugin/Core/Entity/Tour.php
rename to core/modules/tour/lib/Drupal/tour/Entity/Tour.php
index 4b8ac15d615b..eaa58f86904d 100644
--- a/core/modules/tour/lib/Drupal/tour/Plugin/Core/Entity/Tour.php
+++ b/core/modules/tour/lib/Drupal/tour/Entity/Tour.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\tour\Plugin\Core\Entity\Tour.
+ * Contains \Drupal\tour\Entity\Tour.
*/
-namespace Drupal\tour\Plugin\Core\Entity;
+namespace Drupal\tour\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\Annotation\EntityType;
diff --git a/core/modules/tour/lib/Drupal/tour/TourInterface.php b/core/modules/tour/lib/Drupal/tour/TourInterface.php
index 4678a7b8f2dd..d5e4135395e4 100644
--- a/core/modules/tour/lib/Drupal/tour/TourInterface.php
+++ b/core/modules/tour/lib/Drupal/tour/TourInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\tour\Plugin\Core\Entity\TourInterface.
+ * Contains \Drupal\tour\Entity\TourInterface.
*/
namespace Drupal\tour;
diff --git a/core/modules/tour/tour.api.php b/core/modules/tour/tour.api.php
index 2f90d8f8ef8b..1836a1398dbc 100644
--- a/core/modules/tour/tour.api.php
+++ b/core/modules/tour/tour.api.php
@@ -40,7 +40,7 @@ function hook_tour_tips_info_alter(&$info) {
* Act on tour objects when loaded.
*
* @param array $entities
- * An array of \Drupal\tour\Plugin\Core\Entity\Tour objects, indexed by id.
+ * An array of \Drupal\tour\Entity\Tour objects, indexed by id.
*/
function hook_tour_load($entities) {
if (isset($entities['tour-entity-create-test-en'])) {
@@ -53,7 +53,7 @@ function hook_tour_load($entities) {
*
* This hook is invoked before the tour object is saved to configuration.
*
- * @param \Drupal\tour\Plugin\Core\Entity\Tour $entity
+ * @param \Drupal\tour\Entity\Tour $entity
* The tour object.
*
* @see hook_tour_insert()
@@ -68,7 +68,7 @@ function hook_tour_presave($entity) {
/**
* Respond to creation of a new tour.
*
- * @param \Drupal\tour\Plugin\Core\Entity\Tour $entity
+ * @param \Drupal\tour\Entity\Tour $entity
* The tour object being inserted.
*/
function hook_tour_insert($entity) {
@@ -79,7 +79,7 @@ function hook_tour_insert($entity) {
/**
* Respond to updates to a tour object.
*
- * @param \Drupal\tour\Plugin\Core\Entity\Tour $entity
+ * @param \Drupal\tour\Entity\Tour $entity
* The tour object being updated.
*/
function hook_tour_update($entity) {
diff --git a/core/modules/translation/translation.module b/core/modules/translation/translation.module
index 56a514787146..398fd4f65e41 100644
--- a/core/modules/translation/translation.module
+++ b/core/modules/translation/translation.module
@@ -22,7 +22,7 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityFormControllerInterface;
use Drupal\Core\Language\Language;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
+use Drupal\entity\Entity\EntityDisplay;
use Drupal\node\NodeInterface;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/Role.php b/core/modules/user/lib/Drupal/user/Entity/Role.php
similarity index 96%
rename from core/modules/user/lib/Drupal/user/Plugin/Core/Entity/Role.php
rename to core/modules/user/lib/Drupal/user/Entity/Role.php
index 4c6602affef1..2703b8b26d42 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/Role.php
+++ b/core/modules/user/lib/Drupal/user/Entity/Role.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains Drupal\user\Plugin\Core\Entity\Role.
+ * Contains Drupal\user\Entity\Role.
*/
-namespace Drupal\user\Plugin\Core\Entity;
+namespace Drupal\user\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/User.php b/core/modules/user/lib/Drupal/user/Entity/User.php
similarity index 98%
rename from core/modules/user/lib/Drupal/user/Plugin/Core/Entity/User.php
rename to core/modules/user/lib/Drupal/user/Entity/User.php
index 2a3116d0f375..4e87d1532cc2 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/User.php
+++ b/core/modules/user/lib/Drupal/user/Entity/User.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\user\Plugin\Core\Entity\User.
+ * Definition of Drupal\user\Entity\User.
*/
-namespace Drupal\user\Plugin\Core\Entity;
+namespace Drupal\user\Entity;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\Core\Entity\EntityMalformedException;
diff --git a/core/modules/user/lib/Drupal/user/RoleInterface.php b/core/modules/user/lib/Drupal/user/RoleInterface.php
index b6b749d0dcf5..7160a8ebee34 100644
--- a/core/modules/user/lib/Drupal/user/RoleInterface.php
+++ b/core/modules/user/lib/Drupal/user/RoleInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\user\Plugin\Core\Entity\RoleInterface.
+ * Contains \Drupal\user\Entity\RoleInterface.
*/
namespace Drupal\user;
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEntityTest.php b/core/modules/user/lib/Drupal/user/Tests/UserEntityTest.php
index 14d885c507d7..78e386d87261 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserEntityTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserEntityTest.php
@@ -9,12 +9,12 @@
use Drupal\Core\Language\Language;
use Drupal\simpletest\DrupalUnitTestBase;
-use Drupal\user\Plugin\Core\Entity\User;
+use Drupal\user\Entity\User;
/**
* Tests the user entity class.
*
- * @see \Drupal\user\Plugin\Core\Entity\User
+ * @see \Drupal\user\Entity\User
*/
class UserEntityTest extends DrupalUnitTestBase {
@@ -36,9 +36,9 @@ public static function getInfo() {
/**
* Tests some of the methods.
*
- * @see \Drupal\user\Plugin\Core\Entity\User::getRoles()
- * @see \Drupal\user\Plugin\Core\Entity\User::addRole()
- * @see \Drupal\user\Plugin\Core\Entity\User::removeRole()
+ * @see \Drupal\user\Entity\User::getRoles()
+ * @see \Drupal\user\Entity\User::addRole()
+ * @see \Drupal\user\Entity\User::removeRole()
*/
public function testUserMethods() {
$role_storage = $this->container->get('plugin.manager.entity')->getStorageController('user_role');
diff --git a/core/modules/user/tests/Drupal/user/Tests/Plugin/Action/AddRoleUserTest.php b/core/modules/user/tests/Drupal/user/Tests/Plugin/Action/AddRoleUserTest.php
index 71578cc5e256..bc32dbc08f1f 100644
--- a/core/modules/user/tests/Drupal/user/Tests/Plugin/Action/AddRoleUserTest.php
+++ b/core/modules/user/tests/Drupal/user/Tests/Plugin/Action/AddRoleUserTest.php
@@ -39,7 +39,7 @@ protected function setUp() {
parent::setUp();
$this->account = $this
- ->getMockBuilder('Drupal\user\Plugin\Core\Entity\User')
+ ->getMockBuilder('Drupal\user\Entity\User')
->disableOriginalConstructor()
->getMock();
}
diff --git a/core/modules/user/tests/Drupal/user/Tests/Plugin/Action/RemoveRoleUserTest.php b/core/modules/user/tests/Drupal/user/Tests/Plugin/Action/RemoveRoleUserTest.php
index a96a96cf9f72..7f650a756a67 100644
--- a/core/modules/user/tests/Drupal/user/Tests/Plugin/Action/RemoveRoleUserTest.php
+++ b/core/modules/user/tests/Drupal/user/Tests/Plugin/Action/RemoveRoleUserTest.php
@@ -39,7 +39,7 @@ protected function setUp() {
parent::setUp();
$this->account = $this
- ->getMockBuilder('Drupal\user\Plugin\Core\Entity\User')
+ ->getMockBuilder('Drupal\user\Entity\User')
->disableOriginalConstructor()
->getMock();
}
diff --git a/core/modules/user/tests/Drupal/user/Tests/Plugin/Core/Entity/UserTest.php b/core/modules/user/tests/Drupal/user/Tests/Plugin/Core/Entity/UserTest.php
index 0758f63b6172..597dbc0eedeb 100644
--- a/core/modules/user/tests/Drupal/user/Tests/Plugin/Core/Entity/UserTest.php
+++ b/core/modules/user/tests/Drupal/user/Tests/Plugin/Core/Entity/UserTest.php
@@ -2,18 +2,18 @@
/**
* @file
- * Contains \Drupal\user\Tests\Plugin\Core\Entity\UserTest.
+ * Contains \Drupal\user\Tests\Entity\UserTest.
*/
-namespace Drupal\user\Tests\Plugin\Core\Entity;
+namespace Drupal\user\Tests\Entity;
use Drupal\Tests\Core\Session\UserSessionTest;
-use Drupal\user\Plugin\Core\Entity\User;
+use Drupal\user\Entity\User;
/**
* Tests the user object.
*
- * @see \Drupal\user\Plugin\Core\Entity\User
+ * @see \Drupal\user\Entity\User
*/
class UserTest extends UserSessionTest {
@@ -29,7 +29,7 @@ public static function getInfo() {
* {@inheritdoc}
*/
protected function createUserSession(array $rids = array()) {
- $user = $this->getMockBuilder('Drupal\user\Plugin\Core\Entity\User')
+ $user = $this->getMockBuilder('Drupal\user\Entity\User')
->disableOriginalConstructor()
->setMethods(array('getRoles', 'id'))
->getMock();
diff --git a/core/modules/user/tests/Drupal/user/Tests/Plugin/views/field/UserBulkFormTest.php b/core/modules/user/tests/Drupal/user/Tests/Plugin/views/field/UserBulkFormTest.php
index 1214fc62e55d..44f88bfb7041 100644
--- a/core/modules/user/tests/Drupal/user/Tests/Plugin/views/field/UserBulkFormTest.php
+++ b/core/modules/user/tests/Drupal/user/Tests/Plugin/views/field/UserBulkFormTest.php
@@ -32,7 +32,7 @@ public function testConstructor() {
$actions = array();
for ($i = 1; $i <= 2; $i++) {
- $action = $this->getMockBuilder('Drupal\system\Plugin\Core\Entity\Action')
+ $action = $this->getMockBuilder('Drupal\system\Entity\Action')
->disableOriginalConstructor()
->getMock();
$action->expects($this->any())
@@ -41,7 +41,7 @@ public function testConstructor() {
$actions[$i] = $action;
}
- $action = $this->getMockBuilder('Drupal\system\Plugin\Core\Entity\Action')
+ $action = $this->getMockBuilder('Drupal\system\Entity\Action')
->disableOriginalConstructor()
->getMock();
$action->expects($this->any())
diff --git a/core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php b/core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php
index c5cd81766b92..71305a6bf6f7 100644
--- a/core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php
+++ b/core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php
@@ -10,7 +10,7 @@
use Drupal\Component\Utility\String;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Tests\UnitTestCase;
-use Drupal\user\Plugin\Core\Entity\Role;
+use Drupal\user\Entity\Role;
use Drupal\user\Plugin\views\argument\RolesRid;
/**
@@ -31,7 +31,7 @@ class RolesRidTest extends UnitTestCase {
'label' => 'label',
),
'config_prefix' => 'user.role',
- 'class' => 'Drupal\user\Plugin\Core\Entity\Role',
+ 'class' => 'Drupal\user\Entity\Role',
);
public static function getInfo() {
diff --git a/core/modules/user/user.api.php b/core/modules/user/user.api.php
index 07ba0eb37407..9d6f73e036c0 100644
--- a/core/modules/user/user.api.php
+++ b/core/modules/user/user.api.php
@@ -21,7 +21,7 @@
* @param \Drupal\user\UserInterface $user
* The user object.
*/
-function hook_user_create(\Drupal\user\Plugin\Core\Entity\User $user) {
+function hook_user_create(\Drupal\user\Entity\User $user) {
if (!isset($user->foo)) {
$user->foo = 'some_initial_value';
}
@@ -314,7 +314,7 @@ function hook_user_logout($account) {
*
* @param \Drupal\user\UserInterface $account
* The user object on which the operation is being performed.
- * @param \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display
+ * @param \Drupal\entity\Entity\EntityDisplay $display
* The entity_display object holding the display options configured for the
* user components.
* @param $view_mode
@@ -325,7 +325,7 @@ function hook_user_logout($account) {
* @see hook_user_view_alter()
* @see hook_entity_view()
*/
-function hook_user_view(\Drupal\user\UserInterface $account, \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display, $view_mode, $langcode) {
+function hook_user_view(\Drupal\user\UserInterface $account, \Drupal\entity\Entity\EntityDisplay $display, $view_mode, $langcode) {
// Only do the extra work if the component is configured to be displayed.
// This assumes a 'mymodule_addition' extra field has been defined for the
// user entity type in hook_field_extra_fields().
@@ -354,14 +354,14 @@ function hook_user_view(\Drupal\user\UserInterface $account, \Drupal\entity\Plug
* A renderable array representing the user.
* @param \Drupal\user\UserInterface $account
* The user account being rendered.
- * @param \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display
+ * @param \Drupal\entity\Entity\EntityDisplay $display
* The entity_display object holding the display options configured for the
* user components.
*
* @see user_view()
* @see hook_entity_view_alter()
*/
-function hook_user_view_alter(&$build, \Drupal\user\UserInterface $account, \Drupal\entity\Plugin\Core\Entity\EntityDisplay $display) {
+function hook_user_view_alter(&$build, \Drupal\user\UserInterface $account, \Drupal\entity\Entity\EntityDisplay $display) {
// Check for the existence of a field added by another module.
if (isset($build['an_additional_field'])) {
// Change its weight.
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index e3ff5257f7db..62ccfd691ef9 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -4,15 +4,15 @@
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Session\AccountInterface;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
-use Drupal\file\Plugin\Core\Entity\File;
-use Drupal\user\Plugin\Core\Entity\User;
+use Drupal\entity\Entity\EntityDisplay;
+use Drupal\file\Entity\File;
+use Drupal\user\Entity\User;
use Drupal\user\UserInterface;
use Drupal\user\RoleInterface;
use Drupal\Core\Template\Attribute;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Drupal\menu_link\Plugin\Core\Entity\MenuLink;
+use Drupal\menu_link\Entity\MenuLink;
/**
* @file
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php b/core/modules/views/lib/Drupal/views/Entity/View.php
similarity index 98%
rename from core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php
rename to core/modules/views/lib/Drupal/views/Entity/View.php
index b23afb737a88..e98ae018b3d7 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php
+++ b/core/modules/views/lib/Drupal/views/Entity/View.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\views\Plugin\Core\Entity\View.
+ * Definition of Drupal\views\Entity\View.
*/
-namespace Drupal\views\Plugin\Core\Entity;
+namespace Drupal\views\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\EntityStorageControllerInterface;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
index 2c91c5f2f0fc..ccafc56fea8e 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Plugin\views\wizard;
use Drupal\Component\Utility\NestedArray;
-use Drupal\views\Plugin\Core\Entity\View;
+use Drupal\views\Entity\View;
use Drupal\views\Views;
use Drupal\views_ui\ViewUI;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
diff --git a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
index 87dc3a59cf61..bc38e499a8e2 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
@@ -258,7 +258,7 @@ public function testViewsFetchPluginNames() {
* Helper to return an expected views option array.
*
* @param array $views
- * An array of Drupal\views\Plugin\Core\Entity\View objects for which to
+ * An array of Drupal\views\Entity\View objects for which to
* create an options array.
*
* @return array
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
index 4a696c30fc89..7c065f41367f 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Tests;
use Drupal\views\ViewStorageController;
-use Drupal\views\Plugin\Core\Entity\View;
+use Drupal\views\Entity\View;
use Drupal\views\Plugin\views\display\Page;
use Drupal\views\Plugin\views\display\DefaultDisplay;
use Drupal\views\Plugin\views\display\Feed;
@@ -16,7 +16,7 @@
/**
* Tests the functionality of View and ViewStorageController.
*
- * @see Drupal\views\Plugin\Core\Entity\View
+ * @see Drupal\views\Entity\View
* @see Drupal\views\ViewStorageController
*/
class ViewStorageTest extends ViewUnitTestBase {
@@ -221,7 +221,7 @@ protected function displayMethodTests() {
);
$view = $this->controller->create($config);
- // Tests Drupal\views\Plugin\Core\Entity\View::addDisplay()
+ // Tests Drupal\views\Entity\View::addDisplay()
$view = $this->controller->create(array());
$random_title = $this->randomName();
@@ -240,7 +240,7 @@ protected function displayMethodTests() {
$display = $view->get('display');
$this->assertEqual($display[$id]['display_title'], 'Page 3');
- // Tests Drupal\views\Plugin\Core\Entity\View::generateDisplayId().
+ // Tests Drupal\views\Entity\View::generateDisplayId().
// @todo Sadly this method is not public so it cannot be tested.
// $view = $this->controller->create(array());
// $this->assertEqual($view->generateDisplayId('default'), 'default', 'The plugin ID for default is always default.');
@@ -248,7 +248,7 @@ protected function displayMethodTests() {
// $view->addDisplay('feed', 'feed title');
// $this->assertEqual($view->generateDisplayId('feed'), 'feed_2', 'The generated ID for the first instance of a plugin type should have an suffix of _2.');
- // Tests Drupal\views\Plugin\Core\Entity\View::newDisplay().
+ // Tests Drupal\views\Entity\View::newDisplay().
$view = $this->controller->create(array());
$view->newDisplay('default');
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php b/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php
index 2f1b2ab09f30..a4c85674bca0 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php
@@ -10,7 +10,7 @@
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\simpletest\WebTestBase;
use Drupal\views\ViewExecutable;
-use Drupal\block\Plugin\Core\Entity\Block;
+use Drupal\block\Entity\Block;
/**
* Defines a base class for Views testing in the full web test environment.
@@ -239,7 +239,7 @@ protected function executeView($view, $args = array()) {
/**
* Checks to see whether a block appears on the page.
*
- * @param \Drupal\block\Plugin\Core\Entity\Block $block
+ * @param \Drupal\block\Entity\Block $block
* The block entity to find on the page.
*/
protected function assertBlockAppears(Block $block) {
@@ -250,7 +250,7 @@ protected function assertBlockAppears(Block $block) {
/**
* Checks to see whether a block does not appears on the page.
*
- * @param \Drupal\block\Plugin\Core\Entity\Block $block
+ * @param \Drupal\block\Entity\Block $block
* The block entity to find on the page.
*/
protected function assertNoBlockAppears(Block $block) {
@@ -261,7 +261,7 @@ protected function assertNoBlockAppears(Block $block) {
/**
* Find a block instance on the page.
*
- * @param \Drupal\block\Plugin\Core\Entity\Block $block
+ * @param \Drupal\block\Entity\Block $block
* The block entity to find on the page.
*
* @return array
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewsTaxonomyAutocompleteTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewsTaxonomyAutocompleteTest.php
index fdd8d54dd943..6dec14ca6d8e 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewsTaxonomyAutocompleteTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewsTaxonomyAutocompleteTest.php
@@ -94,7 +94,7 @@ public function testTaxonomyAutocomplete() {
* @param string $name
* (optional) The name of the taxonomy term.
*
- * @return \Drupal\taxonomy\Plugin\Core\Entity\Term
+ * @return \Drupal\taxonomy\Entity\Term
* The created taxonomy term.
*/
protected function createTerm($name = NULL) {
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php
index 21c95fbe1209..195d1737e699 100644
--- a/core/modules/views/lib/Drupal/views/ViewExecutable.php
+++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php
@@ -29,7 +29,7 @@ class ViewExecutable {
/**
* The config entity in which the view is stored.
*
- * @var Drupal\views\Plugin\Core\Entity\View
+ * @var Drupal\views\Entity\View
*/
public $storage;
diff --git a/core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php b/core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php
index 1debfe8bd297..94a2cf7ff889 100644
--- a/core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php
+++ b/core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php
@@ -85,7 +85,7 @@ protected function setUp() {
->setMethods(NULL)
->getMock();
- $this->view = $this->getMockBuilder('Drupal\views\Plugin\Core\Entity\View')
+ $this->view = $this->getMockBuilder('Drupal\views\Entity\View')
->disableOriginalConstructor()
->getMock();
diff --git a/core/modules/views/tests/Drupal/views/Tests/Plugin/field/CounterTest.php b/core/modules/views/tests/Drupal/views/Tests/Plugin/field/CounterTest.php
index 9bf4bfd0459f..43eb50e8a264 100644
--- a/core/modules/views/tests/Drupal/views/Tests/Plugin/field/CounterTest.php
+++ b/core/modules/views/tests/Drupal/views/Tests/Plugin/field/CounterTest.php
@@ -9,7 +9,7 @@
use Drupal\Component\Utility\String;
use Drupal\Tests\UnitTestCase;
-use Drupal\views\Plugin\Core\Entity\View;
+use Drupal\views\Entity\View;
use Drupal\views\Plugin\views\field\Counter;
use Drupal\views\ResultRow;
use Drupal\views\Tests\ViewTestData;
diff --git a/core/modules/views/tests/Drupal/views/Tests/ViewExecutableUnitTest.php b/core/modules/views/tests/Drupal/views/Tests/ViewExecutableUnitTest.php
index 5855bc43159f..650beba4eedc 100644
--- a/core/modules/views/tests/Drupal/views/Tests/ViewExecutableUnitTest.php
+++ b/core/modules/views/tests/Drupal/views/Tests/ViewExecutableUnitTest.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Tests;
use Drupal\Tests\UnitTestCase;
-use Drupal\views\Plugin\Core\Entity\View;
+use Drupal\views\Entity\View;
use Drupal\views\ViewExecutable;
/**
diff --git a/core/modules/views/tests/Drupal/views/Tests/ViewsTest.php b/core/modules/views/tests/Drupal/views/Tests/ViewsTest.php
index 91c22260c855..04667c11c162 100644
--- a/core/modules/views/tests/Drupal/views/Tests/ViewsTest.php
+++ b/core/modules/views/tests/Drupal/views/Tests/ViewsTest.php
@@ -9,7 +9,7 @@
use Drupal\Tests\UnitTestCase;
use Drupal\views\Views;
-use Drupal\views\Plugin\Core\Entity\View;
+use Drupal\views\Entity\View;
use Drupal\views\ViewExecutableFactory;
use Drupal;
use Drupal\Core\DependencyInjection\ContainerBuilder;
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 81b3e5962f45..5b375bf3935c 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -14,7 +14,7 @@
use Drupal\Core\Language\Language;
use Drupal\views\ViewExecutable;
use Drupal\Component\Plugin\Exception\PluginException;
-use Drupal\views\Plugin\Core\Entity\View;
+use Drupal\views\Entity\View;
use Drupal\views\Views;
use Drupal\field\FieldInstanceInterface;
@@ -1075,7 +1075,7 @@ function views_get_views_as_options($views_only = FALSE, $filter = 'all', $exclu
/**
* Returns whether the view is enabled.
*
- * @param Drupal\views\Plugin\Core\Entity\View $view
+ * @param Drupal\views\Entity\View $view
* The view object to check.
*
* @return bool
@@ -1088,7 +1088,7 @@ function views_view_is_enabled(View $view) {
/**
* Returns whether the view is disabled.
*
- * @param Drupal\views\Plugin\Core\Entity\View $view
+ * @param Drupal\views\Entity\View $view
* The view object to check.
*
* @return bool
@@ -1101,7 +1101,7 @@ function views_view_is_disabled(View $view) {
/**
* Enables and saves a view.
*
- * @param Drupal\views\Plugin\Core\Entity\View $view
+ * @param Drupal\views\Entity\View $view
* The View object to disable.
*/
function views_enable_view(View $view) {
@@ -1111,7 +1111,7 @@ function views_enable_view(View $view) {
/**
* Disables and saves a view.
*
- * @param Drupal\views\Plugin\Core\Entity\View $view
+ * @param Drupal\views\Entity\View $view
* The View object to disable.
*/
function views_disable_view(View $view) {
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
index f59178297ae9..33b81a668b4b 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
@@ -14,7 +14,7 @@
use Drupal\Core\TypedData\TypedDataInterface;
use Drupal\Core\Session\AccountInterface;
use Drupal\views\Plugin\views\query\Sql;
-use Drupal\views\Plugin\Core\Entity\View;
+use Drupal\views\Entity\View;
use Drupal\views\ViewStorageInterface;
/**
@@ -100,7 +100,7 @@ class ViewUI implements ViewStorageInterface {
/**
* The View storage object.
*
- * @var \Drupal\views\Plugin\Core\Entity\View
+ * @var \Drupal\views\Entity\View
*/
protected $storage;
diff --git a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListControllerTest.php b/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListControllerTest.php
index 2bd806ebdc17..ba82c0d19048 100644
--- a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListControllerTest.php
+++ b/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListControllerTest.php
@@ -10,7 +10,7 @@
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Tests\UnitTestCase;
-use Drupal\views\Plugin\Core\Entity\View;
+use Drupal\views\Entity\View;
use Drupal\views\ViewExecutableFactory;
class ViewListControllerTest extends UnitTestCase {
diff --git a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewUIObjectTest.php b/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewUIObjectTest.php
index 6aac5e4ed148..9b5211656ea3 100644
--- a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewUIObjectTest.php
+++ b/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewUIObjectTest.php
@@ -58,7 +58,7 @@ public function testEntityDecoration() {
}
}
- $storage = $this->getMock('Drupal\views\Plugin\Core\Entity\View', $interface_methods, array(array(), 'view'));
+ $storage = $this->getMock('Drupal\views\Entity\View', $interface_methods, array(array(), 'view'));
$executable = $this->getMockBuilder('Drupal\views\ViewExecutable')
->disableOriginalConstructor()
->setConstructorArgs(array($storage))
diff --git a/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php b/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php
index cfa1e290606b..943a1d5c1fbc 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php
@@ -49,7 +49,7 @@ public function testView() {
->will($this->returnValue($render_controller));
// Mock an 'entity_test_render' entity.
- $entity = $this->getMockBuilder('Drupal\entity_test\Plugin\Core\Entity\EntityTestRender')
+ $entity = $this->getMockBuilder('Drupal\entity_test\Entity\EntityTestRender')
->disableOriginalConstructor()
->getMock();
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
index 563a237f87b5..18a540361bf2 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
@@ -41,7 +41,7 @@ public function testAppliesTo() {
public function testAccess() {
$route = new Route('/foo', array(), array('_entity_access' => 'node.update'));
$request = new Request();
- $node = $this->getMockBuilder('Drupal\node\Plugin\Core\Entity\Node')
+ $node = $this->getMockBuilder('Drupal\node\Entity\Node')
->disableOriginalConstructor()
->getMock();
$node->expects($this->any())
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityListControllerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityListControllerTest.php
index ead80b5370d7..53556eb98cfa 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityListControllerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityListControllerTest.php
@@ -21,7 +21,7 @@ class EntityListControllerTest extends UnitTestCase {
/**
* The entity used to construct the EntityListController.
*
- * @var \Drupal\user\Plugin\Core\Entity\Role
+ * @var \Drupal\user\Entity\Role
*/
protected $role;
@@ -53,7 +53,7 @@ public static function getInfo() {
'label' => 'label',
),
'config_prefix' => 'user.role',
- 'class' => 'Drupal\user\Plugin\Core\Entity\Role',
+ 'class' => 'Drupal\user\Entity\Role',
);
@@ -64,7 +64,7 @@ protected function setUp() {
parent::setUp();
$this->role = $this
- ->getMockBuilder('Drupal\user\Plugin\Core\Entity\Role')
+ ->getMockBuilder('Drupal\user\Entity\Role')
->setConstructorArgs(array('entityInfo' => static::$entityInfo, 'user_role'))
->getMock();
diff --git a/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php b/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
index 1c26b56d3a62..10d644ad5270 100644
--- a/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
+++ b/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
@@ -67,7 +67,7 @@ protected function setUp() {
parent::setUp();
$roles = array();
- $roles['role_one'] = $this->getMockBuilder('Drupal\user\Plugin\Core\Entity\Role')
+ $roles['role_one'] = $this->getMockBuilder('Drupal\user\Entity\Role')
->disableOriginalConstructor()
->setMethods(array('hasPermission'))
->getMock();
@@ -79,7 +79,7 @@ protected function setUp() {
array('last example permission', FALSE),
)));
- $roles['role_two'] = $this->getMockBuilder('Drupal\user\Plugin\Core\Entity\Role')
+ $roles['role_two'] = $this->getMockBuilder('Drupal\user\Entity\Role')
->disableOriginalConstructor()
->setMethods(array('hasPermission'))
->getMock();
diff --git a/core/tests/Drupal/Tests/UnitTestCase.php b/core/tests/Drupal/Tests/UnitTestCase.php
index d4bd53f7dcbb..c8f32a605188 100644
--- a/core/tests/Drupal/Tests/UnitTestCase.php
+++ b/core/tests/Drupal/Tests/UnitTestCase.php
@@ -138,7 +138,7 @@ protected function getBlockMockWithMachineName($machine_name) {
->method('getMachineNameSuggestion')
->will($this->returnValue($machine_name));
- $block = $this->getMockBuilder('Drupal\block\Plugin\Core\Entity\Block')
+ $block = $this->getMockBuilder('Drupal\block\Entity\Block')
->disableOriginalConstructor()
->getMock();
$block->expects($this->any())
--
GitLab