From 08f9c8d8ff70e140905457a2437e7a50e1ca738d Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Mon, 28 Sep 2015 09:06:01 +0200 Subject: [PATCH] Issue #2558189 by JeroenT, pwolanin, Cyberschorsch, SteffenR, Mile23: Remove usage of deprecated UrlGeneratorInterface::generateFromPath() in system module --- core/modules/system/src/Tests/Common/RenderWebTest.php | 2 +- .../system/src/Tests/Path/UrlAlterFunctionalTest.php | 9 +++++---- core/modules/system/src/Tests/Routing/RouterTest.php | 9 +++++---- .../tests/modules/url_alter_test/src/PathProcessor.php | 4 +--- .../modules/url_alter_test/src/PathProcessorTest.php | 9 ++------- 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/core/modules/system/src/Tests/Common/RenderWebTest.php b/core/modules/system/src/Tests/Common/RenderWebTest.php index f6252e9999..4f110713e5 100644 --- a/core/modules/system/src/Tests/Common/RenderWebTest.php +++ b/core/modules/system/src/Tests/Common/RenderWebTest.php @@ -132,7 +132,7 @@ function testDrupalRenderFormElements() { ), ); $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'], )); diff --git a/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php b/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php index d59d6b6a3b..d9a8228f1e 100644 --- a/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php +++ b/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php @@ -82,14 +82,14 @@ function testUrlAlter() { * 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 @@ protected function assertUrlOutboundAlter($original, $final) { * 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))); } } diff --git a/core/modules/system/src/Tests/Routing/RouterTest.php b/core/modules/system/src/Tests/Routing/RouterTest.php index 4d532d1871..076d0cebe4 100644 --- a/core/modules/system/src/Tests/Routing/RouterTest.php +++ b/core/modules/system/src/Tests/Routing/RouterTest.php @@ -13,6 +13,7 @@ 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 @@ public function testControllerResolutionPage() { * 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(''), $base_path); - $this->assertEqual($this->container->get('url_generator')->generateFromPath(''), $base_path); + $front_url = Url::fromRoute('', [], ['absolute' => TRUE]); + // Compare to the site base URL. + $base_url = Url::fromUri('base:/', ['absolute' => TRUE]); + $this->assertIdentical($base_url->toString(), $front_url->toString()); } /** diff --git a/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php b/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php index bbe5f14db4..809434c643 100644 --- a/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php +++ b/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php @@ -27,9 +27,7 @@ public function processInbound($path, Request $request) { } // 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'; diff --git a/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php b/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php index c17dcd5c69..80af197c89 100644 --- a/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php +++ b/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php @@ -31,9 +31,7 @@ public function processInbound($path, Request $request) { } // 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 @@ public function processOutbound($path, &$options = array(), Request $request = N } // 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); } } -- GitLab