Skip to content
Snippets Groups Projects
Commit 9231c9cf authored by catch's avatar catch
Browse files

Issue #3409895 by acbramley, longwave, smustgrave: [regression] toUrl can... 

Issue #3409895 by acbramley, longwave, smustgrave: [regression] toUrl can incorrectly return edit-form url when another link template shares the canonical url
parent c5db4bb2
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 #93718 passed
Stage: 🏗️ Build
Stage: 🪄 Lint
Stage: 🗜️ Test
Pipeline: drupal

#93722

    Hide whitespace changes
    Inline Side-by-side
    core/lib/Drupal/Core/Entity/EntityBase.php
    + 7
    − 6
    View file @ 9231c9cf
    ...@@ -167,12 +167,13 @@ public function toUrl($rel = NULL, array $options = []) { ...@@ -167,12 +167,13 @@ public function toUrl($rel = NULL, array $options = []) {
    // Use the canonical link template by default, or edit-form if there is not // Use the canonical link template by default, or edit-form if there is not
    // a canonical one. // a canonical one.
    if ($rel === NULL) { if ($rel === NULL) {
    $rel_candidates = array_intersect( if (isset($link_templates['canonical'])) {
    ['canonical', 'edit-form'], $rel = 'canonical';
    array_flip($link_templates), }
    ); elseif (isset($link_templates['edit-form'])) {
    $rel = array_shift($rel_candidates); $rel = 'edit-form';
    if ($rel === NULL) { }
    else {
    throw new UndefinedLinkTemplateException("Cannot generate default URL because no link template 'canonical' or 'edit-form' was found for the '{$this->getEntityTypeId()}' entity type"); throw new UndefinedLinkTemplateException("Cannot generate default URL because no link template 'canonical' or 'edit-form' was found for the '{$this->getEntityTypeId()}' entity type");
    } }
    } }
    ......
    core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
    + 28
    − 4
    View file @ 9231c9cf
    ...@@ -110,27 +110,51 @@ public function testToUrlNoId() { ...@@ -110,27 +110,51 @@ public function testToUrlNoId() {
    } }
    /** /**
    * Tests the toUrl() method without specifying the $rel parameter.. * Tests the toUrl() method without specifying the $rel parameter.
    *
    * It should throw an exception when neither canonical and edit-form link
    * templates exist if no parameters are passed in.
    * *
    * @covers ::toUrl * @covers ::toUrl
    */ */
    public function testToUrlDefault() { public function testToUrlDefaultException(): void {
    $values = ['id' => $this->entityId]; $values = ['id' => $this->entityId];
    $entity = $this->getEntity(UrlTestEntity::class, $values); $entity = $this->getEntity(UrlTestEntity::class, $values);
    $this->expectException(UndefinedLinkTemplateException::class); $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"); $this->expectExceptionMessage("Cannot generate default URL because no link template 'canonical' or 'edit-form' was found for the '" . $this->entityTypeId . "' entity type");
    $entity->toUrl(); $entity->toUrl();
    }
    /**
    * Tests the toUrl() method without specifying the $rel parameter.
    *
    * It should return the edit-form or canonical link templates by default if
    * they are registered.
    *
    * @covers ::toUrl
    */
    public function testToUrlDefaultFallback(): void {
    $values = ['id' => $this->entityId, 'langcode' => $this->langcode];
    $entity = $this->getEntity(UrlTestEntity::class, $values);
    $this->registerLinkTemplate('edit-form'); $this->registerLinkTemplate('edit-form');
    /** @var \Drupal\Core\Url $url */ /** @var \Drupal\Core\Url $url */
    $url = $entity->toUrl(); $url = $entity->toUrl();
    $this->assertUrl('entity.test_entity.edit_form', ['test_entity' => $this->entityId], $entity, FALSE, $url); $this->assertUrl('entity.test_entity.edit_form', ['test_entity' => $this->entityId], $entity, TRUE, $url);
    $this->registerLinkTemplate('canonical'); $this->registerLinkTemplate('canonical');
    /** @var \Drupal\Core\Url $url */ /** @var \Drupal\Core\Url $url */
    $url = $entity->toUrl(); $url = $entity->toUrl();
    $this->assertUrl('entity.test_entity.canonical', ['test_entity' => $this->entityId], $entity, FALSE, $url); $this->assertUrl('entity.test_entity.canonical', ['test_entity' => $this->entityId], $entity, TRUE, $url);
    // Register multiple link templates with 2 that share the same path.
    $this->entityType->getLinkTemplates()->willReturn([
    'canonical' => "/test-entity/{test_entity}/canonical",
    'edit-form' => "/test-entity/{test_entity}/edit-form",
    'foobar' => "/test-entity/{test_entity}/canonical",
    ]);
    $url = $entity->toUrl();
    $this->assertUrl('entity.test_entity.canonical', ['test_entity' => $this->entityId], $entity, TRUE, $url);
    } }
    /** /**
    ......
    • catch @catch

      mentioned in commit 554598a5

       ·

      mentioned in commit 554598a5

      Toggle commit list
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment