Skip to content
Snippets Groups Projects
Verified Commit 95bae2b6 authored by Dave Long's avatar Dave Long
Browse files

Issue #3342975 by andypost, quietone, catch: Deprecate Url::toRenderArray() and Url::renderAccess()

parent beab28f2
No related branches found
No related tags found
25 merge requests!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!4289Issue #1344552 by marcingy, Niklas Fiekas, Ravi.J, aleevas, Eduardo Morales...,!4114Issue #2707291: Disable body-level scrolling when a dialog is open as a modal,!4100Issue #3249600: Add support for PHP 8.1 Enums as allowed values for list_* data types,!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,!1591Issue #3199697: Add JSON:API Translation experimental module,!1484Exposed filters get values from URL when Ajax is on,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1162Issue #3100350: Unable to save '/' root path alias,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!925Issue #2339235: Remove taxonomy hard dependency on node module,!877Issue #2708101: Default value for link text is not saved,!872Draft: Issue #3221319: Race condition when creating menu links and editing content deletes menu links,!844Resolve #3036010 "Updaters",!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,!485Sets the autocomplete attribute for username/password input field on login form.,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
......@@ -770,8 +770,14 @@ public function toString($collect_bubbleable_metadata = FALSE) {
*
* @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(),
......@@ -836,8 +842,14 @@ public function access(AccountInterface $account = NULL, $return_as_object = FAL
*
* @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();
}
......@@ -908,6 +920,7 @@ public function setUnroutedUrlAssembler(UnroutedUrlAssemblerInterface $url_assem
* {@inheritdoc}
*/
public static function trustedCallbacks() {
// @todo Clean-up in https://www.drupal.org/i/3343153
return ['renderAccess'];
}
......
......@@ -55,8 +55,9 @@ public function form(array $form, FormStateInterface $form_state) {
$form['shortcuts']['links'][$id]['name'] = [
'#type' => 'link',
'#title' => $shortcut->getTitle(),
] + $url->toRenderArray();
unset($form['shortcuts']['links'][$id]['name']['#access_callback']);
'#url' => $url,
'#options' => $url->getOptions(),
];
$form['shortcuts']['links'][$id]['#weight'] = $shortcut->getWeight();
$form['shortcuts']['links'][$id]['weight'] = [
'#type' => 'weight',
......
......@@ -527,6 +527,7 @@ public function testAccessUnrouted() {
*
* @covers ::renderAccess
* @dataProvider accessProvider
* @group legacy
*/
public function testRenderAccess($access) {
$element = [
......@@ -534,9 +535,22 @@ public function testRenderAccess($access) {
];
$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.
*/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment