Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2558189 by JeroenT, pwolanin, Cyberschorsch, SteffenR, Mile23: Remove usage of deprecated UrlGeneratorInterface::generateFromPath() in system module

8.0.x
Alex Pott 2015-09-28 09:06:01 +02:00
parent ab1885c057
commit 08f9c8d8ff
5 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/system/src/Tests/Common/RenderWebTest.php
View File

@ -132,7 +132,7 @@ class RenderWebTest extends WebTestBase {
),
);
$this->assertRenderedElement($element, '//a[@href=:href and contains(., :title)]', array(
':href' => \Drupal::urlGenerator()->generateFromPath('common-test/destination', ['absolute' => TRUE]),
':href' => URL::fromRoute('common_test.destination')->setAbsolute()->toString(),
':title' => $element['#title'],
));

9
core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php
View File

@ -82,14 +82,14 @@ class UrlAlterFunctionalTest extends WebTestBase {
* A string with the original path that is run through generateFrommPath().
* @param $final
* A string with the expected result after generateFrommPath().
*
* @return
* TRUE if $original was correctly altered to $final, FALSE otherwise.
*/
protected function assertUrlOutboundAlter($original, $final) {
// Test outbound altering.
$result = $this->container->get('url_generator')->generateFromPath(ltrim($original, '/'));
$final = Url::fromUri('internal:' . $final)->toString();
$this->assertIdentical($result, $final, format_string('Altered outbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
$result = $this->container->get('path_processor_manager')->processOutbound($original);
return $this->assertIdentical($result, $final, format_string('Altered outbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
}
/**
@ -99,12 +99,13 @@ class UrlAlterFunctionalTest extends WebTestBase {
* The original path before it has been altered by inbound URL processing.
* @param $final
* A string with the expected result.
*
* @return
* TRUE if $original was correctly altered to $final, FALSE otherwise.
*/
protected function assertUrlInboundAlter($original, $final) {
// Test inbound altering.
$result = $this->container->get('path.alias_manager')->getPathByAlias($original);
$this->assertIdentical($result, $final, format_string('Altered inbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
return $this->assertIdentical($result, $final, format_string('Altered inbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
}
}

9
core/modules/system/src/Tests/Routing/RouterTest.php
View File

@ -13,6 +13,7 @@ use Drupal\Core\Language\LanguageInterface;
use Drupal\simpletest\WebTestBase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Exception\RouteNotFoundException;
use Drupal\Core\Url;
/**
* Functional class for the full integrated routing system.
@ -181,10 +182,10 @@ class RouterTest extends WebTestBase {
* Checks the generate method on the url generator using the front router.
*/
public function testUrlGeneratorFront() {
global $base_path;
$this->assertEqual($this->container->get('url_generator')->generate('<front>'), $base_path);
$this->assertEqual($this->container->get('url_generator')->generateFromPath('<front>'), $base_path);
$front_url = Url::fromRoute('<front>', [], ['absolute' => TRUE]);
// Compare to the site base URL.
$base_url = Url::fromUri('base:/', ['absolute' => TRUE]);
$this->assertIdentical($base_url->toString(), $front_url->toString());
}
/**

4
core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php
View File

@ -27,9 +27,7 @@ class PathProcessor implements InboundPathProcessorInterface {
}
// Rewrite community/ to forum/.
if ($path == '/community' || strpos($path, '/community/') === 0) {
$path = '/forum' . substr($path, 9);
}
$path = preg_replace('@^/community(.*)@', '/forum$1', $path);
if ($path == '/url-alter-test/bar') {
$path = '/url-alter-test/foo';

9
core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php
View File

@ -31,9 +31,7 @@ class PathProcessorTest implements InboundPathProcessorInterface, OutboundPathPr
}
// Rewrite community/ to forum/.
if ($path == '/community' || strpos($path, '/community/') === 0) {
$path = '/forum' . substr($path, 10);
}
$path = preg_replace('@^/community(.*)@', '/forum$1', $path);
if ($path == '/url-alter-test/bar') {
$path = '/url-alter-test/foo';
@ -57,10 +55,7 @@ class PathProcessorTest implements InboundPathProcessorInterface, OutboundPathPr
}
// Rewrite forum/ to community/.
if ($path == '/forum' || strpos($path, '/forum/') === 0) {
$path = '/community' . substr($path, 5);
}
return $path;
return preg_replace('@^/forum(.*)@', '/community$1', $path);
}
}