Skip to content
Snippets Groups Projects
Verified Commit c51465dd 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
parent 54f3e98a
No related branches found
No related tags found
26 merge requests!8528Issue #3456871 by Tim Bozeman: Support NULL services,!3878Removed unused condition head title for views,!38582585169-10.1.x,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3668Resolve #3347842 "Deprecate the trusted",!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3226Issue #2987537: Custom menu link entity type should not declare "bundle" entity key,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2964Issue #2865710 : Dependencies from only one instance of a widget are used in display modes,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2062Issue #3246454: Add weekly granularity to views date sort,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493
Pipeline #95804 canceled
Stage: 🏗️ Build
Stage: 🪄 Lint
Stage: 🗜️ Test
Pipeline: drupal

#95807

    Hide whitespace changes
    Inline Side-by-side
    core/lib/Drupal/Core/Entity/EntityBase.php
    + 9
    − 8
    View file @ c51465dd
    ......@@ -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
    View file @ c51465dd
    ......@@ -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);
    }
    /**
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment