Commit 523fb855 authored by webchick's avatar webchick

Issue #1847002 by tim.plunkett, effulgentsia, msonnabaum: Move entity type...

Issue #1847002 by tim.plunkett, effulgentsia, msonnabaum: Move entity type classes from Drupal$provider\Plugin\Core\Entity to Drupal$provider\Entity.
parent 7ed96147
......@@ -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'];
......
......@@ -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().
......
......@@ -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;
......
......@@ -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));
......
......@@ -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
......
......@@ -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.
......
......@@ -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) {
......
......@@ -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) {
......
......@@ -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;
......
......@@ -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,7 +2,7 @@
/**
* @file
* Contains \Drupal\aggregator\Plugin\Core\Entity\FeedInterface.
* Contains \Drupal\aggregator\Entity\FeedInterface.
*/
namespace Drupal\aggregator;
......
......@@ -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;
/**
......
......@@ -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,7 +2,7 @@
/**
* @file
* Contains \Drupal\aggregator\Plugin\Core\Entity\ItemInterface.
* Contains \Drupal\aggregator\Entity\ItemInterface.
*/
namespace Drupal\aggregator;
......
......@@ -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;
......
......@@ -7,7 +7,7 @@
namespace Drupal\aggregator;
use Drupal\aggregator\Plugin\Core\Entity\Item;
use Drupal\aggregator\Entity\Item;
use Drupal\core\Entity\EntityStorageControllerInterface;
/**
......
......@@ -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
......
......@@ -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:
......
......@@ -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.
*
*/
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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) {
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
/**
......
......@@ -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') {
......
......@@ -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) {
......
......@@ -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) {
......
......@@ -5,8 +5,8 @@
* Provides page callbacks for custom blocks.
*/