Issue #2313811 by undertext | andyceo: Fixed Inconsistent interface location:...

Issue #2313811 by undertext | andyceo: Fixed Inconsistent interface location: core/modules/menu_link_content/src/Entity/MenuLinkContentInterface.php.

core/modules/menu_link_content/src/Entity/MenuLinkContent.php

@@ -12,6 +12,7 @@
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\FieldDefinition;
 use Drupal\Core\Url;
+use Drupal\menu_link_content\MenuLinkContentInterface;
 
 /**
  * Defines the menu link content entity class.

core/modules/menu_link_content/src/Form/MenuLinkContentForm.php

@@ -38,7 +38,7 @@ class MenuLinkContentForm extends ContentEntityForm implements MenuLinkFormInter
   /**
    * The content menu link.
    *
-   * @var \Drupal\menu_link_content\Entity\MenuLinkContentInterface
+   * @var \Drupal\menu_link_content\MenuLinkContentInterface
    */
   protected $entity;
 
@@ -336,7 +336,7 @@ public function validate(array $form, FormStateInterface $form_state) {
    * {@inheritdoc}
    */
   public function buildEntity(array $form, FormStateInterface $form_state) {
-    /** @var \Drupal\menu_link_content\Entity\MenuLinkContentInterface $entity */
+    /** @var \Drupal\menu_link_content\MenuLinkContentInterface $entity */
     $entity = parent::buildEntity($form, $form_state);
     $new_definition = $this->extractFormValues($form, $form_state);
 

core/modules/menu_link_content/src/Entity/MenuLinkContentInterface.php → core/modules/menu_link_content/src/MenuLinkContentInterface.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\menu_link_content\Entity\MenuLinkContentInterface.
+ * Contains \Drupal\menu_link_content\MenuLinkContentInterface.
  */
 
-namespace Drupal\menu_link_content\Entity;
+namespace Drupal\menu_link_content;
 
 use Drupal\Core\Entity\ContentEntityInterface;
 

core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php

@@ -49,7 +49,7 @@ class MenuLinkContent extends MenuLinkBase implements ContainerFactoryPluginInte
   /**
    * The menu link content entity connected to this plugin instance.
    *
-   * @var \Drupal\menu_link_content\Entity\MenuLinkContentInterface
+   * @var \Drupal\menu_link_content\MenuLinkContentInterface
    */
   protected $entity;
 
@@ -111,7 +111,7 @@ public static function create(ContainerInterface $container, array $configuratio
   /**
    * Loads the entity associated with this menu link.
    *
-   * @return \Drupal\menu_link_content\Entity\MenuLinkContentInterface
+   * @return \Drupal\menu_link_content\MenuLinkContentInterface
    *   The menu link content entity.
    *
    * @throws \Drupal\Component\Plugin\Exception\PluginException
@@ -143,7 +143,7 @@ protected function getEntity() {
       // Clone the entity object to avoid tampering with the static cache.
       $this->entity = clone $entity;
       $the_entity = $this->entityManager->getTranslationFromContext($this->entity);
-      /** @var \Drupal\menu_link_content\Entity\MenuLinkContentInterface $the_entity */
+      /** @var \Drupal\menu_link_content\MenuLinkContentInterface $the_entity */
       $this->entity = $the_entity;
       $this->entity->setInsidePlugin();
     }

core/modules/menu_ui/menu_ui.module

@@ -192,7 +192,7 @@ function menu_ui_node_type_delete(NodeTypeInterface $type) {
  */
 function menu_ui_node_save(EntityInterface $node) {
   if (!empty($node->menu)) {
-    /** @var \Drupal\menu_link_content\Entity\MenuLinkContentInterface $entity */
+    /** @var \Drupal\menu_link_content\MenuLinkContentInterface $entity */
     $definition = $node->menu;
     if (trim($definition['title'])) {
       if (!empty($definition['entity_id'])) {

core/modules/menu_ui/src/Tests/MenuTest.php

@@ -51,7 +51,7 @@ class MenuTest extends MenuWebTestBase {
   /**
    * An array of test menu links.
    *
-   * @var \Drupal\menu_link_content\Entity\MenuLinkContentInterface[]
+   * @var \Drupal\menu_link_content\MenuLinkContentInterface[]
    */
   protected $items;
 
@@ -605,7 +605,7 @@ function verifyMenuLink(MenuLinkContent $item, $item_node, MenuLinkContent $pare
   /**
    * Changes the parent of a menu link using the UI.
    *
-   * @param \Drupal\menu_link_content\Entity\MenuLinkContentInterface $item
+   * @param \Drupal\menu_link_content\MenuLinkContentInterface $item
    *   The menu link item to move.
    * @param int $parent
    *   The id of the new parent.

core/modules/system/src/Tests/Menu/BreadcrumbTest.php

@@ -258,7 +258,7 @@ function testBreadCrumbs() {
     $this->drupalLogout();
     foreach ($tags as $name => $data) {
       $term = $data['term'];
-      /** @var \Drupal\menu_link_content\Entity\MenuLinkContentInterface $link */
+      /** @var \Drupal\menu_link_content\MenuLinkContentInterface $link */
       $link = $data['link'];
 
       $link_path = $link->getUrlObject()->getInternalPath();