Skip to content
Snippets Groups Projects
Verified Commit 88db17d6 authored by Alex Pott's avatar Alex Pott Committed by Alex Pott
Browse files

Issue #3289425 by Project Update Bot, alexpott: Automated Drupal 10 compatibility fixes

parent ed704ba0
Branches
Tags
No related merge requests found
name: 'Route UI'
type: module
description: 'Provides a route form element and block and views area to add custom action links.'
core_version_requirement: ^8.9 || ^9
core_version_requirement: ^9 || ^10
package: 'Navigation'
......@@ -128,16 +128,8 @@ class Route extends Details {
$route = static::getRouteProvider()->getRouteByName($input['route_name']);
// ParamConverterManager relies on the route name and object being
// available from the parameters array.
if (class_exists('Drupal\Core\Routing\RouteObjectInterface')) {
$input['route_parameters'][RouteObjectInterface::ROUTE_NAME] = $input['route_name'];
$input['route_parameters'][RouteObjectInterface::ROUTE_OBJECT] = $route;
}
else {
// Drupal 8 code.
// @todo remove once Drupal 8 is no longer supported.
$input['route_parameters'][\Symfony\Cmf\Component\Routing\RouteObjectInterface::ROUTE_NAME] = $input['route_name'];
$input['route_parameters'][\Symfony\Cmf\Component\Routing\RouteObjectInterface::ROUTE_OBJECT] = $route;
}
$input['route_parameters'][RouteObjectInterface::ROUTE_NAME] = $input['route_name'];
$input['route_parameters'][RouteObjectInterface::ROUTE_OBJECT] = $route;
$upcasted_parameters = static::getParamConverter()->convert($input['route_parameters'] + $route->getDefaults());
$route_match = new RouteMatch($input['route_name'], $route, $upcasted_parameters, $input['route_parameters']);
if ($element['#route_access_check'] && !static::getAccessManager()->check($route_match)) {
......
......@@ -2,4 +2,3 @@ name: 'Route UI test module'
type: module
description: 'Support module for Route UI testing.'
package: Testing
core_version_requirement: ^8.8 || ^9
......@@ -27,7 +27,7 @@ class CustomActionLinksTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
protected function setUp() {
protected function setUp(): void {
parent::setUp();
$this->createContentType(['type' => 'article']);
$this->createContentType(['type' => 'page']);
......@@ -68,7 +68,7 @@ class CustomActionLinksTest extends BrowserTestBase {
$this->drupalGet('');
$assert->pageTextContains('This is a block title');
$assert->assertEscaped($link_text);
$this->assertSession()->assertEscaped($link_text);
$assert->linkExists($page_link_text);
$page->clickLink($link_text);
$assert->statusCodeEquals(200);
......@@ -85,7 +85,7 @@ class CustomActionLinksTest extends BrowserTestBase {
$this->drupalLogin($this->createUser(['create article content']));
$assert->pageTextContains('This is a block title');
$assert->linkNotExists($page_link_text);
$assert->assertEscaped($link_text);
$this->assertSession()->assertEscaped($link_text);
$page->clickLink($link_text);
$assert->statusCodeEquals(200);
$assert->addressEquals('node/add/article');
......@@ -153,7 +153,7 @@ class CustomActionLinksTest extends BrowserTestBase {
$editor = $this->createUser(['create article content']);
$this->drupalLogin($editor);
$this->drupalGet('test-view');
$assert->assertEscaped($link_text);
$this->assertSession()->assertEscaped($link_text);
$page->clickLink($link_text);
$assert->statusCodeEquals(200);
$assert->addressEquals('node/add/article');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment