Issue #3343153 by samit.310@gmail.com, andypost, smustgrave, alexpott: Remove...

Issue #3343153 by samit.310@gmail.com, andypost, smustgrave, alexpott: Remove deprecated code from \Drupal\Core\Url

core/lib/Drupal/Core/Url.php

@@ -765,29 +765,6 @@ public function toString($collect_bubbleable_metadata = FALSE) {
     return $this->urlGenerator()->generateFromRoute($this->getRouteName(), $this->getRouteParameters(), $this->getOptions(), $collect_bubbleable_metadata);
   }
 
-  /**
-   * Returns the route information for a render array.
-   *
-   * @return array
-   *   An associative array suitable for a render array.
-   *
-   * @deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no
-   *   replacement.
-   *
-   * @see https://www.drupal.org/node/3342977
-   */
-  public function toRenderArray() {
-    @trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3342977', E_USER_DEPRECATED);
-    $render_array = [
-      '#url' => $this,
-      '#options' => $this->getOptions(),
-    ];
-    if (!$this->unrouted) {
-      $render_array['#access_callback'] = [self::class, 'renderAccess'];
-    }
-    return $render_array;
-  }
-
   /**
    * Returns the internal path (system path) for this route.
    *
@@ -834,25 +811,6 @@ public function access(AccountInterface $account = NULL, $return_as_object = FAL
     return $return_as_object ? AccessResult::allowed() : TRUE;
   }
 
-  /**
-   * Checks a URL render element against applicable access check services.
-   *
-   * @param array $element
-   *   A render element as returned from \Drupal\Core\Url::toRenderArray().
-   *
-   * @return bool
-   *   Returns TRUE if the current user has access to the URL, otherwise FALSE.
-   *
-   * @deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no
-   *   replacement.
-   *
-   * @see https://www.drupal.org/node/3342977
-   */
-  public static function renderAccess(array $element) {
-    @trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3342977', E_USER_DEPRECATED);
-    return $element['#url']->access();
-  }
-
   /**
    * @return \Drupal\Core\Access\AccessManagerInterface
    */
@@ -920,8 +878,7 @@ public function setUnroutedUrlAssembler(UnroutedUrlAssemblerInterface $url_assem
    * {@inheritdoc}
    */
   public static function trustedCallbacks() {
-    // @todo Clean-up in https://www.drupal.org/i/3343153
-    return ['renderAccess'];
+    return [];
   }
 
 }

core/tests/Drupal/Tests/Core/UrlTest.php

@@ -497,38 +497,6 @@ public function testAccessUnrouted() {
     $this->assertTrue($url->access($account));
   }
 
-  /**
-   * Tests the renderAccess() method.
-   *
-   * @param bool $access
-   *   The access value.
-   *
-   * @covers ::renderAccess
-   * @dataProvider accessProvider
-   * @group legacy
-   */
-  public function testRenderAccess($access) {
-    $element = [
-      '#url' => Url::fromRoute('entity.node.canonical', ['node' => 3]),
-    ];
-    $this->container->set('current_user', $this->createMock('Drupal\Core\Session\AccountInterface'));
-    $this->container->set('access_manager', $this->getMockAccessManager($access));
-    $this->expectDeprecation('Drupal\Core\Url::renderAccess() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3342977');
-    $this->assertEquals($access, TestUrl::renderAccess($element));
-  }
-
-  /**
-   * Tests deprecation of toRenderArray() method.
-   *
-   * @covers ::toRenderArray
-   * @group legacy
-   */
-  public function testToRenderArray() {
-    $this->expectDeprecation('Drupal\Core\Url::toRenderArray() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3342977');
-    $url = Url::fromRoute('entity.node.canonical', ['node' => 3]);
-    $this->assertIsArray($url->toRenderArray());
-  }
-
   /**
    * Tests the fromRouteMatch() method.
    */