Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1847002 by tim.plunkett, effulgentsia, msonnabaum: Move entity type classes from Drupal$provider\Plugin\Core\Entity to Drupal$provider\Entity.

8.0.x
webchick 2013-08-18 14:16:19 -07:00
parent 7ed961472b
commit 523fb85533
296 changed files with 587 additions and 587 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/includes/entity.api.php
View File

@ -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'];

10
core/includes/entity.inc
View File

@ -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().

2
core/includes/menu.inc
View File

@ -9,7 +9,7 @@ use Drupal\Component\Utility\NestedArray;
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;

2
core/lib/Drupal/Core/Entity/EntityManager.php
View File

@ -112,7 +112,7 @@ class EntityManager extends PluginManagerBase {
$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));

4
core/lib/Drupal/Core/Entity/EntityRenderController.php
View File

@ -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 @@ class EntityRenderController implements EntityRenderControllerInterface {
* 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

2
core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
View File

@ -10,7 +10,7 @@ namespace Drupal\Core\Entity\Query\Sql;
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.

6
core/modules/aggregator/aggregator.module
View File

@ -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) {

8
core/modules/aggregator/aggregator.pages.inc
View File

@ -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) {

4
core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Feed.php → core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php
View File

@ -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;

4
core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Item.php → core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php
View File

@ -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;

2
core/modules/aggregator/lib/Drupal/aggregator/FeedInterface.php
View File

@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\aggregator\Plugin\Core\Entity\FeedInterface.
* Contains \Drupal\aggregator\Entity\FeedInterface.
*/
namespace Drupal\aggregator;

2
core/modules/aggregator/lib/Drupal/aggregator/FeedStorageController.php
View File

@ -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;
/**

2
core/modules/aggregator/lib/Drupal/aggregator/FeedStorageControllerInterface.php
View File

@ -7,7 +7,7 @@
namespace Drupal\aggregator;
use Drupal\aggregator\Plugin\Core\Entity\Feed;
use Drupal\aggregator\Entity\Feed;
use Drupal\Core\Entity\EntityStorageControllerInterface;
/**

2
core/modules/aggregator/lib/Drupal/aggregator/ItemInterface.php
View File

@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\aggregator\Plugin\Core\Entity\ItemInterface.
* Contains \Drupal\aggregator\Entity\ItemInterface.
*/
namespace Drupal\aggregator;

2
core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php
View File

@ -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;

2
core/modules/aggregator/lib/Drupal/aggregator/ItemStorageControllerInterface.php
View File

@ -7,7 +7,7 @@
namespace Drupal\aggregator;
use Drupal\aggregator\Plugin\Core\Entity\Item;
use Drupal\aggregator\Entity\Item;
use Drupal\core\Entity\EntityStorageControllerInterface;
/**

4
core/modules/aggregator/lib/Drupal/aggregator/Plugin/FetcherInterface.php
View File

@ -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

4
core/modules/aggregator/lib/Drupal/aggregator/Plugin/ParserInterface.php
View File

@ -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:

8
core/modules/aggregator/lib/Drupal/aggregator/Plugin/ProcessorInterface.php
View File

@ -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 @@ interface ProcessorInterface {
/**
* 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 @@ interface ProcessorInterface {
* 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 @@ interface ProcessorInterface {
* 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.
*
*/

2
core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
View File

@ -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;

2
core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/parser/DefaultParser.php
View File

@ -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;

2
core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/processor/DefaultProcessor.php
View File

@ -9,7 +9,7 @@ namespace Drupal\aggregator\Plugin\aggregator\processor;
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;

16
core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php
View File

@ -9,7 +9,7 @@ namespace Drupal\aggregator\Tests;
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 @@ abstract class AggregatorTestBase extends WebTestBase {
* @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 @@ abstract class AggregatorTestBase extends WebTestBase {
/**
* 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 @@ abstract class AggregatorTestBase extends WebTestBase {
* @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 @@ abstract class AggregatorTestBase extends WebTestBase {
* 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 @@ abstract class AggregatorTestBase extends WebTestBase {
/**
* 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 @@ abstract class AggregatorTestBase extends WebTestBase {
/**
* 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 @@ abstract class AggregatorTestBase extends WebTestBase {
/**
* 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) {

2
core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/fetcher/TestFetcher.php
View File

@ -9,7 +9,7 @@ namespace Drupal\aggregator_test\Plugin\aggregator\fetcher;
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;

2
core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/parser/TestParser.php
View File

@ -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;

2
core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/processor/TestProcessor.php
View File

@ -9,7 +9,7 @@ namespace Drupal\aggregator_test\Plugin\aggregator\processor;
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;

2
core/modules/block/block.admin.inc
View File

@ -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;
/**

6
core/modules/block/block.api.php
View File

@ -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') {

2
core/modules/block/block.module
View File

@ -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) {

8
core/modules/block/custom_block/custom_block.module
View File

@ -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) {

6
core/modules/block/custom_block/custom_block.pages.inc
View File

@ -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()

2
core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php
View File

@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\custom_block\Plugin\Core\Entity\CustomBlockInterface.
* Contains \Drupal\custom_block\Entity\CustomBlockInterface.
*/
namespace Drupal\custom_block;

2
core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockRenderController.php
View File

@ -9,7 +9,7 @@ namespace Drupal\custom_block;
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.

2
core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeInterface.php
View File

@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\custom_block\Plugin\Core\Entity\CustomBlockTypeInterface.
* Contains \Drupal\custom_block\Entity\CustomBlockTypeInterface.
*/
namespace Drupal\custom_block;

4
core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php → core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
View File

@ -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;

4
core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlockType.php → core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php
View File

@ -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;

6
core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php
View File

@ -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;

4
core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTestBase.php
View File

@ -59,7 +59,7 @@ abstract class CustomBlockTestBase extends WebTestBase {
* @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 @@ abstract class CustomBlockTestBase extends WebTestBase {
* @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) {

4
core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTranslationUITest.php
View File

@ -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 @@ class CustomBlockTranslationUITest extends ContentTranslationUITest {
* (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) {

2
core/modules/block/custom_block/tests/modules/custom_block_test/custom_block_test.module
View File

@ -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().

2
core/modules/block/lib/Drupal/block/BlockInterface.php
View File

@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\block\Plugin\Core\Entity\BlockInterface.
* Contains \Drupal\block\Entity\BlockInterface.
*/
namespace Drupal\block;

4
core/modules/block/lib/Drupal/block/Plugin/Core/Entity/Block.php → core/modules/block/lib/Drupal/block/Entity/Block.php
View File

@ -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;

2
core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
View File

@ -13,7 +13,7 @@ use Drupal\block_test\Plugin\Block\TestHtmlIdBlock;
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;
/**

6
core/modules/book/book.module
View File

@ -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) {

4
core/modules/book/book.pages.inc
View File

@ -22,7 +22,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* 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

10
core/modules/breakpoint/breakpoint.module
View File

@ -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()

2
core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroupInterface.php
View File

@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\breakpoint\Plugin\Core\Entity\BreakpointGroupInterface.
* Contains \Drupal\breakpoint\Entity\BreakpointGroupInterface.
*/
namespace Drupal\breakpoint;

2
core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointInterface.php
View File

@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\breakpoint\Plugin\Core\Entity\BreakpointInterface.
* Contains \Drupal\breakpoint\Entity\BreakpointInterface.
*/
namespace Drupal\breakpoint;

4
core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/Breakpoint.php → core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php
View File

@ -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;

8
core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/BreakpointGroup.php → core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
View File

@ -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;

2
core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointAPITest.php
View File

@ -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;

2
core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointCRUDTest.php
View File

@ -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.

4
core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupAPITest.php
View File

@ -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;

4
core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCRUDTest.php
View File

@ -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.

2
core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupTestBase.php
View File

@ -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.

2
core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointTestBase.php
View File

@ -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.

4
core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php
View File

@ -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.

2
core/modules/breakpoint/tests/Drupal/breakpoint/Tests/BreakpointMediaQueryTest.php
View File

@ -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;
/**

2
core/modules/ckeditor/ckeditor.api.php
View File

@ -5,7 +5,7 @@
* Documentation for CKEditor module APIs.
*/
use Drupal\editor\Plugin\Core\Entity\Editor;
use Drupal\editor\Entity\Editor;
/**
* @addtogroup hooks

2
core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginBase.php
View File

@ -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.

4
core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginConfigurableInterface.php
View File

@ -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

4
core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginContextualInterface.php
View File

@ -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

8
core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginInterface.php
View File

@ -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 @@ interface CKEditorPluginInterface extends PluginInspectionInterface {
/**
* 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 @@ interface CKEditorPluginInterface extends PluginInspectionInterface {
* 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 @@ interface CKEditorPluginInterface extends PluginInspectionInterface {
* 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.

6
core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginManager.php
View File

@ -12,7 +12,7 @@ use Drupal\Core\Plugin\DefaultPluginManager;
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 @@ class CKEditorPluginManager extends DefaultPluginManager {
* 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 @@ class CKEditorPluginManager extends DefaultPluginManager {
* 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) {

2
core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php
View File

@ -10,7 +10,7 @@ namespace Drupal\ckeditor\Plugin\CKEditorPlugin;
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.

2
core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php
View File

@ -10,7 +10,7 @@ namespace Drupal\ckeditor\Plugin\CKEditorPlugin;
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.

6
core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php
View File

@ -11,7 +11,7 @@ use Drupal\ckeditor\CKEditorPluginBase;
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 @@ class Internal extends CKEditorPluginBase {
*
* @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 @@ class Internal extends CKEditorPluginBase {
*
* @see getConfig()
*
* @param \Drupal\editor\Plugin\Core\Entity\Editor $editor
* @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
*
* @return string|TRUE

2
core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php
View File

@ -12,7 +12,7 @@ use Drupal\ckeditor\CKEditorPluginConfigurableInterface;
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.

6
core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
View File

@ -13,7 +13,7 @@ use Drupal\editor\Plugin\EditorBase;
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 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
*
* @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 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
*
* @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.

2
core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php
View File

@ -7,7 +7,7 @@
namespace Drupal\ckeditor\Tests;
use Drupal\editor\Plugin\Core\Entity\Editor;
use Drupal\editor\Entity\Editor;
use Drupal\simpletest\WebTestBase;
/**

2
core/modules/ckeditor/tests/modules/ckeditor_test.module
View File

@ -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().

2
core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php
View File

@ -11,7 +11,7 @@ use Drupal\ckeditor\CKEditorPluginInterface;
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.

2
core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php
View File

@ -11,7 +11,7 @@ use Drupal\ckeditor\CKEditorPluginContextualInterface;
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.

2
core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
View File

@ -13,7 +13,7 @@ use Drupal\ckeditor\CKEditorPluginConfigurableInterface;
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

4
core/modules/comment/comment.admin.inc
View File

@ -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()

16
core/modules/comment/comment.api.php
View File

@ -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.

8
core/modules/comment/comment.module
View File

@ -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_CLOSED = 1;
*/
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) {

2
core/modules/comment/comment.pages.inc
View File

@ -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;

2
core/modules/comment/lib/Drupal/comment/CommentAccessController.php
View File

@ -14,7 +14,7 @@ use Drupal\Core\Session\AccountInterface;
/**
* Access controller for the comment entity.
*
* @see \Drupal\comment\Plugin\Core\Entity\Comment.
* @see \Drupal\comment\Entity\Comment.
*/
class CommentAccessController extends EntityAccessController {

2
core/modules/comment/lib/Drupal/comment/CommentInterface.php
View File

@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\comment\Plugin\Core\Entity\CommentInterface.
* Contains \Drupal\comment\Entity\CommentInterface.
*/
namespace Drupal\comment;

2
core/modules/comment/lib/Drupal/comment/CommentRenderController.php
View File

@ -9,7 +9,7 @@ namespace Drupal\comment;
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.

4
core/modules/comment/lib/Drupal/comment/Controller/CommentController.php
View File

@ -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 @@ use Symfony\Component\HttpKernel\HttpKernelInterface;
/**
* Controller for the comment entity.
*
* @see \Drupal\comment\Plugin\Core\Entity\Comment.
* @see \Drupal\comment\Entity\Comment.
*/
class CommentController implements ControllerInterface {

4
core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php → core/modules/comment/lib/Drupal/comment/Entity/Comment.php
View File

@ -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;

2
core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
View File

@ -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;
/**

2
core/modules/comment/lib/Drupal/comment/Tests/Views/CommentTestBase.php
View File

@ -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;

2
core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
View File

@ -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;
/**

4
core/modules/config/tests/config_test/config_test.module
View File

@ -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 @@ require_once dirname(__FILE__) . '/config_test.hooks.inc';
/**
* 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) {

4
core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php
View File

@ -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

2
core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestInterface.php
View File

@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\config_test\Plugin\Core\Entity\ConfigTestInterface.
* Contains \Drupal\config_test\Entity\ConfigTestInterface.
*/
namespace Drupal\config_test;

4
core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigQueryTest.php → core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php
View File

@ -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;

4
core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php → core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php
View File

@ -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;

6
core/modules/contact/contact.module
View File

@ -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

4
core/modules/contact/contact.pages.inc
View File

@ -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

2
core/modules/contact/lib/Drupal/contact/CategoryAccessController.php
View File

@ -13,7 +13,7 @@ use Drupal\Core\Session\AccountInterface;
/**
* 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 {

2
core/modules/contact/lib/Drupal/contact/CategoryInterface.php
View File

@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\contact\Plugin\Core\Entity\CategoryInterface.
* Contains \Drupal\contact\Entity\CategoryInterface.
*/
namespace Drupal\contact;

4
core/modules/contact/lib/Drupal/contact/Plugin/Core/Entity/Category.php → core/modules/contact/lib/Drupal/contact/Entity/Category.php
View File

@ -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;

4
core/modules/contact/lib/Drupal/contact/Plugin/Core/Entity/Message.php → core/modules/contact/lib/Drupal/contact/Entity/Message.php
View File

@ -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;

2
core/modules/contact/lib/Drupal/contact/MessageInterface.php
View File

@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\contact\Plugin\Core\Entity\MessageInterface.
* Contains \Drupal\contact\Entity\MessageInterface.
*/
namespace Drupal\contact;

4
core/modules/contact/lib/Drupal/contact/Tests/MessageEntityTest.php
View File

@ -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 {

2
core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php
View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More