Convert menu_link_uri() to $entity->uri()

Changed to the proper component.

Patch in #3 was not applying correctly anymore on HEAD. Rerolled.

+++ b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.phpundefined
@@ -611,5 +610,16 @@ public function findParent(EntityStorageControllerInterface $storage_controller,
+  public function uri() {
+    return array(
+      'path' => '$menu_link->link_path' . $this->id(),
+      'options' => array(
+        'entity_type' => $this->entityType,
+        'entity' => $this,
+      )
+    );

This returns the literal text '$menu_link->link_path{ID}'. Path should just be $this->link_path (no quotes).

Well, actually I don't understand why @kgoel didn't use only $this->menu_link as in the original menu_link_uri() callback...
Why do we need to append any id to the path ?

Tthere is no reason to append an ID. Just $this->link_path is enough.

Patch updated accordingly.

BTW, Entity::uri() now takes a $rel parameter and I'm not really sure about how to handle that.

Can't we eventually end up to directly use annotations on the MenuLink class to provide the right template ?

Fixed stupid $this mistake.

This patch needs to be re-rolled because it no longer applies against the current HEAD.

Re-rolled.

Patch no longer applies.

Rerolled.

+++ b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
@@ -621,6 +620,19 @@ protected function findParent(EntityStorageControllerInterface $storage_controll
+    return array(
+      'path' => $this->link_path,

We should return 'route_name' and 'route_parameters' if available. For external links we still need to return the path.

Well... it seems that there's no more uri() method in Entity class, nor in EntityInterface so I'm a bit lost now.

Is it still "uri()" the right method to implement ?

There is url().

This is major until all URI callbacks are gone, since you cannot use the url() method with a callback if you have no templates.

I think #2301319: MenuLinkNG part5: Remove dead code; and party! will remove this, so closing as duplicate.