Verified Commit 627361ec authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3421114 by tstoeckler: [regression] Entity::toUrl() without argument is... 

Issue #3421114 by tstoeckler: [regression] Entity::toUrl() without argument is broken for entity types with a URI callback

(cherry picked from commit c51465dd)
parent 41d193f7

core/lib/Drupal/Core/Entity/EntityBase.php

+9 −8
Original line number Diff line number Diff line
@@ -164,6 +164,13 @@ public function toUrl($rel = NULL, array $options = []) { 
    // The links array might contain URI templates set in annotations.

    $link_templates = $this->linkTemplates();



    // Links pointing to the current revision point to the actual entity. So

    // instead of using the 'revision' link, use the 'canonical' link.

    if ($rel === 'revision' && $this instanceof RevisionableInterface && $this->isDefaultRevision()) {

      $rel = 'canonical';

    }



    $exception_message = "No link template '$rel' found for the '{$this->getEntityTypeId()}' entity type";

    // Use the canonical link template by default, or edit-form if there is not

    // a canonical one.

    if ($rel === NULL) {
@@ -174,16 +181,10 @@ public function toUrl($rel = NULL, array $options = []) { 
        $rel = 'edit-form';

      }

      else {

        throw new UndefinedLinkTemplateException("Cannot generate default URL because no link template 'canonical' or 'edit-form' was found for the '{$this->getEntityTypeId()}' entity type");

        $exception_message = "Cannot generate default URL because no link template 'canonical' or 'edit-form' was found for the '{$this->getEntityTypeId()}' entity type";

      }

    }



    // Links pointing to the current revision point to the actual entity. So

    // instead of using the 'revision' link, use the 'canonical' link.

    if ($rel === 'revision' && $this instanceof RevisionableInterface && $this->isDefaultRevision()) {

      $rel = 'canonical';

    }



    if (isset($link_templates[$rel])) {

      $route_parameters = $this->urlRouteParameters($rel);

      $route_name = "entity.{$this->entityTypeId}." . str_replace(['-', 'drupal:'], ['_', ''], $rel);
@@ -207,7 +208,7 @@ public function toUrl($rel = NULL, array $options = []) { 
        $uri = call_user_func($uri_callback, $this);

      }

      else {

        throw new UndefinedLinkTemplateException("No link template '$rel' found for the '{$this->getEntityTypeId()}' entity type");

        throw new UndefinedLinkTemplateException($exception_message);

      }

    }

core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php

+4 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ public function testToUrlNoId() { 
  public function testToUrlDefaultException(): void {

    $values = ['id' => $this->entityId];

    $entity = $this->getEntity(UrlTestEntity::class, $values);

    $this->entityType->getUriCallback()->willReturn(NULL);



    $this->expectException(UndefinedLinkTemplateException::class);

    $this->expectExceptionMessage("Cannot generate default URL because no link template 'canonical' or 'edit-form' was found for the '" . $this->entityTypeId . "' entity type");
@@ -409,6 +410,9 @@ public function testToUrlUriCallback(array $bundle_info, $uri_callback) { 
    /** @var \Drupal\Core\Url $url */

    $url = $entity->toUrl('canonical');

    $this->assertUrl('<none>', [], $entity, TRUE, $url);



    $url = $entity->toUrl();

    $this->assertUrl('<none>', [], $entity, TRUE, $url);

  }



  /**