diff --git a/core/includes/batch.inc b/core/includes/batch.inc index f84c01b..aa71cc9 100644 --- a/core/includes/batch.inc +++ b/core/includes/batch.inc @@ -43,7 +43,7 @@ function _batch_page(Request $request) { $batch = \Drupal::service('batch.storage')->load($request_id); if (!$batch) { drupal_set_message(t('No active batch.'), 'error'); - return new RedirectResponse(\Drupal::url('', [], ['absolute' => TRUE])); + return new RedirectResponse(Url::fromRoute('', [], ['absolute' => TRUE])->toString()); } } diff --git a/core/includes/pager.inc b/core/includes/pager.inc index 6b6bbb7..9891c90 100644 --- a/core/includes/pager.inc +++ b/core/includes/pager.inc @@ -6,6 +6,7 @@ */ use Drupal\Component\Utility\UrlHelper; +use Drupal\Core\Url; /** * Returns the current page being requested for display within a pager. @@ -220,7 +221,7 @@ function template_preprocess_pager(&$variables) { $options = array( 'query' => pager_query_add_page($parameters, $element, 0), ); - $items['first']['href'] = \Drupal::url($route_name, $route_parameters, $options); + $items['first']['href'] = Url::fromRoute($route_name, $route_parameters, $options)->toString(); if (isset($tags[0])) { $items['first']['text'] = $tags[0]; } @@ -229,7 +230,7 @@ function template_preprocess_pager(&$variables) { $options = array( 'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] - 1), ); - $items['previous']['href'] = \Drupal::url($route_name, $route_parameters, $options); + $items['previous']['href'] = Url::fromRoute($route_name, $route_parameters, $options)->toString(); if (isset($tags[1])) { $items['previous']['text'] = $tags[1]; } @@ -245,7 +246,7 @@ function template_preprocess_pager(&$variables) { $options = array( 'query' => pager_query_add_page($parameters, $element, $i - 1), ); - $items['pages'][$i]['href'] = \Drupal::url($route_name, $route_parameters, $options); + $items['pages'][$i]['href'] = Url::fromRoute($route_name, $route_parameters, $options)->toString(); if ($i == $pager_current) { $variables['current'] = $i; } @@ -262,7 +263,7 @@ function template_preprocess_pager(&$variables) { $options = array( 'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] + 1), ); - $items['next']['href'] = \Drupal::url($route_name, $route_parameters, $options); + $items['next']['href'] = Url::fromRoute($route_name, $route_parameters, $options)->toString(); if (isset($tags[3])) { $items['next']['text'] = $tags[3]; } @@ -271,7 +272,7 @@ function template_preprocess_pager(&$variables) { $options = array( 'query' => pager_query_add_page($parameters, $element, $pager_max - 1), ); - $items['last']['href'] = \Drupal::url($route_name, $route_parameters, $options); + $items['last']['href'] = Url::fromRoute($route_name, $route_parameters, $options)->toString(); if (isset($tags[4])) { $items['last']['text'] = $tags[4]; } diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 646e428..32f3fd1 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -24,6 +24,7 @@ use Drupal\Component\Utility\NestedArray; use Drupal\Core\Render\Element; use Drupal\Core\Render\Markup; +use Drupal\Core\Url; /** * @defgroup content_flags Content markers @@ -1353,7 +1354,7 @@ function template_preprocess_page(&$variables) { } $variables['base_path'] = base_path(); - $variables['front_page'] = \Drupal::url(''); + $variables['front_page'] = Url::fromRoute('')->toString(); $variables['language'] = $language_interface; // An exception might be thrown. diff --git a/core/lib/Drupal/Core/Extension/module.api.php b/core/lib/Drupal/Core/Extension/module.api.php index 37f8b77..2ddf3b2 100644 --- a/core/lib/Drupal/Core/Extension/module.api.php +++ b/core/lib/Drupal/Core/Extension/module.api.php @@ -964,7 +964,7 @@ function hook_requirements($phase) { ); } - $requirements['cron']['description'] .= ' ' . t('You can run cron manually.', array(':cron' => \Drupal::url('system.run_cron'))); + $requirements['cron']['description'] .= ' ' . t('You can run cron manually.', array(':cron' => Url::fromRoute('system.run_cron')->toString())); $requirements['cron']['title'] = t('Cron maintenance tasks'); } diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php index f29e146..2d9be8e 100644 --- a/core/lib/Drupal/Core/Url.php +++ b/core/lib/Drupal/Core/Url.php @@ -10,7 +10,7 @@ use Drupal\Core\Utility\UnroutedUrlAssemblerInterface; use Symfony\Cmf\Component\Routing\RouteObjectInterface; use Symfony\Component\HttpFoundation\Request; - +use Drupal\Core\Url; /** * Defines an object that holds information about a URL. */ diff --git a/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php b/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php index cab7e7c..93b0e17 100644 --- a/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php +++ b/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php @@ -26,7 +26,7 @@ * However, for links enclosed in translatable text you should use t() and * embed the HTML anchor tag directly in the translated string. For example: * @code - * $text = t('Visit the content types page', array(':url' => \Drupal::url('entity.node_type.collection'))); + * $text = t('Visit the content types page', array(':url' => Url::fromRoute('entity.node_type.collection')->toString())); * @endcode * This keeps the context of the link title ('settings' in the example) for * translators. diff --git a/core/modules/action/action.module b/core/modules/action/action.module index 7461302..89f4258 100644 --- a/core/modules/action/action.module +++ b/core/modules/action/action.module @@ -6,6 +6,7 @@ */ use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -19,9 +20,9 @@ function action_help($route_name, RouteMatchInterface $route_match) { $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Using simple actions') . '
'; - $output .= '
' . t('Simple actions do not require configuration and are listed automatically as available on the Actions page.', array(':actions' => \Drupal::url('entity.action.collection'))) . '
'; + $output .= '
' . t('Simple actions do not require configuration and are listed automatically as available on the Actions page.', array(':actions' => Url::fromRoute('entity.action.collection')->toString())) . '
'; $output .= '
' . t('Creating and configuring advanced actions') . '
'; - $output .= '
' . t('Advanced actions are user-created and have to be configured individually. Create an advanced action on the Actions page by selecting an action type from the drop-down list. Then configure your action, for example by specifying the recipient of an automated email message.', array(':actions' => \Drupal::url('entity.action.collection'))) . '
'; + $output .= '
' . t('Advanced actions are user-created and have to be configured individually. Create an advanced action on the Actions page by selecting an action type from the drop-down list. Then configure your action, for example by specifying the recipient of an automated email message.', array(':actions' => Url::fromRoute('entity.action.collection')->toString())) . '
'; $output .= '
'; return $output; diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module index 7405699..7aa9cc3 100644 --- a/core/modules/aggregator/aggregator.module +++ b/core/modules/aggregator/aggregator.module @@ -7,6 +7,7 @@ use Drupal\aggregator\Entity\Feed; use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Denotes that a feed's items should never expire. @@ -28,29 +29,29 @@ function aggregator_help($route_name, RouteMatchInterface $route_match) { // Check if the aggregator sources View is enabled. if ($url = $path_validator->getUrlIfValid('aggregator/sources')) { $output .= '
' . t('Viewing feeds') . '
'; - $output .= '
' . t('Users view feed content in the main aggregator display, or by their source (usually via an RSS feed reader). The most recent content in a feed can be displayed as a block through the Blocks administration page.', array(':aggregator' => \Drupal::url('aggregator.page_last'), ':aggregator-sources' => $url->toString(), ':admin-block' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '
'; + $output .= '
' . t('Users view feed content in the main aggregator display, or by their source (usually via an RSS feed reader). The most recent content in a feed can be displayed as a block through the Blocks administration page.', array(':aggregator' => Url::fromRoute('aggregator.page_last')->toString(), ':aggregator-sources' => $url->toString(), ':admin-block' => (\Drupal::moduleHandler()->moduleExists('block')) ? Url::fromRoute('block.admin_display')->toString() : '#')) . '
'; } $output .= '
' . t('Adding, editing, and deleting feeds') . '
'; - $output .= '
' . t('Administrators can add, edit, and delete feeds, and choose how often to check each feed for newly updated items on the Feed aggregator page.', array(':feededit' => \Drupal::url('aggregator.admin_overview'))) . '
'; + $output .= '
' . t('Administrators can add, edit, and delete feeds, and choose how often to check each feed for newly updated items on the Feed aggregator page.', array(':feededit' => Url::fromRoute('aggregator.admin_overview')->toString())) . '
'; $output .= '
' . t('Configuring the display of feed items') . '
'; - $output .= '
' . t('Administrators can choose how many items are displayed in the listing pages, which HTML tags are allowed in the content of feed items, and whether they should be trimmed to a maximum number of characters on the Feed aggregator settings page.', array(':settings' => \Drupal::url('aggregator.admin_settings'))) . '
'; + $output .= '
' . t('Administrators can choose how many items are displayed in the listing pages, which HTML tags are allowed in the content of feed items, and whether they should be trimmed to a maximum number of characters on the Feed aggregator settings page.', array(':settings' => Url::fromRoute('aggregator.admin_settings')->toString())) . '
'; $output .= '
' . t('Discarding old feed items') . '
'; - $output .= '
' . t('Administrators can choose whether to discard feed items that are older than a specified period of time on the Feed aggregator settings page. This requires a correctly configured cron maintenance task (see below).', array(':settings' => \Drupal::url('aggregator.admin_settings'))) . '
'; + $output .= '
' . t('Administrators can choose whether to discard feed items that are older than a specified period of time on the Feed aggregator settings page. This requires a correctly configured cron maintenance task (see below).', array(':settings' => Url::fromRoute('aggregator.admin_settings')->toString())) . '
'; $output .= '
' . t('OPML integration') . '
'; // Check if the aggregator opml View is enabled. if ($url = $path_validator->getUrlIfValid('aggregator/opml')) { - $output .= '
' . t('A machine-readable OPML file of all feeds is available. OPML is an XML-based file format used to share outline-structured information such as a list of RSS feeds. Feeds can also be imported via an OPML file.', array(':aggregator-opml' => $url->toString(), ':import-opml' => \Drupal::url('aggregator.opml_add'))) . '
'; + $output .= '
' . t('A machine-readable OPML file of all feeds is available. OPML is an XML-based file format used to share outline-structured information such as a list of RSS feeds. Feeds can also be imported via an OPML file.', array(':aggregator-opml' => $url->toString(), ':import-opml' => Url::fromRoute('aggregator.opml_add')->toString())) . '
'; } $output .= '
' . t('Configuring cron') . '
'; - $output .= '
' . t('A working cron maintenance task is required to update feeds automatically.', array(':cron' => \Drupal::url('system.cron_settings'))) . '
'; + $output .= '
' . t('A working cron maintenance task is required to update feeds automatically.', array(':cron' => Url::fromRoute('system.cron_settings')->toString())) . '
'; $output .= ''; return $output; case 'aggregator.admin_overview': // Don't use placeholders for possibility to change URLs for translators. $output = '

' . t('Many sites publish their headlines and posts in feeds, using a number of standardized XML-based formats. The aggregator supports RSS, RDF, and Atom.') . '

'; - $output .= '

' . t('Current feeds are listed below, and new feeds may be added. For each feed, the latest items block may be enabled at the blocks administration page.', array(':addfeed' => \Drupal::url('aggregator.feed_add'), ':block' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '

'; + $output .= '

' . t('Current feeds are listed below, and new feeds may be added. For each feed, the latest items block may be enabled at the blocks administration page.', array(':addfeed' => Url::fromRoute('aggregator.feed_add')->toString(), ':block' => (\Drupal::moduleHandler()->moduleExists('block')) ? Url::fromRoute('block.admin_display')->toString() : '#')) . '

'; return $output; case 'aggregator.feed_add': diff --git a/core/modules/aggregator/src/Tests/AddFeedTest.php b/core/modules/aggregator/src/Tests/AddFeedTest.php index b7ffe5f..7ceeb8f 100644 --- a/core/modules/aggregator/src/Tests/AddFeedTest.php +++ b/core/modules/aggregator/src/Tests/AddFeedTest.php @@ -2,6 +2,8 @@ namespace Drupal\aggregator\Tests; +use Drupal\Core\Url; + /** * Add feed test. * @@ -23,7 +25,7 @@ public function testAddFeed() { $feed->refreshItems(); // Check feed data. - $this->assertUrl(\Drupal::url('aggregator.feed_add', [], ['absolute' => TRUE]), [], 'Directed to correct URL.'); + $this->assertUrl(Url::fromRoute('aggregator.feed_add', [], ['absolute' => TRUE])->toString(), [], 'Directed to correct URL.'); $this->assertTrue($this->uniqueFeed($feed->label(), $feed->getUrl()), 'The feed is unique.'); // Check feed source. diff --git a/core/modules/aggregator/src/Tests/AggregatorTestBase.php b/core/modules/aggregator/src/Tests/AggregatorTestBase.php index 1777fe5..3f2142c 100644 --- a/core/modules/aggregator/src/Tests/AggregatorTestBase.php +++ b/core/modules/aggregator/src/Tests/AggregatorTestBase.php @@ -6,6 +6,7 @@ use Drupal\Component\Utility\Html; use Drupal\simpletest\WebTestBase; use Drupal\aggregator\FeedInterface; +use Drupal\Core\Url; /** * Defines a base class for testing the Aggregator module. @@ -94,10 +95,10 @@ public function deleteFeed(FeedInterface $feed) { public function getFeedEditArray($feed_url = NULL, array $edit = array()) { $feed_name = $this->randomMachineName(10); if (!$feed_url) { - $feed_url = \Drupal::url('view.frontpage.feed_1', array(), array( + $feed_url = Url::fromRoute('view.frontpage.feed_1', array(), array( 'query' => array('feed' => $feed_name), 'absolute' => TRUE, - )); + ))->toString(); } $edit += array( 'title[0][value]' => $feed_name, @@ -122,10 +123,10 @@ public function getFeedEditArray($feed_url = NULL, array $edit = array()) { public function getFeedEditObject($feed_url = NULL, array $values = array()) { $feed_name = $this->randomMachineName(10); if (!$feed_url) { - $feed_url = \Drupal::url('view.frontpage.feed_1', array( + $feed_url = Url::fromRoute('view.frontpage.feed_1', array( 'query' => array('feed' => $feed_name), 'absolute' => TRUE, - )); + ))->toString(); } $values += array( 'title' => $feed_name, diff --git a/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php b/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php index 0261ed5..b74f662 100644 --- a/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php +++ b/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php @@ -2,6 +2,8 @@ namespace Drupal\aggregator\Tests; +use Drupal\Core\Url; + /** * Delete feed items from a feed. * @@ -15,13 +17,13 @@ public function testDeleteFeedItem() { // Create a bunch of test feeds. $feed_urls = array(); // No last-modified, no etag. - $feed_urls[] = \Drupal::url('aggregator_test.feed', array(), array('absolute' => TRUE)); + $feed_urls[] = Url::fromRoute('aggregator_test.feed', array(), array('absolute' => TRUE))->toString(); // Last-modified, but no etag. - $feed_urls[] = \Drupal::url('aggregator_test.feed', array('use_last_modified' => 1), array('absolute' => TRUE)); + $feed_urls[] = Url::fromRoute('aggregator_test.feed', array('use_last_modified' => 1), array('absolute' => TRUE))->toString(); // No Last-modified, but etag. - $feed_urls[] = \Drupal::url('aggregator_test.feed', array('use_last_modified' => 0, 'use_etag' => 1), array('absolute' => TRUE)); + $feed_urls[] = Url::fromRoute('aggregator_test.feed', array('use_last_modified' => 0, 'use_etag' => 1), array('absolute' => TRUE))->toString(); // Last-modified and etag. - $feed_urls[] = \Drupal::url('aggregator_test.feed', array('use_last_modified' => 1, 'use_etag' => 1), array('absolute' => TRUE)); + $feed_urls[] = Url::fromRoute('aggregator_test.feed', array('use_last_modified' => 1, 'use_etag' => 1), array('absolute' => TRUE))->toString(); foreach ($feed_urls as $feed_url) { $feed = $this->createFeed($feed_url); diff --git a/core/modules/aggregator/src/Tests/FeedParserTest.php b/core/modules/aggregator/src/Tests/FeedParserTest.php index 6c4a04d..8fbeeb0 100644 --- a/core/modules/aggregator/src/Tests/FeedParserTest.php +++ b/core/modules/aggregator/src/Tests/FeedParserTest.php @@ -90,7 +90,7 @@ public function testRedirectFeed() { $feed->refreshItems(); // Make sure that the feed URL was updated correctly. - $this->assertEqual($feed->getUrl(), \Drupal::url('aggregator_test.feed', array(), array('absolute' => TRUE))); + $this->assertEqual($feed->getUrl(), Url::fromRoute('aggregator_test.feed', array(), array('absolute' => TRUE))->toString()); } /** diff --git a/core/modules/automated_cron/automated_cron.module b/core/modules/automated_cron/automated_cron.module index 858236f..8b77d88 100644 --- a/core/modules/automated_cron/automated_cron.module +++ b/core/modules/automated_cron/automated_cron.module @@ -7,6 +7,7 @@ use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -20,7 +21,7 @@ function automated_cron_help($route_name, RouteMatchInterface $route_match) { $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Configuring Automated Cron') . '
'; - $output .= '
' . t('On the Cron page, you can set the frequency (time interval) for running cron jobs.', [':cron-settings' => \Drupal::url('system.cron_settings')]) . '
'; + $output .= '
' . t('On the Cron page, you can set the frequency (time interval) for running cron jobs.', [':cron-settings' => Url::fromRoute('system.cron_settings')->toString()]) . '
'; $output .= '
' . t('Disabling Automated Cron') . '
'; $output .= '
' . t('To disable automated cron, the recommended method is to uninstall the module, to reduce site overhead. If you only want to disable it temporarily, you can set the frequency to Never on the Cron page, and then change the frequency back when you want to start it up again.') . '
'; $output .= '
'; diff --git a/core/modules/ban/ban.module b/core/modules/ban/ban.module index a1ee238..3f43060 100644 --- a/core/modules/ban/ban.module +++ b/core/modules/ban/ban.module @@ -6,6 +6,7 @@ */ use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -19,7 +20,7 @@ function ban_help($route_name, RouteMatchInterface $route_match) { $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Banning IP addresses') . '
'; - $output .= '
' . t('Administrators can enter IP addresses to ban on the IP address bans page.', array(':bans' => \Drupal::url('ban.admin_page'))) . '
'; + $output .= '
' . t('Administrators can enter IP addresses to ban on the IP address bans page.', array(':bans' => Url::fromRoute('ban.admin_page')->toString())) . '
'; $output .= '
'; return $output; diff --git a/core/modules/basic_auth/basic_auth.module b/core/modules/basic_auth/basic_auth.module index ea64c5b..ffc027f 100644 --- a/core/modules/basic_auth/basic_auth.module +++ b/core/modules/basic_auth/basic_auth.module @@ -6,6 +6,7 @@ */ use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -15,7 +16,7 @@ function basic_auth_help($route_name, RouteMatchInterface $route_match) { case 'help.page.basic_auth': $output = ''; $output .= '

' . t('About') . '

'; - $output .= '

' . t('The HTTP Basic Authentication module supplies an HTTP Basic authentication provider for web service requests. This authentication provider authenticates requests using the HTTP Basic Authentication username and password, as an alternative to using Drupal\'s standard cookie-based authentication system. It is only useful if your site provides web services configured to use this type of authentication (for instance, the RESTful Web Services module). For more information, see the online documentation for the HTTP Basic Authentication module.', array(':hba_do' => 'https://www.drupal.org/documentation/modules/basic_auth', ':rest_help' => (\Drupal::moduleHandler()->moduleExists('rest')) ? \Drupal::url('help.page', array('name' => 'rest')) : '#')) . '

'; + $output .= '

' . t('The HTTP Basic Authentication module supplies an HTTP Basic authentication provider for web service requests. This authentication provider authenticates requests using the HTTP Basic Authentication username and password, as an alternative to using Drupal\'s standard cookie-based authentication system. It is only useful if your site provides web services configured to use this type of authentication (for instance, the RESTful Web Services module). For more information, see the online documentation for the HTTP Basic Authentication module.', array(':hba_do' => 'https://www.drupal.org/documentation/modules/basic_auth', ':rest_help' => (\Drupal::moduleHandler()->moduleExists('rest')) ? Url::fromRoute('help.page', array('name' => 'rest'))->toString() : '#')) . '

'; return $output; } } diff --git a/core/modules/block/block.module b/core/modules/block/block.module index 2f96a90..30d3f7c 100644 --- a/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -19,18 +19,18 @@ function block_help($route_name, RouteMatchInterface $route_match) { switch ($route_name) { case 'help.page.block': - $block_content = \Drupal::moduleHandler()->moduleExists('block_content') ? \Drupal::url('help.page', array('name' => 'block_content')) : '#'; + $block_content = \Drupal::moduleHandler()->moduleExists('block_content') ? Url::fromRoute('help.page', array('name' => 'block_content'))->toString() : '#'; $output = ''; $output .= '

' . t('About') . '

'; $output .= '

' . t('The Block module allows you to place blocks in regions of your installed themes, and configure block settings. For more information, see the online documentation for the Block module.', array(':blocks-documentation' => 'https://www.drupal.org/documentation/modules/block/')) . '

'; $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Placing and moving blocks') . '
'; - $output .= '
' . t('You can place a new block in a region by selecting Place block on the Block layout page. Once a block is placed, it can be moved to a different region by drag-and-drop or by using the Region drop-down list, and then clicking Save blocks.', array(':blocks' => \Drupal::url('block.admin_display'))) . '
'; + $output .= '
' . t('You can place a new block in a region by selecting Place block on the Block layout page. Once a block is placed, it can be moved to a different region by drag-and-drop or by using the Region drop-down list, and then clicking Save blocks.', array(':blocks' => Url::fromRoute('block.admin_display')->toString())) . '
'; $output .= '
' . t('Toggling between different themes') . '
'; $output .= '
' . t('Blocks are placed and configured specifically for each theme. The Block layout page opens with the default theme, but you can toggle to other installed themes.') . '
'; $output .= '
' . t('Demonstrating block regions for a theme') . '
'; - $output .= '
' . t('You can see where the regions are for the current theme by clicking the Demonstrate block regions link on the Block layout page. Regions are specific to each theme.', array(':blocks' => \Drupal::url('block.admin_display'))) . '
'; + $output .= '
' . t('You can see where the regions are for the current theme by clicking the Demonstrate block regions link on the Block layout page. Regions are specific to each theme.', array(':blocks' => Url::fromRoute('block.admin_display')->toString())) . '
'; $output .= '
' . t('Configuring block settings') . '
'; $output .= '
' . t('To change the settings of an individual block click on the Configure link on the Block layout page. The available options vary depending on the module that provides the block. For all blocks you can change the block title and toggle whether to display it.', array(':blocks' => Drupal::url('block.admin_display'))) . '
'; $output .= '
' . t('Controlling visibility') . '
'; diff --git a/core/modules/block/src/Tests/BlockTest.php b/core/modules/block/src/Tests/BlockTest.php index 40db579..0aa7baf 100644 --- a/core/modules/block/src/Tests/BlockTest.php +++ b/core/modules/block/src/Tests/BlockTest.php @@ -6,6 +6,7 @@ use Drupal\block\Entity\Block; use Drupal\user\Entity\Role; use Drupal\user\RoleInterface; +use Drupal\Core\Url; /** * Tests basic block functionality. @@ -328,7 +329,7 @@ public function testBlockCacheTags() { // both the page and block caches. $this->drupalGet(''); $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT'); - $cid_parts = array(\Drupal::url('', array(), array('absolute' => TRUE)), 'html'); + $cid_parts = array(Url::fromRoute('', array(), array('absolute' => TRUE))->toString(), 'html'); $cid = implode(':', $cid_parts); $cache_entry = \Drupal::cache('render')->get($cid); $expected_cache_tags = array( @@ -368,7 +369,7 @@ public function testBlockCacheTags() { // Verify a cache hit, but also the presence of the correct cache tags. $this->drupalGet(''); $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT'); - $cid_parts = array(\Drupal::url('', array(), array('absolute' => TRUE)), 'html'); + $cid_parts = array(Url::fromRoute('', array(), array('absolute' => TRUE))->toString(), 'html'); $cid = implode(':', $cid_parts); $cache_entry = \Drupal::cache('render')->get($cid); $expected_cache_tags = array( diff --git a/core/modules/block/src/Tests/Views/DisplayBlockTest.php b/core/modules/block/src/Tests/Views/DisplayBlockTest.php index faf68c4..edc39ca 100644 --- a/core/modules/block/src/Tests/Views/DisplayBlockTest.php +++ b/core/modules/block/src/Tests/Views/DisplayBlockTest.php @@ -63,10 +63,10 @@ public function testBlockCategory() { // Test that the block was given a default category corresponding to its // base table. $arguments = array( - ':href' => \Drupal::Url('block.admin_add', array( + ':href' => Url::fromRoute('block.admin_add', array( 'plugin_id' => 'views_block:' . $edit['id'] . '-block_1', 'theme' => 'classy', - )), + ))->toString(), ':category' => t('Lists (Views)'), ); $this->drupalGet('admin/structure/block'); @@ -100,20 +100,20 @@ public function testBlockCategory() { $this->assertTrue(!empty($elements), 'The test block appears in the custom category.'); $arguments = array( - ':href' => \Drupal::Url('block.admin_add', array( + ':href' => Url::fromRoute('block.admin_add', array( 'plugin_id' => 'views_block:' . $edit['id'] . '-block_2', 'theme' => 'classy', - )), + ))->toString(), ':category' => t('Lists (Views)'), ); $elements = $this->xpath($pattern, $arguments); $this->assertTrue(!empty($elements), 'The first duplicated test block remains in the original category.'); $arguments = array( - ':href' => \Drupal::Url('block.admin_add', array( + ':href' => Url::fromRoute('block.admin_add', array( 'plugin_id' => 'views_block:' . $edit['id'] . '-block_3', 'theme' => 'classy', - )), + ))->toString(), ':category' => $category, ); $elements = $this->xpath($pattern, $arguments); diff --git a/core/modules/block_content/block_content.module b/core/modules/block_content/block_content.module index e0b5729..d44fd69 100644 --- a/core/modules/block_content/block_content.module +++ b/core/modules/block_content/block_content.module @@ -8,6 +8,7 @@ use Drupal\Core\Routing\RouteMatchInterface; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -15,25 +16,25 @@ function block_content_help($route_name, RouteMatchInterface $route_match) { switch ($route_name) { case 'help.page.block_content': - $field_ui = \Drupal::moduleHandler()->moduleExists('field_ui') ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#'; + $field_ui = \Drupal::moduleHandler()->moduleExists('field_ui') ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#'; $output = ''; $output .= '

' . t('About') . '

'; - $output .= '

' . t('The Custom Block module allows you to create and manage custom block types and content-containing blocks from the Custom block library page. Custom block types have fields; see the Field module help for more information. Once created, custom blocks can be placed in regions just like blocks provided by other modules; see the Block module help page for details. For more information, see the online documentation for the Custom Block module.', array(':block-library' => \Drupal::url('entity.block_content.collection'), ':block-content' => \Drupal::url('entity.block_content.collection'), ':field-help' => \Drupal::url('help.page', array('name' => 'field')), ':blocks' => \Drupal::url('help.page', array('name' => 'block')), ':online-help' => 'https://www.drupal.org/documentation/modules/block_content')) . '

'; + $output .= '

' . t('The Custom Block module allows you to create and manage custom block types and content-containing blocks from the Custom block library page. Custom block types have fields; see the Field module help for more information. Once created, custom blocks can be placed in regions just like blocks provided by other modules; see the Block module help page for details. For more information, see the online documentation for the Custom Block module.', array(':block-library' => Url::fromRoute('entity.block_content.collection')->toString(), ':block-content' => Url::fromRoute('entity.block_content.collection')->toString(), ':field-help' => Url::fromRoute('help.page', array('name' => 'field'))->toString(), ':blocks' => Url::fromRoute('help.page', array('name' => 'block'))->toString(), ':online-help' => 'https://www.drupal.org/documentation/modules/block_content')) . '

'; $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Creating and managing custom block types') . '
'; - $output .= '
' . t('Users with the Administer blocks permission can create and edit custom block types with fields and display settings, from the Block types page in the Custom block library. For more information about managing fields and display settings, see the Field UI module help.', array(':types' => \Drupal::url('entity.block_content_type.collection'), ':field-ui' => $field_ui)) . '
'; + $output .= '
' . t('Users with the Administer blocks permission can create and edit custom block types with fields and display settings, from the Block types page in the Custom block library. For more information about managing fields and display settings, see the Field UI module help.', array(':types' => Url::fromRoute('entity.block_content_type.collection')->toString(), ':field-ui' => $field_ui)) . '
'; $output .= '
' . t('Creating custom blocks') . '
'; - $output .= '
' . t('Users with the Administer blocks permission can create, edit, and delete custom blocks of each defined custom block type, from the Blocks page in the Custom block library. After creating a block, place it in a region from the Block layout page; see the Block module help for more information about placing blocks.', array(':blocks' => \Drupal::url('block.admin_display'), ':block-library' => \Drupal::url('entity.block_content.collection'), ':block_help' => \Drupal::url('help.page', array('name' => 'block')))) . '
'; + $output .= '
' . t('Users with the Administer blocks permission can create, edit, and delete custom blocks of each defined custom block type, from the Blocks page in the Custom block library. After creating a block, place it in a region from the Block layout page; see the Block module help for more information about placing blocks.', array(':blocks' => Url::fromRoute('block.admin_display')->toString(), ':block-library' => Url::fromRoute('entity.block_content.collection')->toString(), ':block_help' => Url::fromRoute('help.page', array('name' => 'block'))->toString())) . '
'; $output .= '
'; return $output; case 'entity.block_content.collection': - $output = '

' . t('Blocks in the block library belong to Custom block types, each with its own fields and display settings. After creating a block, place it in a region from the Block layout page.', array(':types' => \Drupal::url('entity.block_content_type.collection'), ':blocks' => \Drupal::url('block.admin_display'))) . '

'; + $output = '

' . t('Blocks in the block library belong to Custom block types, each with its own fields and display settings. After creating a block, place it in a region from the Block layout page.', array(':types' => Url::fromRoute('entity.block_content_type.collection')->toString(), ':blocks' => Url::fromRoute('block.admin_display')->toString())) . '

'; return $output; case 'entity.block_content_type.collection': - $output = '

' . t('Each block type has its own fields and display settings. Create blocks of each type on the Blocks page in the custom block library.', array(':block-library' => \Drupal::url('entity.block_content.collection'))) . '

'; + $output = '

' . t('Each block type has its own fields and display settings. Create blocks of each type on the Blocks page in the custom block library.', array(':block-library' => Url::fromRoute('entity.block_content.collection')->toString())) . '

'; return $output; } diff --git a/core/modules/block_content/src/Tests/BlockContentTypeTest.php b/core/modules/block_content/src/Tests/BlockContentTypeTest.php index e73aa2a..1f9db5a 100644 --- a/core/modules/block_content/src/Tests/BlockContentTypeTest.php +++ b/core/modules/block_content/src/Tests/BlockContentTypeTest.php @@ -4,6 +4,7 @@ use Drupal\block_content\Entity\BlockContentType; use Drupal\Component\Utility\Html; +use Drupal\Core\Url; /** * Ensures that custom block type functions work correctly. @@ -118,7 +119,7 @@ public function testBlockContentTypeEditing() { $this->drupalGet('block/add'); $this->assertRaw('Bar', 'New name was displayed.'); $this->clickLink('Bar'); - $this->assertUrl(\Drupal::url('block_content.add_form', ['block_content_type' => 'basic'], ['absolute' => TRUE]), [], 'Original machine name was used in URL.'); + $this->assertUrl(Url::fromRoute('block_content.add_form', ['block_content_type' => 'basic'], ['absolute' => TRUE])->toString(), [], 'Original machine name was used in URL.'); // Remove the body field. $this->drupalPostForm('admin/structure/block/block-content/manage/basic/fields/block_content.basic.body/delete', array(), t('Delete')); @@ -198,7 +199,7 @@ public function testsBlockContentAddTypes() { // The seven theme has markup inside the link, we cannot use clickLink(). if ($default_theme == 'seven') { $options = $theme != $default_theme ? array('query' => array('theme' => $theme)) : array(); - $this->assertLinkByHref(\Drupal::url('block_content.add_form', array('block_content_type' => 'foo'), $options)); + $this->assertLinkByHref(Url::fromRoute('block_content.add_form', array('block_content_type' => 'foo'), $options)->toString()); $this->drupalGet('block/add/foo', $options); } else { @@ -210,9 +211,9 @@ public function testsBlockContentAddTypes() { $blocks = $storage->loadByProperties(array('info' => $edit['info[0][value]'])); if (!empty($blocks)) { $block = reset($blocks); - $this->assertUrl(\Drupal::url('block.admin_add', array('plugin_id' => 'block_content:' . $block->uuid(), 'theme' => $theme), array('absolute' => TRUE))); + $this->assertUrl(Url::fromRoute('block.admin_add', array('plugin_id' => 'block_content:' . $block->uuid(), 'theme' => $theme), array('absolute' => TRUE))->toString()); $this->drupalPostForm(NULL, array(), t('Save block')); - $this->assertUrl(\Drupal::url('block.admin_display_theme', array('theme' => $theme), array('absolute' => TRUE, 'query' => array('block-placement' => Html::getClass($edit['info[0][value]']))))); + $this->assertUrl(Url::fromRoute('block.admin_display_theme', array('theme' => $theme), array('absolute' => TRUE, 'query' => array('block-placement' => Html::getClass($edit['info[0][value]']))))->toString()); } else { $this->fail('Could not load created block.'); @@ -229,7 +230,7 @@ public function testsBlockContentAddTypes() { $this->drupalPostForm(NULL, $edit, t('Save')); $blocks = $storage->loadByProperties(array('info' => $edit['info[0][value]'])); if (!empty($blocks)) { - $this->assertUrl(\Drupal::url('entity.block_content.collection', array(), array('absolute' => TRUE))); + $this->assertUrl(Url::fromRoute('entity.block_content.collection', array(), array('absolute' => TRUE))->toString()); } else { $this->fail('Could not load created block.'); diff --git a/core/modules/book/book.module b/core/modules/book/book.module index ecccb74..6b65f55 100644 --- a/core/modules/book/book.module +++ b/core/modules/book/book.module @@ -30,12 +30,12 @@ function book_help($route_name, RouteMatchInterface $route_match) { $output .= '
'; $output .= '
' . t('Adding and managing book content') . '
'; $output .= '
' . t('Books have a hierarchical structure, called a book outline. Each book outline can have nested pages up to nine levels deep. Multiple content types can be configured to behave as a book outline. From the content edit form, it is possible to add a page to a book outline or create a new book.') . '
'; - $output .= '
' . t('You can assign separate permissions for creating new books as well as creating, editing and deleting book content. Users with the Administer book outlines permission can add any type of content to a book by selecting the appropriate book outline while editing the content. They can also view a list of all books, and edit and rearrange section titles on the Book list page.', array(':admin-book' => \Drupal::url('book.admin'))) . '
'; + $output .= '
' . t('You can assign separate permissions for creating new books as well as creating, editing and deleting book content. Users with the Administer book outlines permission can add any type of content to a book by selecting the appropriate book outline while editing the content. They can also view a list of all books, and edit and rearrange section titles on the Book list page.', array(':admin-book' => Url::fromRoute('book.admin')->toString())) . '
'; $output .= '
' . t('Configuring content types for books') . '
'; - $output .= '
' . t('The Book page content type is the initial content type enabled for book outlines. On the Book settings page you can configure content types that can used in book outlines.', array(':admin-settings' => \Drupal::url('book.settings'))) . '
'; - $output .= '
' . t('Users with the Add content and child pages to books permission will see a link to Add child page when viewing a content item that is part of a book outline. This link will allow users to create a new content item of the content type you select on the Book settings page. By default this is the Book page content type.', array(':admin-settings' => \Drupal::url('book.settings'))) . '
'; + $output .= '
' . t('The Book page content type is the initial content type enabled for book outlines. On the Book settings page you can configure content types that can used in book outlines.', array(':admin-settings' => Url::fromRoute('book.settings')->toString())) . '
'; + $output .= '
' . t('Users with the Add content and child pages to books permission will see a link to Add child page when viewing a content item that is part of a book outline. This link will allow users to create a new content item of the content type you select on the Book settings page. By default this is the Book page content type.', array(':admin-settings' => Url::fromRoute('book.settings')->toString())) . '
'; $output .= '
' . t('Book navigation') . '
'; - $output .= '
' . t("Book pages have a default book-specific navigation block. This navigation block contains links that lead to the previous and next pages in the book, and to the level above the current page in the book's structure. This block can be enabled on the Blocks layout page. For book pages to show up in the book navigation, they must be added to a book outline.", array(':admin-block' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '
'; + $output .= '
' . t("Book pages have a default book-specific navigation block. This navigation block contains links that lead to the previous and next pages in the book, and to the level above the current page in the book's structure. This block can be enabled on the Blocks layout page. For book pages to show up in the book navigation, they must be added to a book outline.", array(':admin-block' => (\Drupal::moduleHandler()->moduleExists('block')) ? Url::fromRoute('block.admin_display')->toString() : '#')) . '
'; $output .= '
' . t('Collaboration') . '
'; $output .= '
' . t('Books can be created collaboratively, as they allow users with appropriate permissions to add pages into existing books, and add those pages to a custom table of contents.') . '
'; $output .= '
' . t('Printing books') . '
'; @@ -47,7 +47,7 @@ function book_help($route_name, RouteMatchInterface $route_match) { return '

' . t('The book module offers a means to organize a collection of related content pages, collectively known as a book. When viewed, this content automatically displays links to adjacent book pages, providing a simple navigation system for creating and reviewing structured content.') . '

'; case 'entity.node.book_outline_form': - return '

' . t('The outline feature allows you to include pages in the Book hierarchy, as well as move them within the hierarchy or to reorder an entire book.', array(':book' => \Drupal::url('book.render'), ':book-admin' => \Drupal::url('book.admin'))) . '

'; + return '

' . t('The outline feature allows you to include pages in the Book hierarchy, as well as move them within the hierarchy or to reorder an entire book.', array(':book' => Url::fromRoute('book.render')->toString(), ':book-admin' => Url::fromRoute('book.admin')->toString())) . '

'; } } @@ -391,7 +391,7 @@ function template_preprocess_book_navigation(&$variables) { // Provide extra variables for themers. Not needed by default. $variables['book_id'] = $book_link['bid']; $variables['book_title'] = $book_link['link_title']; - $variables['book_url'] = \Drupal::url('entity.node.canonical', array('node' => $book_link['bid'])); + $variables['book_url'] = Url::fromRoute('entity.node.canonical', array('node' => $book_link['bid']))->toString(); $variables['current_depth'] = $book_link['depth']; $variables['tree'] = ''; @@ -404,7 +404,7 @@ function template_preprocess_book_navigation(&$variables) { $build = array(); if ($prev = $book_outline->prevLink($book_link)) { - $prev_href = \Drupal::url('entity.node.canonical', array('node' => $prev['nid'])); + $prev_href = Url::fromRoute('entity.node.canonical', array('node' => $prev['nid']))->toString(); $build['#attached']['html_head_link'][][] = array( 'rel' => 'prev', 'href' => $prev_href, @@ -416,7 +416,7 @@ function template_preprocess_book_navigation(&$variables) { /** @var \Drupal\book\BookManagerInterface $book_manager */ $book_manager = \Drupal::service('book.manager'); if ($book_link['pid'] && $parent = $book_manager->loadBookLink($book_link['pid'])) { - $parent_href = \Drupal::url('entity.node.canonical', array('node' => $book_link['pid'])); + $parent_href = Url::fromRoute('entity.node.canonical', array('node' => $book_link['pid']))->toString(); $build['#attached']['html_head_link'][][] = array( 'rel' => 'up', 'href' => $parent_href, @@ -426,7 +426,7 @@ function template_preprocess_book_navigation(&$variables) { } if ($next = $book_outline->nextLink($book_link)) { - $next_href = \Drupal::url('entity.node.canonical', array('node' => $next['nid'])); + $next_href = Url::fromRoute('entity.node.canonical', array('node' => $next['nid']))->toString(); $build['#attached']['html_head_link'][][] = array( 'rel' => 'next', 'href' => $next_href, diff --git a/core/modules/book/src/Tests/BookTest.php b/core/modules/book/src/Tests/BookTest.php index 7ebec63..ac3e140 100644 --- a/core/modules/book/src/Tests/BookTest.php +++ b/core/modules/book/src/Tests/BookTest.php @@ -7,6 +7,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\simpletest\WebTestBase; use Drupal\user\RoleInterface; +use Drupal\Core\Url; /** * Create a book, add pages, and test book interface. @@ -287,7 +288,7 @@ function checkBookNode(EntityInterface $node, $nodes, $previous = FALSE, $up = F // Compute the expected breadcrumb. $expected_breadcrumb = array(); - $expected_breadcrumb[] = \Drupal::url(''); + $expected_breadcrumb[] = Url::fromRoute('')->toString(); foreach ($breadcrumb as $a_node) { $expected_breadcrumb[] = $a_node->url(); } diff --git a/core/modules/ckeditor/ckeditor.module b/core/modules/ckeditor/ckeditor.module index a7a8538..06eb9d0 100644 --- a/core/modules/ckeditor/ckeditor.module +++ b/core/modules/ckeditor/ckeditor.module @@ -8,6 +8,7 @@ use Drupal\Component\Utility\UrlHelper; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\editor\Entity\Editor; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -17,15 +18,15 @@ function ckeditor_help($route_name, RouteMatchInterface $route_match) { case 'help.page.ckeditor': $output = ''; $output .= '

' . t('About') . '

'; - $output .= '

' . t('The CKEditor module provides a highly-accessible, highly-usable visual text editor and adds a toolbar to text fields. Users can use buttons to format content and to create semantically correct and valid HTML. The CKEditor module uses the framework provided by the Text Editor module. It requires JavaScript to be enabled in the browser. For more information, see the online documentation for the CKEditor module and the CKEditor website.', array( ':doc_url' => 'https://www.drupal.org/documentation/modules/ckeditor', ':cke_url' => 'http://ckeditor.com', ':text_editor' => \Drupal::url('help.page', array('name' => 'editor')))) . '

'; + $output .= '

' . t('The CKEditor module provides a highly-accessible, highly-usable visual text editor and adds a toolbar to text fields. Users can use buttons to format content and to create semantically correct and valid HTML. The CKEditor module uses the framework provided by the Text Editor module. It requires JavaScript to be enabled in the browser. For more information, see the online documentation for the CKEditor module and the CKEditor website.', array( ':doc_url' => 'https://www.drupal.org/documentation/modules/ckeditor', ':cke_url' => 'http://ckeditor.com', ':text_editor' => Url::fromRoute('help.page', array('name' => 'editor'))->toString())) . '

'; $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Enabling CKEditor for individual text formats') . '
'; - $output .= '
' . t('CKEditor has to be enabled and configured separately for individual text formats from the Text formats and editors page because the filter settings for each text format can be different. For more information, see the Text Editor help page and Filter help page.', array(':formats' => \Drupal::url('filter.admin_overview'), ':text_editor' => \Drupal::url('help.page', array('name' => 'editor')), ':filter' => \Drupal::url('help.page', array('name' => 'filter')))) . '
'; + $output .= '
' . t('CKEditor has to be enabled and configured separately for individual text formats from the Text formats and editors page because the filter settings for each text format can be different. For more information, see the Text Editor help page and Filter help page.', array(':formats' => Url::fromRoute('filter.admin_overview')->toString(), ':text_editor' => Url::fromRoute('help.page', array('name' => 'editor'))->toString(), ':filter' => Url::fromRoute('help.page', array('name' => 'filter'))->toString())) . '
'; $output .= '
' . t('Configuring the toolbar') . '
'; $output .= '
' . t('When CKEditor is chosen from the Text editor drop-down menu, its toolbar configuration is displayed. You can add and remove buttons from the Active toolbar by dragging and dropping them, and additional rows can be added to organize the buttons.') . '
'; $output .= '
' . t('Formatting content') . '
'; - $output .= '
' . t('CKEditor only allow users to format content in accordance with the filter configuration of the specific text format. If a text format excludes certain HTML tags, the corresponding toolbar buttons are not displayed to users when they edit a text field in this format. For more information see the Filter help page.', array(':filter' => \Drupal::url('help.page', array('name' => 'filter')))) . '
'; + $output .= '
' . t('CKEditor only allow users to format content in accordance with the filter configuration of the specific text format. If a text format excludes certain HTML tags, the corresponding toolbar buttons are not displayed to users when they edit a text field in this format. For more information see the Filter help page.', array(':filter' => Url::fromRoute('help.page', array('name' => 'filter'))->toString())) . '
'; $output .= '
' . t('Toggling between formatted text and HTML source') . '
'; $output .= '
' . t('If the Source button is available in the toolbar, users can click this button to disable the visual editor and edit the HTML source directly. After toggling back, the visual editor uses the allowed HTML tags to format the text — independent of whether buttons for these tags are available in the toolbar. If the text format is set to limit the use of HTML tags, then all excluded tags will be stripped out of the HTML source when the user toggles back to the text editor.') . '
'; $output .= '
' . t('Check my spelling as I type') . '
'; diff --git a/core/modules/color/color.module b/core/modules/color/color.module index ca0dc3a..068e1df 100644 --- a/core/modules/color/color.module +++ b/core/modules/color/color.module @@ -14,6 +14,7 @@ use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Render\Element\Textfield; use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -26,7 +27,7 @@ function color_help($route_name, RouteMatchInterface $route_match) { $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Changing colors') . '
'; - $output .= '

' . t('To change the color settings, select the Settings link for your theme on the Appearance page. If the color picker does not appear then the theme is not compatible with the Color module.', array(':appearance' => \Drupal::url('system.themes_page'))) . '

'; + $output .= '

' . t('To change the color settings, select the Settings link for your theme on the Appearance page. If the color picker does not appear then the theme is not compatible with the Color module.', array(':appearance' => Url::fromRoute('system.themes_page')->toString())) . '

'; $output .= '

' . t('The Color module saves a modified copy of the theme\'s specified stylesheets in the files directory. If you make any manual changes to your theme\'s stylesheet, you must save your color settings again, even if you haven\'t changed the colors. This step is required because the module stylesheets in the files directory need to be recreated to reflect your changes.') . '

'; $output .= '
'; return $output; diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index 40b4e40..084f4b4 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -62,15 +62,15 @@ function comment_help($route_name, RouteMatchInterface $route_match) { $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Enabling commenting') . '
'; - $output .= '
' . t('Comment functionality can be enabled for any entity sub-type (for example, a content type) by adding a Comments field on its Manage fields page. Adding or removing commenting for an entity through the user interface requires the Field UI module to be enabled, even though the commenting functionality works without it. For more information on fields and entities, see the Field module help page.', array(':content-type' => (\Drupal::moduleHandler()->moduleExists('node')) ? \Drupal::url('entity.node_type.collection') : '#', ':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '
'; + $output .= '
' . t('Comment functionality can be enabled for any entity sub-type (for example, a content type) by adding a Comments field on its Manage fields page. Adding or removing commenting for an entity through the user interface requires the Field UI module to be enabled, even though the commenting functionality works without it. For more information on fields and entities, see the Field module help page.', array(':content-type' => (\Drupal::moduleHandler()->moduleExists('node')) ? Url::fromRoute('entity.node_type.collection')->toString() : '#', ':field' => Url::fromRoute('help.page', array('name' => 'field'))->toString(), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#')) . '
'; $output .= '
' . t('Configuring commenting settings') . '
'; $output .= '
' . t('Commenting settings can be configured by editing the Comments field on the Manage fields page of an entity type if the Field UI module is enabled. Configuration includes the label of the comments field, the number of comments to be displayed, and whether they are shown in threaded list. Commenting can be be configured as: Open to allow new comments, Closed to view existing comments, but prevent new comments, or Hidden to hide existing comments and prevent new comments. Changing this configuration for an entity type will not change existing entity items.') . '
'; $output .= '
' . t('Overriding default settings') . '
'; $output .= '
' . t('Users with the appropriate permissions can override the default commenting settings of an entity type when they create an item of that type.') . '
'; $output .= '
' . t('Adding comment types') . '
'; - $output .= '
' . t('Additional comment types can be created per entity sub-type and added on the Comment types page. If there are multiple comment types available you can select the appropriate one after adding a Comments field.', array(':field' => \Drupal::url('entity.comment_type.collection'))) . '
'; + $output .= '
' . t('Additional comment types can be created per entity sub-type and added on the Comment types page. If there are multiple comment types available you can select the appropriate one after adding a Comments field.', array(':field' => Url::fromRoute('entity.comment_type.collection')->toString())) . '
'; $output .= '
' . t('Approving and managing comments') . '
'; - $output .= '
' . t('Comments from users who have the Skip comment approval permission are published immediately. All other comments are placed in the Unapproved comments queue, until a user who has permission to Administer comments and comment settings publishes or deletes them. Published comments can be bulk managed on the Published comments administration page. When a comment has no replies, it remains editable by its author, as long as the author has Edit own comments permission.', array(':comment-approval' => \Drupal::url('comment.admin_approval'), ':admin-comment' => \Drupal::url('comment.admin'))) . '
'; + $output .= '
' . t('Comments from users who have the Skip comment approval permission are published immediately. All other comments are placed in the Unapproved comments queue, until a user who has permission to Administer comments and comment settings publishes or deletes them. Published comments can be bulk managed on the Published comments administration page. When a comment has no replies, it remains editable by its author, as long as the author has Edit own comments permission.', array(':comment-approval' => Url::fromRoute('comment.admin_approval')->toString(), ':admin-comment' => Url::fromRoute('comment.admin')->toString())) . '
'; $output .= '
'; return $output; diff --git a/core/modules/comment/src/Tests/CommentInterfaceTest.php b/core/modules/comment/src/Tests/CommentInterfaceTest.php index a250614..89a770f 100644 --- a/core/modules/comment/src/Tests/CommentInterfaceTest.php +++ b/core/modules/comment/src/Tests/CommentInterfaceTest.php @@ -7,6 +7,7 @@ use Drupal\comment\Entity\Comment; use Drupal\user\RoleInterface; use Drupal\filter\Entity\FilterFormat; +use Drupal\Core\Url; /** * Tests comment user interfaces. @@ -118,7 +119,7 @@ public function testCommentInterface() { // \Drupal\comment\Controller\CommentController::redirectNode(). $this->drupalGet('comment/' . $this->node->id() . '/reply'); // Verify we were correctly redirected. - $this->assertUrl(\Drupal::url('comment.reply', array('entity_type' => 'node', 'entity' => $this->node->id(), 'field_name' => 'comment'), array('absolute' => TRUE))); + $this->assertUrl(Url::fromRoute('comment.reply', array('entity_type' => 'node', 'entity' => $this->node->id(), 'field_name' => 'comment'), array('absolute' => TRUE))->toString()); $this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $comment->id()); $this->assertText($subject_text, 'Individual comment-reply subject found.'); $this->assertText($comment_text, 'Individual comment-reply body found.'); diff --git a/core/modules/comment/src/Tests/CommentNewIndicatorTest.php b/core/modules/comment/src/Tests/CommentNewIndicatorTest.php index 6d89d4a..92e71fb 100644 --- a/core/modules/comment/src/Tests/CommentNewIndicatorTest.php +++ b/core/modules/comment/src/Tests/CommentNewIndicatorTest.php @@ -52,7 +52,7 @@ protected function renderNewCommentsNodeLinks(array $node_ids) { // Perform HTTP request. return $this->curlExec(array( - CURLOPT_URL => \Drupal::url('comment.new_comments_node_links', array(), array('absolute' => TRUE)), + CURLOPT_URL => Url::fromRoute('comment.new_comments_node_links', array(), array('absolute' => TRUE))->toString(), CURLOPT_POST => TRUE, CURLOPT_POSTFIELDS => $post, CURLOPT_HTTPHEADER => array( diff --git a/core/modules/comment/src/Tests/CommentTypeTest.php b/core/modules/comment/src/Tests/CommentTypeTest.php index fb5028f..6877bed 100644 --- a/core/modules/comment/src/Tests/CommentTypeTest.php +++ b/core/modules/comment/src/Tests/CommentTypeTest.php @@ -7,6 +7,7 @@ use Drupal\field\Entity\FieldStorageConfig; use Drupal\field\Entity\FieldConfig; use Drupal\node\Entity\Node; +use Drupal\Core\Url; /** * Ensures that comment type functions work correctly. @@ -106,7 +107,7 @@ public function testCommentTypeEditing() { $this->drupalGet('admin/structure/comment'); $this->assertRaw('Bar', 'New name was displayed.'); $this->clickLink('Manage fields'); - $this->assertUrl(\Drupal::url('entity.comment.field_ui_fields', ['comment_type' => 'comment'], ['absolute' => TRUE]), [], 'Original machine name was used in URL.'); + $this->assertUrl(Url::fromRoute('entity.comment.field_ui_fields', ['comment_type' => 'comment'], ['absolute' => TRUE])->toString(), [], 'Original machine name was used in URL.'); $this->assertTrue($this->cssSelect('tr#comment-body'), 'Body field exists.'); // Remove the body field. diff --git a/core/modules/config/config.module b/core/modules/config/config.module index 4f31e08..f9c80c6 100644 --- a/core/modules/config/config.module +++ b/core/modules/config/config.module @@ -6,6 +6,7 @@ */ use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -19,15 +20,15 @@ function config_help($route_name, RouteMatchInterface $route_match) { $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Exporting the full configuration') . '
'; - $output .= '
' . t('You can create and download an archive consisting of all your site\'s configuration exported as *.yml files on the Export page.', array(':url' => \Drupal::url('config.export_full'))) . '
'; + $output .= '
' . t('You can create and download an archive consisting of all your site\'s configuration exported as *.yml files on the Export page.', array(':url' => Url::fromRoute('config.export_full')->toString())) . '
'; $output .= '
' . t('Importing a full configuration') . '
'; - $output .= '
' . t('You can upload a full site configuration from an archive file on the Import page. When importing data from a different environment, the site and import files must have matching configuration values for UUID in the system.site configuration item. That means that your other environments should initially be set up as clones of the target site. Migrations are not supported.', array(':url' => \Drupal::url('config.import_full'))) . '
'; + $output .= '
' . t('You can upload a full site configuration from an archive file on the Import page. When importing data from a different environment, the site and import files must have matching configuration values for UUID in the system.site configuration item. That means that your other environments should initially be set up as clones of the target site. Migrations are not supported.', array(':url' => Url::fromRoute('config.import_full')->toString())) . '
'; $output .= '
' . t('Synchronizing configuration') . '
'; - $output .= '
' . t('You can review differences between the active configuration and an imported configuration archive on the Synchronize page to ensure that the changes are as expected, before finalizing the import. The Synchronize page also shows configuration items that would be added or removed.', array(':synchronize' => \Drupal::url('config.sync'))) . '
'; + $output .= '
' . t('You can review differences between the active configuration and an imported configuration archive on the Synchronize page to ensure that the changes are as expected, before finalizing the import. The Synchronize page also shows configuration items that would be added or removed.', array(':synchronize' => url::fromRoute('config.sync')->toString())) . '
'; $output .= '
' . t('Exporting a single configuration item') . '
'; - $output .= '
' . t('You can export a single configuration item by selecting a Configuration type and Configuration name on the Single export page. The configuration and its corresponding *.yml file name are then displayed on the page for you to copy.', array(':single-export' => \Drupal::url('config.export_single'))) . '
'; + $output .= '
' . t('You can export a single configuration item by selecting a Configuration type and Configuration name on the Single export page. The configuration and its corresponding *.yml file name are then displayed on the page for you to copy.', array(':single-export' => Url::fromRoute('config.export_single')->toString())) . '
'; $output .= '
' . t('Importing a single configuration item') . '
'; - $output .= '
' . t('You can import a single configuration item by pasting it in YAML format into the form on the Single import page.', array(':single-import' => \Drupal::url('config.import_single'))) . '
'; + $output .= '
' . t('You can import a single configuration item by pasting it in YAML format into the form on the Single import page.', array(':single-import' => Url::fromRoute('config.import_single')->toString())) . '
'; $output .= '
'; return $output; diff --git a/core/modules/config_translation/config_translation.module b/core/modules/config_translation/config_translation.module index 9f0803d..da44d62 100644 --- a/core/modules/config_translation/config_translation.module +++ b/core/modules/config_translation/config_translation.module @@ -8,6 +8,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\field\FieldConfigInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -17,15 +18,15 @@ function config_translation_help($route_name, RouteMatchInterface $route_match) case 'help.page.config_translation': $output = ''; $output .= '

' . t('About') . '

'; - $output .= '

' . t('The Configuration Translation module allows you to translate configuration text; for example, the site name, vocabularies, menus, or date formats. Together with the modules Language, Content Translation, and Interface Translation, it allows you to build multilingual websites. For more information, see the online documentation for the Configuration Translation module.', array(':doc_url' => 'https://www.drupal.org/documentation/modules/config_translation', ':config' => \Drupal::url('help.page', array('name' => 'config')), ':language' => \Drupal::url('help.page', array('name' => 'language')), ':locale' => \Drupal::url('help.page', array('name' => 'locale')), ':content-translation' => (\Drupal::moduleHandler()->moduleExists('content_translation')) ? \Drupal::url('help.page', array('name' => 'content_translation')) : '#')) . '

'; + $output .= '

' . t('The Configuration Translation module allows you to translate configuration text; for example, the site name, vocabularies, menus, or date formats. Together with the modules Language, Content Translation, and Interface Translation, it allows you to build multilingual websites. For more information, see the online documentation for the Configuration Translation module.', array(':doc_url' => 'https://www.drupal.org/documentation/modules/config_translation', ':config' => Url::fromRoute('help.page', array('name' => 'config'))->toString(), ':language' => Url::fromRoute('help.page', array('name' => 'language'))->toString(), ':locale' => Url::fromRoute('help.page', array('name' => 'locale'))->toString(), ':content-translation' => (\Drupal::moduleHandler()->moduleExists('content_translation')) ? Url::fromRoute('help.page', array('name' => 'content_translation'))->toString() : '#')) . '

'; $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Enabling translation') . '
'; - $output .= '
' . t('In order to translate configuration, the website must have at least two languages.', array(':url' => \Drupal::url('entity.configurable_language.collection'))) . '
'; + $output .= '
' . t('In order to translate configuration, the website must have at least two languages.', array(':url' => Url::fromRoute('entity.configurable_language.collection')->toString())) . '
'; $output .= '
' . t('Translating configuration text') . '
'; - $output .= '
' . t('Users with the Translate user edited configuration permission can access the configuration translation overview, and manage translations for specific languages. The Configuration translation page shows a list of all configuration text that can be translated, either as individual items or as lists. After you click on Translate, you are provided with a list of all languages. You can add or edit a translation for a specific language. Users with specific configuration permissions can also edit the text for the site\'s default language. For some configuration text items (for example for the site information), the specific translation pages can also be accessed directly from their configuration pages.', array(':translation-page' => \Drupal::url('config_translation.mapper_list'))) . '
'; + $output .= '
' . t('Users with the Translate user edited configuration permission can access the configuration translation overview, and manage translations for specific languages. The Configuration translation page shows a list of all configuration text that can be translated, either as individual items or as lists. After you click on Translate, you are provided with a list of all languages. You can add or edit a translation for a specific language. Users with specific configuration permissions can also edit the text for the site\'s default language. For some configuration text items (for example for the site information), the specific translation pages can also be accessed directly from their configuration pages.', array(':translation-page' => Url::fromRoute('config_translation.mapper_list')->toString())) . '
'; $output .= '
' . t('Translating date formats') . '
'; - $output .= '
' . t('You can choose to translate date formats on the Configuration translation page. This allows you not only to translate the label text, but also to set a language-specific PHP date format.', array(':translation-page' => \Drupal::url('config_translation.mapper_list'))) . '
'; + $output .= '
' . t('You can choose to translate date formats on the Configuration translation page. This allows you not only to translate the label text, but also to set a language-specific PHP date format.', array(':translation-page' => Url::fromRoute('config_translation.mapper_list')->toString())) . '
'; $output .= '
'; return $output; diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module index 7cba6b1..716f232 100644 --- a/core/modules/contact/contact.module +++ b/core/modules/contact/contact.module @@ -8,6 +8,7 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\user\Entity\User; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -16,9 +17,9 @@ function contact_help($route_name, RouteMatchInterface $route_match) { switch ($route_name) { case 'help.page.contact': - $menu_page = \Drupal::moduleHandler()->moduleExists('menu_ui') ? \Drupal::url('entity.menu.collection') : '#'; - $block_page = \Drupal::moduleHandler()->moduleExists('block') ? \Drupal::url('block.admin_display') : '#'; - $contact_page = \Drupal::url('entity.contact_form.collection'); + $menu_page = \Drupal::moduleHandler()->moduleExists('menu_ui') ? Url::fromRoute('entity.menu.collection')->toString() : '#'; + $block_page = \Drupal::moduleHandler()->moduleExists('block') ? Url::fromRoute('block.admin_display')->toString() : '#'; + $contact_page = Url::fromRoute('entity.contact_form.collection')->toString(); $output = ''; $output .= '

' . t('About') . '

'; $output .= '

' . t('The Contact module allows visitors to contact registered users on your site, using the personal contact form, and also allows you to set up site-wide contact forms. For more information, see the online documentation for the Contact module.', array(':contact' => 'https://www.drupal.org/documentation/modules/contact')) . '

'; @@ -117,7 +118,7 @@ function contact_mail($key, &$message, $params) { '@site-name' => \Drupal::config('system.site')->get('name'), '@subject' => $contact_message->getSubject(), '@form' => !empty($params['contact_form']) ? $params['contact_form']->label() : NULL, - '@form-url' => \Drupal::url('', [], ['absolute' => TRUE, 'language' => $language]), + '@form-url' => Url::fromRoute('', [], ['absolute' => TRUE, 'language' => $language])->toString(), '@sender-name' => $sender->getDisplayName(), ); if ($sender->isAuthenticated()) { diff --git a/core/modules/contact/src/Tests/ContactSitewideTest.php b/core/modules/contact/src/Tests/ContactSitewideTest.php index ce69388..a758f3f 100644 --- a/core/modules/contact/src/Tests/ContactSitewideTest.php +++ b/core/modules/contact/src/Tests/ContactSitewideTest.php @@ -9,6 +9,7 @@ use Drupal\simpletest\WebTestBase; use Drupal\Core\Entity\EntityTypeInterface; use Drupal\user\RoleInterface; +use Drupal\Core\Url; /** * Tests site-wide contact form functionality. @@ -76,7 +77,7 @@ function testSiteWideContact() { // field_ui enabled admin/structure/contact/manage/personal/fields exists. // @todo: See https://www.drupal.org/node/2031223 for the above. $edit_link = $this->xpath('//a[@href=:href]', array( - ':href' => \Drupal::url('entity.contact_form.edit_form', array('contact_form' => 'personal')) + ':href' => Url::fromRoute('entity.contact_form.edit_form', array('contact_form' => 'personal'))->toString() )); $this->assertTrue(empty($edit_link), format_string('No link containing href %href found.', array('%href' => 'admin/structure/contact/manage/personal') @@ -248,7 +249,7 @@ function testSiteWideContact() { $this->drupalGet('admin/structure/contact'); $view_link = $this->xpath('//table/tbody/tr/td/a[contains(@href, :href) and text()=:text]', [ - ':href' => \Drupal::url('entity.contact_form.canonical', ['contact_form' => $contact_form]), + ':href' => Url::fromRoute('entity.contact_form.canonical', ['contact_form' => $contact_form])->toString(), ':text' => $label, ] ); diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module index 083fc4c..0a86d87 100644 --- a/core/modules/content_translation/content_translation.module +++ b/core/modules/content_translation/content_translation.module @@ -14,6 +14,7 @@ use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\StringTranslation\TranslatableMarkup; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -23,11 +24,11 @@ function content_translation_help($route_name, RouteMatchInterface $route_match) case 'help.page.content_translation': $output = ''; $output .= '

' . t('About') . '

'; - $output .= '

' . t('The Content Translation module allows you to translate content, comments, custom blocks, taxonomy terms, users and other content entities. Together with the modules Language, Configuration Translation, and Interface Translation, it allows you to build multilingual websites. For more information, see the online documentation for the Content Translation module.', array(':locale' => (\Drupal::moduleHandler()->moduleExists('locale')) ? \Drupal::url('help.page', array('name' => 'locale')) : '#', ':config-trans' => (\Drupal::moduleHandler()->moduleExists('config_translation')) ? \Drupal::url('help.page', array('name' => 'config_translation')) : '#', ':language' => \Drupal::url('help.page', array('name' => 'language')), ':translation-entity' => 'https://www.drupal.org/documentation/modules/translation', ':field_help' => \Drupal::url('help.page', array('name' => 'field')))) . '

'; + $output .= '

' . t('The Content Translation module allows you to translate content, comments, custom blocks, taxonomy terms, users and other content entities. Together with the modules Language, Configuration Translation, and Interface Translation, it allows you to build multilingual websites. For more information, see the online documentation for the Content Translation module.', array(':locale' => (\Drupal::moduleHandler()->moduleExists('locale')) ? Url::fromRoute('help.page', array('name' => 'locale'))->toString() : '#', ':config-trans' => (\Drupal::moduleHandler()->moduleExists('config_translation')) ? Url::fromRoute('help.page', array('name' => 'config_translation'))->toString() : '#', ':language' => Url::fromRoute('help.page', array('name' => 'language'))->toString(), ':translation-entity' => 'https://www.drupal.org/documentation/modules/translation', ':field_help' => Url::fromRoute('help.page', array('name' => 'field'))->toString())) . '

'; $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Enabling translation') . '
'; - $output .= '
' . t('In order to translate content, the website must have at least two languages. When that is the case, you can enable translation for the desired content entities on the Content language page. When enabling translation you can choose the default language for content and decide whether to show the language selection field on the content editing forms.', array(':url' => \Drupal::url('entity.configurable_language.collection'), ':translation-entity' => \Drupal::url('language.content_settings_page'), ':language-help' => \Drupal::url('help.page', array('name' => 'language')))) . '
'; + $output .= '
' . t('In order to translate content, the website must have at least two languages. When that is the case, you can enable translation for the desired content entities on the Content language page. When enabling translation you can choose the default language for content and decide whether to show the language selection field on the content editing forms.', array(':url' => Url::fromRoute('entity.configurable_language.collection')->toString(), ':translation-entity' => Url::fromRoute('language.content_settings_page')->toString(), ':language-help' => Url::fromRoute('help.page', array('name' => 'language'))->toString())) . '
'; $output .= '
' . t('Enabling field translation') . '
'; $output .= '
' . t('You can define which fields of a content entity can be translated. For example, you might want to translate the title and body field while leaving the image field untranslated. If you exclude a field from being translated, it will still show up in the content editing form, but any changes made to that field will be applied to all translations of that content.') . '
'; $output .= '
' . t('Translating content') . '
'; @@ -42,7 +43,7 @@ function content_translation_help($route_name, RouteMatchInterface $route_match) case 'language.content_settings_page': $output = ''; if (!\Drupal::languageManager()->isMultilingual()) { - $output .= '
' . t('Before you can translate content, there must be at least two languages added on the languages administration page.', array(':url' => \Drupal::url('entity.configurable_language.collection'))); + $output .= '
' . t('Before you can translate content, there must be at least two languages added on the languages administration page.', array(':url' => Url::fromRoute('entity.configurable_language.collection')->toString())); } return $output; } @@ -385,9 +386,9 @@ function content_translation_form_field_config_edit_form_alter(array &$form, For // Provide helpful pointers for administrators. if (\Drupal::currentUser()->hasPermission('administer content translation') && !$bundle_is_translatable) { - $toggle_url = \Drupal::url('language.content_settings_page', array(), array( + $toggle_url = Url::fromRoute('language.content_settings_page', array(), array( 'query' => \Drupal::destination()->getAsArray(), - )); + ))->toString(); $form['translatable']['#description'] = t('To configure translation for this field, enable language support for this type.', array( ':language-settings-url' => $toggle_url, )); diff --git a/core/modules/content_translation/src/Tests/ContentTranslationContextualLinksTest.php b/core/modules/content_translation/src/Tests/ContentTranslationContextualLinksTest.php index efbd3c1..e961bf0 100644 --- a/core/modules/content_translation/src/Tests/ContentTranslationContextualLinksTest.php +++ b/core/modules/content_translation/src/Tests/ContentTranslationContextualLinksTest.php @@ -7,6 +7,7 @@ use Drupal\language\Entity\ConfigurableLanguage; use Drupal\simpletest\WebTestBase; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\Core\Url; /** * Tests that contextual links are available for content translation. @@ -164,7 +165,7 @@ protected function renderContextualLinks($ids, $current_path) { // Perform HTTP request. return $this->curlExec(array( - CURLOPT_URL => \Drupal::url('contextual.render', array(), array('absolute' => TRUE, 'query' => array('destination' => $current_path))), + CURLOPT_URL => Url::fromRoute('contextual.render', array(), array('absolute' => TRUE, 'query' => array('destination' => $current_path)))->toString(), CURLOPT_POST => TRUE, CURLOPT_POSTFIELDS => $post, CURLOPT_HTTPHEADER => array( diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module index 8d734f1..20e0525 100644 --- a/core/modules/contextual/contextual.module +++ b/core/modules/contextual/contextual.module @@ -9,6 +9,7 @@ use Drupal\Component\Utility\UrlHelper; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Implements hook_toolbar(). @@ -90,7 +91,7 @@ function contextual_help($route_name, RouteMatchInterface $route_match) { ]; $sample_picture = \Drupal::service('renderer')->render($sample_picture); $output .= '
  • ' . t('Hovering over the area of interest will temporarily make the contextual links button visible (which looks like a pencil in most themes, and is normally displayed in the upper right corner of the area). The icon typically looks like this: @picture', array('@picture' => $sample_picture)) . '
    • '; - $output .= '
  • ' . t('If you have the Toolbar module enabled, clicking the contextual links button in the toolbar (which looks like a pencil) will make all contextual links buttons on the page visible. Clicking this button again will toggle them to invisible.', array(':toolbar' => (\Drupal::moduleHandler()->moduleExists('toolbar')) ? \Drupal::url('help.page', array('name' => 'toolbar')) : '#')) . '
    • '; + $output .= '
  • ' . t('If you have the Toolbar module enabled, clicking the contextual links button in the toolbar (which looks like a pencil) will make all contextual links buttons on the page visible. Clicking this button again will toggle them to invisible.', array(':toolbar' => (\Drupal::moduleHandler()->moduleExists('toolbar')) ? Url::fromRoute('help.page', array('name' => 'toolbar'))->toString() : '#')) . '
    • '; $output .= ''; $output .= t('Once the contextual links button for the area of interest is visible, click the button to display the links.'); $output .= ''; diff --git a/core/modules/datetime/datetime.module b/core/modules/datetime/datetime.module index f25140f..8fabbd3 100644 --- a/core/modules/datetime/datetime.module +++ b/core/modules/datetime/datetime.module @@ -6,6 +6,7 @@ */ use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Defines the timezone that dates should be stored in. @@ -30,13 +31,13 @@ function datetime_help($route_name, RouteMatchInterface $route_match) { case 'help.page.datetime': $output = ''; $output .= '

    ' . t('About') . '

    '; - $output .= '

    ' . t('The Datetime module provides a Date field that stores dates and times. It also provides the Form API elements datetime and datelist for use in programming modules. See the Field module help and the Field UI module help pages for general information on fields and how to create and manage them. For more information, see the online documentation for the Datetime module.', array(':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#', ':datetime_do' => 'https://www.drupal.org/documentation/modules/datetime')) . '

    '; + $output .= '

    ' . t('The Datetime module provides a Date field that stores dates and times. It also provides the Form API elements datetime and datelist for use in programming modules. See the Field module help and the Field UI module help pages for general information on fields and how to create and manage them. For more information, see the online documentation for the Datetime module.', array(':field' => Url::fromRoute('help.page', array('name' => 'field'))->toString(), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#', ':datetime_do' => 'https://www.drupal.org/documentation/modules/datetime')) . '

    '; $output .= '

    ' . t('Uses') . '

    '; $output .= '
    '; $output .= '
    ' . t('Managing and displaying date fields') . '
    '; - $output .= '
    ' . t('The settings and the display of the Date field can be configured separately. See the Field UI help for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '
    '; + $output .= '
    ' . t('The settings and the display of the Date field can be configured separately. See the Field UI help for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#')) . '
    '; $output .= '
    ' . t('Displaying dates') . '
    '; - $output .= '
    ' . t('Dates can be displayed using the Plain or the Default formatter. The Plain formatter displays the date in the ISO 8601 format. If you choose the Default formatter, you can choose a format from a predefined list that can be managed on the Date and time formats page.', array(':date_format_list' => \Drupal::url('entity.date_format.collection'))) . '
    '; + $output .= '
    ' . t('Dates can be displayed using the Plain or the Default formatter. The Plain formatter displays the date in the ISO 8601 format. If you choose the Default formatter, you can choose a format from a predefined list that can be managed on the Date and time formats page.', array(':date_format_list' => Url::fromRoute('entity.date_format.collection')->toString())) . '
    '; $output .= '
    '; return $output; } diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module index 06fef10..1310265 100644 --- a/core/modules/dblog/dblog.module +++ b/core/modules/dblog/dblog.module @@ -12,6 +12,7 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\StringTranslation\TranslatableMarkup; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -25,9 +26,9 @@ function dblog_help($route_name, RouteMatchInterface $route_match) { $output .= '

    ' . t('Uses') . '

    '; $output .= '
    '; $output .= '
    ' . t('Monitoring your site') . '
    '; - $output .= '
    ' . t('The Database Logging module allows you to view an event log on the Recent log messages page. The log is a chronological list of recorded events containing usage data, performance data, errors, warnings and operational information. Administrators should check the log on a regular basis to ensure their site is working properly.', array(':dblog' => \Drupal::url('dblog.overview'))) . '
    '; + $output .= '
    ' . t('The Database Logging module allows you to view an event log on the Recent log messages page. The log is a chronological list of recorded events containing usage data, performance data, errors, warnings and operational information. Administrators should check the log on a regular basis to ensure their site is working properly.', array(':dblog' => Url::fromRoute('dblog.overview')->toString())) . '
    '; $output .= '
    ' . t('Debugging site problems') . '
    '; - $output .= '
    ' . t('In case of errors or problems with the site, the Recent log messages page can be useful for debugging, since it shows the sequence of events. The log messages include usage information, warnings, and errors.', array(':dblog' => \Drupal::url('dblog.overview'))) . '
    '; + $output .= '
    ' . t('In case of errors or problems with the site, the Recent log messages page can be useful for debugging, since it shows the sequence of events. The log messages include usage information, warnings, and errors.', array(':dblog' => Url::fromRoute('dblog.overview')->toString())) . '
    '; $output .= '
    '; return $output; @@ -101,7 +102,7 @@ function dblog_form_system_logging_settings_alter(&$form, FormStateInterface $fo '#title' => t('Database log messages to keep'), '#default_value' => \Drupal::configFactory()->getEditable('dblog.settings')->get('row_limit'), '#options' => array(0 => t('All')) + array_combine($row_limits, $row_limits), - '#description' => t('The maximum number of messages to keep in the database log. Requires a cron maintenance task.', array(':cron' => \Drupal::url('system.status'))) + '#description' => t('The maximum number of messages to keep in the database log. Requires a cron maintenance task.', array(':cron' => Url::fromRoute('system.status')->toString())) ); $form['#submit'][] = 'dblog_logging_settings_submit'; diff --git a/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php b/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php index 1968a12..9c7cbc9 100644 --- a/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php +++ b/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php @@ -73,7 +73,7 @@ public function testIntegration() { 'variables' => array( '@token1' => $this->randomMachineName(), '@token2' => $this->randomMachineName(), - 'link' => 'Link', + 'link' => 'Link', ), ); $logger_factory = $this->container->get('logger.factory'); diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module index e37683f..ab37c04 100644 --- a/core/modules/editor/editor.module +++ b/core/modules/editor/editor.module @@ -16,6 +16,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\filter\FilterFormatInterface; use Drupal\filter\Plugin\FilterInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -25,13 +26,13 @@ function editor_help($route_name, RouteMatchInterface $route_match) { case 'help.page.editor': $output = ''; $output .= '

    ' . t('About') . '

    '; - $output .= '

    ' . t('The Text Editor module provides a framework that other modules (such as CKEditor module) can use to provide toolbars and other functionality that allow users to format text more easily than typing HTML tags directly. For more information, see the online documentation for the Text Editor module.', array(':documentation' => 'https://www.drupal.org/documentation/modules/editor', ':ckeditor' => (\Drupal::moduleHandler()->moduleExists('ckeditor')) ? \Drupal::url('help.page', array('name' => 'ckeditor')) : '#')) . '

    '; + $output .= '

    ' . t('The Text Editor module provides a framework that other modules (such as CKEditor module) can use to provide toolbars and other functionality that allow users to format text more easily than typing HTML tags directly. For more information, see the online documentation for the Text Editor module.', array(':documentation' => 'https://www.drupal.org/documentation/modules/editor', ':ckeditor' => (\Drupal::moduleHandler()->moduleExists('ckeditor')) ? Url::fromRoute('help.page', array('name' => 'ckeditor'))->toString() : '#')) . '

    '; $output .= '

    ' . t('Uses') . '

    '; $output .= '
    '; $output .= '
    ' . t('Installing text editors') . '
    '; - $output .= '
    ' . t('The Text Editor module provides a framework for managing editors. To use it, you also need to enable a text editor. This can either be the core CKEditor module, which can be enabled on the Extend page, or a contributed module for any other text editor. When installing a contributed text editor module, be sure to check the installation instructions, because you will most likely need to download and install an external library as well as the Drupal module.', array(':ckeditor' => (\Drupal::moduleHandler()->moduleExists('ckeditor')) ? \Drupal::url('help.page', array('name' => 'ckeditor')) : '#', ':extend' => \Drupal::url('system.modules_list'))) . '
    '; + $output .= '
    ' . t('The Text Editor module provides a framework for managing editors. To use it, you also need to enable a text editor. This can either be the core CKEditor module, which can be enabled on the Extend page, or a contributed module for any other text editor. When installing a contributed text editor module, be sure to check the installation instructions, because you will most likely need to download and install an external library as well as the Drupal module.', array(':ckeditor' => (\Drupal::moduleHandler()->moduleExists('ckeditor')) ? Url::fromRoute('help.page', array('name' => 'ckeditor'))->toString() : '#', ':extend' => Url::fromRoute('system.modules_list')->toString())) . '
    '; $output .= '
    ' . t('Enabling a text editor for a text format') . '
    '; - $output .= '
    ' . t('On the Text formats and editors page you can see which text editor is associated with each text format. You can change this by clicking on the Configure link, and then choosing a text editor or none from the Text editor drop-down list. The text editor will then be displayed with any text field for which this text format is chosen.', array(':formats' => \Drupal::url('filter.admin_overview'))) . '
    '; + $output .= '
    ' . t('On the Text formats and editors page you can see which text editor is associated with each text format. You can change this by clicking on the Configure link, and then choosing a text editor or none from the Text editor drop-down list. The text editor will then be displayed with any text field for which this text format is chosen.', array(':formats' => Url::fromRoute('filter.admin_overview')->toString())) . '
    '; $output .= '
    ' . t('Configuring a text editor') . '
    '; $output .= '
    ' . t('Once a text editor is associated with a text format, you can configure it by clicking on the Configure link for this format. Depending on the specific text editor, you can configure it for example by adding buttons to its toolbar. Typically these buttons provide formatting or editing tools, and they often insert HTML tags into the field source. For details, see the help page of the specific text editor.') . '
    '; $output .= '
    ' . t('Using different text editors and formats') . '
    '; diff --git a/core/modules/field/field.module b/core/modules/field/field.module index 053ab4a..c9d9986 100644 --- a/core/modules/field/field.module +++ b/core/modules/field/field.module @@ -66,7 +66,7 @@ function field_help($route_name, RouteMatchInterface $route_match) { switch ($route_name) { case 'help.page.field': - $field_ui_url = \Drupal::moduleHandler()->moduleExists('field_ui') ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#'; + $field_ui_url = \Drupal::moduleHandler()->moduleExists('field_ui') ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#'; $output = ''; $output .= '

    ' . t('About') . '

    '; $output .= '

    ' . t('The Field module allows custom data fields to be defined for entity types (see below). The Field module takes care of storing, loading, editing, and rendering field data. Most users will not interact with the Field module directly, but will instead use the Field UI module user interface. Module developers can use the Field API to make new entity types "fieldable" and thus allow fields to be attached to them. For more information, see the online documentation for the Field module.', array(':field-ui-help' => $field_ui_url, ':field' => 'https://www.drupal.org/documentation/modules/field')) . '

    '; @@ -86,7 +86,7 @@ function field_help($route_name, RouteMatchInterface $route_match) { $output .= '

    ' . t('Uses') . '

    '; $output .= '
    '; $output .= '
    ' . t('Enabling field types, widgets, and formatters') . '
    '; - $output .= '
    ' . t('The Field module provides the infrastructure for fields; the field types, formatters, and widgets are provided by Drupal core or additional modules. Some of the modules are required; the optional modules can be enabled from the Extend administration page. Additional fields, formatters, and widgets may be provided by contributed modules, which you can find in the contributed module section of Drupal.org.', array(':modules' => \Drupal::url('system.modules_list'), ':contrib' => 'https://www.drupal.org/project/modules')) . '
    '; + $output .= '
    ' . t('The Field module provides the infrastructure for fields; the field types, formatters, and widgets are provided by Drupal core or additional modules. Some of the modules are required; the optional modules can be enabled from the Extend administration page. Additional fields, formatters, and widgets may be provided by contributed modules, which you can find in the contributed module section of Drupal.org.', array(':modules' => Url::fromRoute('system.modules_list')->toString(), ':contrib' => 'https://www.drupal.org/project/modules')) . '
    '; $output .= '

    ' . t('Field, widget, and formatter information') . '

    '; diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceAdminTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceAdminTest.php index d781084..8276ea2 100644 --- a/core/modules/field/src/Tests/EntityReference/EntityReferenceAdminTest.php +++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceAdminTest.php @@ -9,6 +9,7 @@ use Drupal\node\Entity\Node; use Drupal\simpletest\WebTestBase; use Drupal\taxonomy\Entity\Vocabulary; +use Drupal\Core\Url; /** * Tests for the administrative UI. @@ -168,8 +169,8 @@ public function testFieldAdminHandler() { ); $this->drupalPostAjaxForm($bundle_path . '/fields/' . $field_name, $edit, 'settings[handler]'); $this->assertRaw(t('No eligible views were found. Create a view with an Entity Reference display, or add such a display to an existing view.', array( - ':create' => \Drupal::url('views_ui.add'), - ':existing' => \Drupal::url('entity.view.collection'), + ':create' => Url::fromRoute('views_ui.add')->toString(), + ':existing' => Url::fromRoute('entity.view.collection')->toString(), ))); $this->drupalPostForm(NULL, $edit, t('Save settings')); // If no eligible view is available we should see a message. diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module index 5134cad..1db28dc 100644 --- a/core/modules/field_ui/field_ui.module +++ b/core/modules/field_ui/field_ui.module @@ -22,7 +22,7 @@ function field_ui_help($route_name, RouteMatchInterface $route_match) { case 'help.page.field_ui': $output = ''; $output .= '

    ' . t('About') . '

    '; - $output .= '

    ' . t('The Field UI module provides an administrative user interface (UI) for managing and displaying fields. Fields can be attached to most content entity sub-types. Different field types, widgets, and formatters are provided by the modules enabled on your site, and managed by the Field module. For background information and terminology related to fields and entities, see the Field module help page. For more information about the Field UI, see the online documentation for the Field UI module.', array(':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui_docs' => 'https://www.drupal.org/documentation/modules/field-ui')) . '

    '; + $output .= '

    ' . t('The Field UI module provides an administrative user interface (UI) for managing and displaying fields. Fields can be attached to most content entity sub-types. Different field types, widgets, and formatters are provided by the modules enabled on your site, and managed by the Field module. For background information and terminology related to fields and entities, see the Field module help page. For more information about the Field UI, see the online documentation for the Field UI module.', array(':field' => Url::fromRoute('help.page', array('name' => 'field'))->toString(), ':field_ui_docs' => 'https://www.drupal.org/documentation/modules/field-ui')) . '

    '; $output .= '

    ' . t('Uses') . '

    '; $output .= '
    '; $output .= '
    ' . t('Creating a field') . '
    '; @@ -34,9 +34,9 @@ function field_ui_help($route_name, RouteMatchInterface $route_match) { $output .= '
    ' . t('Configuring field display') . '
    '; $output .= '
    ' . t('On the Manage display page of your entity type or sub-type, you can configure how each field is displayed by default and in each view mode. If your entity type has multiple view modes, you can toggle between the view modes at the top of the page, and you can toggle whether each view mode uses the default settings or custom settings in the Custom display settings section. For each field in each view mode, you can choose whether and how to display the label of the field from the Label drop-down list. You can also select the formatter to use for display; some formatters have configuration options, which you can edit using the Edit button (which looks like a wheel). You can also change the display order of fields. You can exclude a field from a specific view mode by choosing Hidden from the formatter drop-down list, or by dragging it into the Disabled section.') . '
    '; $output .= '
    ' . t('Configuring view and form modes') . '
    '; - $output .= '
    ' . t('You can add, edit, and delete view modes for entities on the View modes page, and you can add, edit, and delete form modes for entities on the Form modes page. Once you have defined a view mode or form mode for an entity type, it will be available on the Manage display or Manage form display page for each sub-type of that entity.', array(':view_modes' => \Drupal::url('entity.entity_view_mode.collection'), ':form_modes' => \Drupal::url('entity.entity_form_mode.collection'))) . '
    '; + $output .= '
    ' . t('You can add, edit, and delete view modes for entities on the View modes page, and you can add, edit, and delete form modes for entities on the Form modes page. Once you have defined a view mode or form mode for an entity type, it will be available on the Manage display or Manage form display page for each sub-type of that entity.', array(':view_modes' => Url::fromRoute('entity.entity_view_mode.collection')->toString(), ':form_modes' => Url::fromRoute('entity.entity_form_mode.collection')->toString())) . '
    '; $output .= '
    ' . t('Listing fields') . '
    '; - $output .= '
    ' . t('There are two reports available that list the fields defined on your site. The Entities report lists all your fields, showing the field machine names, types, and the entity types or sub-types they are used on (each sub-type links to the Manage fields page). If the Views and Views UI modules are enabled, the Used in views report lists each field that is used in a view, with a link to edit that view.', array(':entity-list' => \Drupal::url('entity.field_storage_config.collection'), ':views-list' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? \Drupal::url('views_ui.reports_fields') : '#', ':views' => (\Drupal::moduleHandler()->moduleExists('views')) ? \Drupal::url('help.page', array('name' => 'views')) : '#', ':views-ui' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? \Drupal::url('help.page', array('name' => 'views_ui')) : '#')) . '
    '; + $output .= '
    ' . t('There are two reports available that list the fields defined on your site. The Entities report lists all your fields, showing the field machine names, types, and the entity types or sub-types they are used on (each sub-type links to the Manage fields page). If the Views and Views UI modules are enabled, the Used in views report lists each field that is used in a view, with a link to edit that view.', array(':entity-list' => Url::fromRoute('entity.field_storage_config.collection')->toString(), ':views-list' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? Url::fromRoute('views_ui.reports_fields')->toString() : '#', ':views' => (\Drupal::moduleHandler()->moduleExists('views')) ? Url::fromRoute('help.page', array('name' => 'views'))->toString() : '#', ':views-ui' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? Url::fromRoute('help.page', array('name' => 'views_ui'))->toString() : '#')) . '
    '; $output .= '
    '; return $output; diff --git a/core/modules/field_ui/src/Tests/ManageDisplayTest.php b/core/modules/field_ui/src/Tests/ManageDisplayTest.php index 4cd2901..216701b 100644 --- a/core/modules/field_ui/src/Tests/ManageDisplayTest.php +++ b/core/modules/field_ui/src/Tests/ManageDisplayTest.php @@ -10,6 +10,7 @@ use Drupal\simpletest\WebTestBase; use Drupal\taxonomy\Entity\Vocabulary; + /** * Tests the Field UI "Manage display" and "Manage form display" screens. * @@ -403,7 +404,7 @@ function testNoFieldsDisplayOverview() { ))->save(); $this->drupalGet('admin/structure/types/manage/no_fields/display'); - $this->assertRaw(t('There are no fields yet added. You can add new fields on the Manage fields page.', array(':link' => \Drupal::url('entity.node.field_ui_fields', array('node_type' => 'no_fields'))))); + $this->assertRaw(t('There are no fields yet added. You can add new fields on the Manage fields page.', array(':link' => Url::fromRoute('entity.node.field_ui_fields', array('node_type' => 'no_fields'))->toString()))); } /** diff --git a/core/modules/file/file.module b/core/modules/file/file.module index 96bc90e..ccdb362 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -30,15 +30,15 @@ function file_help($route_name, RouteMatchInterface $route_match) { case 'help.page.file': $output = ''; $output .= '

    ' . t('About') . '

    '; - $output .= '

    ' . t('The File module allows you to create fields that contain files. See the Field module help and the Field UI help pages for general information on fields and how to create and manage them. For more information, see the online documentation for the File module.', array(':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#', ':file_documentation' => 'https://www.drupal.org/documentation/modules/file')) . '

    '; + $output .= '

    ' . t('The File module allows you to create fields that contain files. See the Field module help and the Field UI help pages for general information on fields and how to create and manage them. For more information, see the online documentation for the File module.', array(':field' => Url::fromRoute('help.page', array('name' => 'field'))->toString(), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#', ':file_documentation' => 'https://www.drupal.org/documentation/modules/file')) . '

    '; $output .= '

    ' . t('Uses') . '

    '; $output .= '
    '; $output .= '
    ' . t('Managing and displaying file fields') . '
    '; - $output .= '
    ' . t('The settings and the display of the file field can be configured separately. See the Field UI help for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '
    '; + $output .= '
    ' . t('The settings and the display of the file field can be configured separately. See the Field UI help for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#')) . '
    '; $output .= '
    ' . t('Allowing file extensions') . '
    '; $output .= '
    ' . t('In the field settings, you can define the allowed file extensions (for example pdf docx psd) for the files that will be uploaded with the file field.') . '
    '; $output .= '
    ' . t('Storing files') . '
    '; - $output .= '
    ' . t('Uploaded files can either be stored as public or private, depending on the File system settings. For more information, see the System module help page.', array(':file-system' => \Drupal::url('system.file_system_settings'), ':system-help' => \Drupal::url('help.page', array('name' => 'system')))) . '
    '; + $output .= '
    ' . t('Uploaded files can either be stored as public or private, depending on the File system settings. For more information, see the System module help page.', array(':file-system' => Url::fromRoute('system.file_system_settings')->toString(), ':system-help' => Url::fromRoute('help.page', array('name' => 'system'))->toString())) . '
    '; $output .= '
    ' . t('Restricting the maximum file size') . '
    '; $output .= '
    ' . t('The maximum file size that users can upload is limited by PHP settings of the server, but you can restrict by entering the desired value as the Maximum upload size setting. The maximum file size is automatically displayed to users in the help text of the file field.') . '
    '; $output .= '
    ' . t('Displaying files and descriptions') . '
    '; diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index f52614a..4656985 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -12,6 +12,7 @@ use Drupal\Core\Session\AccountInterface; use Drupal\Core\Template\Attribute; use Drupal\filter\FilterFormatInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -21,11 +22,11 @@ function filter_help($route_name, RouteMatchInterface $route_match) { case 'help.page.filter': $output = ''; $output .= '

    ' . t('About') . '

    '; - $output .= '

    ' . t('The Filter module allows administrators to configure text formats. Text formats change how HTML tags and other text will be processed and displayed in the site. They are used to transform text, and also help to defend your web site against potentially damaging input from malicious users. Visual text editors can be associated with text formats by using the Text Editor module. For more information, see the online documentation for the Filter module.', array(':filter_do' => 'https://www.drupal.org/documentation/modules/filter/', ':editor_help' => (\Drupal::moduleHandler()->moduleExists('editor')) ? \Drupal::url('help.page', array('name' => 'editor')) : '#')) . '

    '; + $output .= '

    ' . t('The Filter module allows administrators to configure text formats. Text formats change how HTML tags and other text will be processed and displayed in the site. They are used to transform text, and also help to defend your web site against potentially damaging input from malicious users. Visual text editors can be associated with text formats by using the Text Editor module. For more information, see the online documentation for the Filter module.', array(':filter_do' => 'https://www.drupal.org/documentation/modules/filter/', ':editor_help' => (\Drupal::moduleHandler()->moduleExists('editor')) ? Url::fromRoute('help.page', array('name' => 'editor'))->toString() : '#')) . '

    '; $output .= '

    ' . t('Uses') . '

    '; $output .= '
    '; $output .= '
    ' . t('Managing text formats') . '
    '; - $output .= '
    ' . t('You can create and edit text formats on the Text formats page (if the Text Editor module is enabled, this page is named Text formats and editors). One text format is included by default: Plain text (which removes all HTML tags). Additional text formats may be created during installation. You can create a text format by clicking "Add text format".', array(':formats' => \Drupal::url('filter.admin_overview'), ':add_format' => \Drupal::url('filter.format_add'))) . '
    '; + $output .= '
    ' . t('You can create and edit text formats on the Text formats page (if the Text Editor module is enabled, this page is named Text formats and editors). One text format is included by default: Plain text (which removes all HTML tags). Additional text formats may be created during installation. You can create a text format by clicking "Add text format".', array(':formats' => Url::fromRoute('filter.admin_overview')->toString(), ':add_format' => Url::fromRoute('filter.format_add')->toString())) . '
    '; $output .= '
    ' . t('Assigning roles to text formats') . '
    '; $output .= '
    ' . t('You can define which users will be able to use each text format by selecting roles. To ensure security, anonymous and untrusted users should only have access to text formats that restrict them to either plain text or a safe set of HTML tags. This is because HTML tags can allow embedding malicious links or scripts in text. More trusted registered users may be granted permission to use less restrictive text formats in order to create rich text. Improper text format configuration is a security risk.') . '
    '; $output .= '
    ' . t('Selecting filters') . '
    '; @@ -39,7 +40,7 @@ function filter_help($route_name, RouteMatchInterface $route_match) { return $output; case 'filter.admin_overview': - $output = '

    ' . t('Text formats define how text is filtered for output and how HTML tags and other text is displayed, replaced, or removed. Improper text format configuration is a security risk. Learn more on the Filter module help page.', array(':filter_help' => \Drupal::url('help.page', array('name' => 'filter')))) . '

    '; + $output = '

    ' . t('Text formats define how text is filtered for output and how HTML tags and other text is displayed, replaced, or removed. Improper text format configuration is a security risk. Learn more on the Filter module help page.', array(':filter_help' => Url::fromRoute('help.page', array('name' => 'filter'))->toString())) . '

    '; $output .= '

    ' . t('Text formats are presented on content editing pages in the order defined on this page. The first format available to a user will be selected by default.') . '

    '; return $output; diff --git a/core/modules/filter/src/Tests/FilterAdminTest.php b/core/modules/filter/src/Tests/FilterAdminTest.php index 8d28465..cc0d247 100644 --- a/core/modules/filter/src/Tests/FilterAdminTest.php +++ b/core/modules/filter/src/Tests/FilterAdminTest.php @@ -9,6 +9,7 @@ use Drupal\node\Entity\NodeType; use Drupal\simpletest\WebTestBase; use Drupal\user\RoleInterface; +use Drupal\Core\Url; /** * Thoroughly test the administrative interface of the filter module. @@ -140,7 +141,7 @@ function testFormatAdmin() { // exists. // @todo: See https://www.drupal.org/node/2031223 for the above. $edit_link = $this->xpath('//a[@href=:href]', array( - ':href' => \Drupal::url('entity.filter_format.edit_form', ['filter_format' => $format_id]) + ':href' => Url::fromRoute('entity.filter_format.edit_form', ['filter_format' => $format_id])->toString() )); $this->assertTrue($edit_link, format_string('Link href %href found.', array('%href' => 'admin/config/content/formats/manage/' . $format_id) diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index 3306887..f85ad20 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -23,7 +23,7 @@ function forum_help($route_name, RouteMatchInterface $route_match) { $output = ''; $output .= '

    ' . t('About') . '

    '; $output .= '

    ' . t('The Forum module lets you create threaded discussion forums with functionality similar to other message board systems. In a forum, users post topics and threads in nested hierarchies, allowing discussions to be categorized and grouped.') . '

    '; - $output .= '

    ' . t('The Forum module adds and uses a content type called Forum topic. For background information on content types, see the Node module help page.', array(':node_help' => \Drupal::url('help.page', array('name' => 'node')))) . '

    '; + $output .= '

    ' . t('The Forum module adds and uses a content type called Forum topic. For background information on content types, see the Node module help page.', array(':node_help' => Url::fromRoute('help.page', array('name' => 'node'))->toString())) . '

    '; $output .= '

    ' . t('A forum is represented by a hierarchical structure, consisting of:'); $output .= '

      '; $output .= '
    • ' . t('Forums (for example, Recipes for cooking vegetables)') . '
      • '; @@ -36,11 +36,11 @@ function forum_help($route_name, RouteMatchInterface $route_match) { $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Setting up the forum structure') . '
      '; - $output .= '
      ' . t('Visit the Forums page to set up containers and forums to hold your discussion topics.', array(':forums' => \Drupal::url('forum.overview'))) . '
      '; + $output .= '
      ' . t('Visit the Forums page to set up containers and forums to hold your discussion topics.', array(':forums' => Url::fromRoute('forum.overview')->toString())) . '
      '; $output .= '
      ' . t('Starting a discussion') . '
      '; - $output .= '
      ' . t('The Forum topic link on the Add content page creates the first post of a new threaded discussion, or thread.', array(':create-topic' => \Drupal::url('node.add', array('node_type' => 'forum')), ':content-add' => \Drupal::url('node.add_page'))) . '
      '; + $output .= '
      ' . t('The Forum topic link on the Add content page creates the first post of a new threaded discussion, or thread.', array(':create-topic' => Url::fromRoute('node.add', array('node_type' => 'forum'))->toString(), ':content-add' => Url::fromRoute('node.add_page')->toString())) . '
      '; $output .= '
      ' . t('Navigating in the forum') . '
      '; - $output .= '
      ' . t('Enabling the Forum module provides a default Forums menu item in the Tools menu that links to the Forums page.', array(':forums' => \Drupal::url('forum.index'))) . '
      '; + $output .= '
      ' . t('Enabling the Forum module provides a default Forums menu item in the Tools menu that links to the Forums page.', array(':forums' => Url::fromRoute('forum.index')->toString())) . '
      '; $output .= '
      ' . t('Moving forum topics') . '
      '; $output .= '
      ' . t('A forum topic (and all of its comments) may be moved between forums by selecting a different forum while editing a forum topic. When moving a forum topic between forums, the Leave shadow copy option creates a link in the original forum pointing to the new location.') . '
      '; $output .= '
      ' . t('Locking and disabling comments') . '
      '; @@ -75,7 +75,7 @@ function forum_help($route_name, RouteMatchInterface $route_match) { return '

      ' . t('A forum holds related forum topics.') . '

      '; case 'forum.settings': - return '

      ' . t('Adjust the display of your forum topics. Organize the forums on the forum structure page.', array(':forum-structure' => \Drupal::url('forum.overview'))) . '

      '; + return '

      ' . t('Adjust the display of your forum topics. Organize the forums on the forum structure page.', array(':forum-structure' => Url::fromRoute('forum.overview')->toString())) . '

      '; } } @@ -474,7 +474,7 @@ function template_preprocess_forums(&$variables) { ->getNewCommentPageNumber($topic->comment_count, $topic->new_replies, $topic, 'comment_forum'); $query = $page_number ? array('page' => $page_number) : NULL; $variables['topics'][$id]->new_text = \Drupal::translation()->formatPlural($topic->new_replies, '1 new post', '@count new posts', array('%title' => $variables['topics'][$id]->label())); - $variables['topics'][$id]->new_url = \Drupal::url('entity.node.canonical', ['node' => $topic->id()], ['query' => $query, 'fragment' => 'new']); + $variables['topics'][$id]->new_url = Url::fromRoute('entity.node.canonical', ['node' => $topic->id()], ['query' => $query, 'fragment' => 'new'])->toString(); } // Build table rows from topics. @@ -561,7 +561,7 @@ function template_preprocess_forum_list(&$variables) { $variables['forums'][$id]->new_topics = \Drupal::service('forum_manager')->unreadTopics($forum->id(), $user->id()); if ($variables['forums'][$id]->new_topics) { $variables['forums'][$id]->new_text = \Drupal::translation()->formatPlural($variables['forums'][$id]->new_topics, '1 new post', '@count new posts', array('%title' => $variables['forums'][$id]->label())); - $variables['forums'][$id]->new_url = \Drupal::url('forum.page', ['taxonomy_term' => $forum->id()], ['fragment' => 'new']); + $variables['forums'][$id]->new_url = Url::fromRoute('forum.page', ['taxonomy_term' => $forum->id()], ['fragment' => 'new'])->toString(); $variables['forums'][$id]->icon_class = 'new'; $variables['forums'][$id]->icon_title = t('New posts'); } diff --git a/core/modules/help/help.api.php b/core/modules/help/help.api.php index aff491c..230b3ed 100644 --- a/core/modules/help/help.api.php +++ b/core/modules/help/help.api.php @@ -5,6 +5,8 @@ * Hooks for the Help system. */ +use Drupal\Core\Url; + /** * @addtogroup hooks * @{ @@ -48,7 +50,7 @@ function hook_help($route_name, \Drupal\Core\Routing\RouteMatchInterface $route_ switch ($route_name) { // Main module help for the block module. case 'help.page.block': - return '

      ' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Bartik, for example, implements the regions "Sidebar first", "Sidebar second", "Featured", "Content", "Header", "Footer", etc., and a block may appear in any one of these areas. The blocks administration page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array(':blocks' => \Drupal::url('block.admin_display'))) . '

      '; + return '

      ' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Bartik, for example, implements the regions "Sidebar first", "Sidebar second", "Featured", "Content", "Header", "Footer", etc., and a block may appear in any one of these areas. The blocks administration page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array(':blocks' => Url::fromRoute('block.admin_display')->toString())) . '

      '; // Help for another path in the block module. case 'block.admin_display': diff --git a/core/modules/help/help.module b/core/modules/help/help.module index c41cd98..72ad74f 100644 --- a/core/modules/help/help.module +++ b/core/modules/help/help.module @@ -7,6 +7,7 @@ use Drupal\Core\Block\BlockPluginInterface; use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -17,12 +18,12 @@ function help_help($route_name, RouteMatchInterface $route_match) { $output = '

      ' . t('Getting Started') . '

      '; $output .= '

      ' . t('Follow these steps to set up and start using your website:') . '

      '; $output .= '
        '; - $output .= '
      1. ' . t('Configure your website Once logged in, visit the Administration page, where you may customize and configure all aspects of your website.', array(':admin' => \Drupal::url('system.admin'), ':config' => \Drupal::url('system.admin_config'))) . '
        2. '; - $output .= '
      2. ' . t('Enable additional functionality Next, visit the Extend page and enable modules that suit your specific needs. You can find additional modules at the Drupal.org modules page.', array(':modules' => \Drupal::url('system.modules_list'), ':download_modules' => 'https://www.drupal.org/project/modules')) . '
        3. '; - $output .= '
      3. ' . t('Customize your website design To change the "look and feel" of your website, visit the Appearance page. You may choose from one of the included themes or download additional themes from the Drupal.org themes page.', array(':themes' => \Drupal::url('system.themes_page'), ':download_themes' => 'https://www.drupal.org/project/themes')) . '
        4. '; + $output .= '
      4. ' . t('Configure your website Once logged in, visit the Administration page, where you may customize and configure all aspects of your website.', array(':admin' => Url::fromRoute('system.admin')->toString(), ':config' => Url::fromRoute('system.admin_config')->toString())) . '
        5. '; + $output .= '
      5. ' . t('Enable additional functionality Next, visit the Extend page and enable modules that suit your specific needs. You can find additional modules at the Drupal.org modules page.', array(':modules' => Url::fromRoute('system.modules_list')->toString(), ':download_modules' => 'https://www.drupal.org/project/modules')) . '
        6. '; + $output .= '
      6. ' . t('Customize your website design To change the "look and feel" of your website, visit the Appearance page. You may choose from one of the included themes or download additional themes from the Drupal.org themes page.', array(':themes' => Url::fromRoute('system.themes_page')->toString(), ':download_themes' => 'https://www.drupal.org/project/themes')) . '
        7. '; // Display a link to the create content page if Node module is enabled. if (\Drupal::moduleHandler()->moduleExists('node')) { - $output .= '
      7. ' . t('Start posting content Finally, you may add new content to your website.', array(':content' => \Drupal::url('node.add_page'))) . '
        8. '; + $output .= '
      8. ' . t('Start posting content Finally, you may add new content to your website.', array(':content' => Url::fromRoute('node.add_page')->toString())) . '
        9. '; } $output .= '
      '; $output .= '

      ' . t('For more information, refer to the help listed on this page or to the online documentation and support pages at drupal.org.', array(':docs' => 'https://www.drupal.org/documentation', ':support' => 'https://www.drupal.org/support', ':drupal' => 'https://www.drupal.org')) . '

      '; @@ -31,13 +32,13 @@ function help_help($route_name, RouteMatchInterface $route_match) { case 'help.page.help': $output = ''; $output .= '

      ' . t('About') . '

      '; - $output .= '

      ' . t('The Help module generates Help reference pages to guide you through the use and configuration of modules, and provides a Help block with page-level help. The reference pages are a starting point for Drupal.org online documentation pages that contain more extensive and up-to-date information, are annotated with user-contributed comments, and serve as the definitive reference point for all Drupal documentation. For more information, see the online documentation for the Help module.', array(':help' => 'https://www.drupal.org/documentation/modules/help/', ':handbook' => 'https://www.drupal.org/documentation', ':help-page' => \Drupal::url('help.main'))) . '

      '; + $output .= '

      ' . t('The Help module generates Help reference pages to guide you through the use and configuration of modules, and provides a Help block with page-level help. The reference pages are a starting point for Drupal.org online documentation pages that contain more extensive and up-to-date information, are annotated with user-contributed comments, and serve as the definitive reference point for all Drupal documentation. For more information, see the online documentation for the Help module.', array(':help' => 'https://www.drupal.org/documentation/modules/help/', ':handbook' => 'https://www.drupal.org/documentation', ':help-page' => Url::fromRoute('help.main')->toString())) . '

      '; $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Providing a help reference') . '
      '; - $output .= '
      ' . t('The Help module displays explanations for using each module listed on the main Help reference page.', array(':help' => \Drupal::url('help.main'))) . '
      '; + $output .= '
      ' . t('The Help module displays explanations for using each module listed on the main Help reference page.', array(':help' => Url::fromRoute('help.main')->toString())) . '
      '; $output .= '
      ' . t('Providing page-specific help') . '
      '; - $output .= '
      ' . t('Page-specific help text provided by modules is displayed in the Help block. This block can be placed and configured on the Block layout page.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '
      '; + $output .= '
      ' . t('Page-specific help text provided by modules is displayed in the Help block. This block can be placed and configured on the Block layout page.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? Url::fromRoute('block.admin_display')->toString() : '#')) . '
      '; $output .= '
      '; return ['#markup' => $output]; } diff --git a/core/modules/history/history.module b/core/modules/history/history.module index 7792591..6f26b46 100644 --- a/core/modules/history/history.module +++ b/core/modules/history/history.module @@ -12,6 +12,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\Display\EntityViewDisplayInterface; use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Entities changed before this time are always shown as read. @@ -28,7 +29,7 @@ function history_help($route_name, RouteMatchInterface $route_match) { switch ($route_name) { case 'help.page.history': $output = '

      ' . t('About') . '

      '; - $output .= '

      ' . t('The History module keeps track of which content a user has read. It marks content as new or updated depending on the last time the user viewed it. History records that are older than one month are removed during cron, which means that content older than one month is always considered read. The History module does not have a user interface but it provides a filter to Views to show new or updated content. For more information, see the online documentation for the History module.', array(':views-help' => (\Drupal::moduleHandler()->moduleExists('views')) ? \Drupal::url('help.page', array ('name' => 'views')) : '#', ':url' => 'https://www.drupal.org/documentation/modules/history')) . '

      '; + $output .= '

      ' . t('The History module keeps track of which content a user has read. It marks content as new or updated depending on the last time the user viewed it. History records that are older than one month are removed during cron, which means that content older than one month is always considered read. The History module does not have a user interface but it provides a filter to Views to show new or updated content. For more information, see the online documentation for the History module.', array(':views-help' => (\Drupal::moduleHandler()->moduleExists('views')) ? Url::fromRoute('help.page', array ('name' => 'views'))->toString() : '#', ':url' => 'https://www.drupal.org/documentation/modules/history')) . '

      '; return $output; } } diff --git a/core/modules/history/src/Tests/HistoryTest.php b/core/modules/history/src/Tests/HistoryTest.php index 17bba34..e1efe0d 100644 --- a/core/modules/history/src/Tests/HistoryTest.php +++ b/core/modules/history/src/Tests/HistoryTest.php @@ -4,6 +4,7 @@ use Drupal\Component\Serialization\Json; use Drupal\simpletest\WebTestBase; +use Drupal\Core\Url; /** * Tests the History endpoints. @@ -70,7 +71,7 @@ protected function getNodeReadTimestamps(array $node_ids) { // Perform HTTP request. return $this->curlExec(array( - CURLOPT_URL => \Drupal::url('history.get_last_node_view', array(), array('absolute' => TRUE)), + CURLOPT_URL => Url::fromRoute('history.get_last_node_view', array(), array('absolute' => TRUE))->toString(), CURLOPT_POST => TRUE, CURLOPT_POSTFIELDS => $post, CURLOPT_HTTPHEADER => array( @@ -91,7 +92,7 @@ protected function getNodeReadTimestamps(array $node_ids) { */ protected function markNodeAsRead($node_id) { return $this->curlExec(array( - CURLOPT_URL => \Drupal::url('history.read_node', array('node' => $node_id), array('absolute' => TRUE)), + CURLOPT_URL => Url::fromRoute('history.read_node', array('node' => $node_id), array('absolute' => TRUE))->toString(), CURLOPT_HTTPHEADER => array( 'Accept: application/json', ), diff --git a/core/modules/image/image.module b/core/modules/image/image.module index 7f8314a..70bea8f 100644 --- a/core/modules/image/image.module +++ b/core/modules/image/image.module @@ -11,6 +11,7 @@ use Drupal\field\FieldStorageConfigInterface; use Drupal\field\FieldConfigInterface; use Drupal\image\Entity\ImageStyle; +use Drupal\Core\Url; /** * Image style constant for user presets in the database. @@ -61,20 +62,20 @@ function image_help($route_name, RouteMatchInterface $route_match) { switch ($route_name) { case 'help.page.image': - $field_ui_url = \Drupal::moduleHandler()->moduleExists('field_ui') ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#'; + $field_ui_url = \Drupal::moduleHandler()->moduleExists('field_ui') ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#'; $output = ''; $output .= '

      ' . t('About') . '

      '; - $output .= '

      ' . t('The Image module allows you to create fields that contain image files and to configure Image styles that can be used to manipulate the display of images. See the Field module help and the Field UI help pages for terminology and general information on entities, fields, and how to create and manage fields. For more information, see the online documentation for the Image module.', array(':image_styles' => \Drupal::url('entity.image_style.collection'), ':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => $field_ui_url, ':image_documentation' => 'https://www.drupal.org/documentation/modules/image')) . '

      '; + $output .= '

      ' . t('The Image module allows you to create fields that contain image files and to configure Image styles that can be used to manipulate the display of images. See the Field module help and the Field UI help pages for terminology and general information on entities, fields, and how to create and manage fields. For more information, see the online documentation for the Image module.', array(':image_styles' => Url::fromRoute('entity.image_style.collection')->toString(), ':field' => Url::fromRoute('help.page', array('name' => 'field'))->toString(), ':field_ui' => $field_ui_url, ':image_documentation' => 'https://www.drupal.org/documentation/modules/image')) . '

      '; $output .= '

      ' . t('Uses') . '

      '; $output .= '
      ' . t('Defining image styles') . '
      '; - $output .= '
      ' . t('The concept of image styles is that you can upload a single image but display it in several ways; each display variation, or image style, is the result of applying one or more effects to the original image. As an example, you might upload a high-resolution image with a 4:3 aspect ratio, and display it scaled down, square cropped, or black-and-white (or any combination of these effects). The Image module provides a way to do this efficiently: you configure an image style with the desired effects on the Image styles page, and the first time a particular image is requested in that style, the effects are applied. The resulting image is saved, and the next time that same style is requested, the saved image is retrieved without the need to recalculate the effects. Drupal core provides several effects that you can use to define styles; others may be provided by contributed modules.', array(':image' => \Drupal::url('entity.image_style.collection'))); + $output .= '
      ' . t('The concept of image styles is that you can upload a single image but display it in several ways; each display variation, or image style, is the result of applying one or more effects to the original image. As an example, you might upload a high-resolution image with a 4:3 aspect ratio, and display it scaled down, square cropped, or black-and-white (or any combination of these effects). The Image module provides a way to do this efficiently: you configure an image style with the desired effects on the Image styles page, and the first time a particular image is requested in that style, the effects are applied. The resulting image is saved, and the next time that same style is requested, the saved image is retrieved without the need to recalculate the effects. Drupal core provides several effects that you can use to define styles; others may be provided by contributed modules.', array(':image' => Url::fromRoute('entity.image_style.collection')->toString())); $output .= '
      ' . t('Naming image styles') . '
      '; $output .= '
      ' . t('When you define an image style, you will need to choose a displayed name and a machine name. The displayed name is shown in administrative pages, and the machine name is used to generate the URL for accessing an image processed in that style. There are two common approaches to naming image styles: either based on the effects being applied (for example, Square 85x85), or based on where you plan to use it (for example, Profile picture).') . '
      '; $output .= '
      ' . t('Configuring image fields') . '
      '; $output .= '
      ' . t('A few of the settings for image fields are defined once when you create the field and cannot be changed later; these include the choice of public or private file storage and the number of images that can be stored in the field. The rest of the settings can be edited later; these settings include the field label, help text, allowed file extensions, image resolution restrictions, and the subdirectory in the public or private file storage where the images will be stored. The editable settings can also have different values for different entity sub-types; for instance, if your image field is used on both Page and Article content types, you can store the files in a different subdirectory for the two content types.') . '
      '; $output .= '
      ' . t('For accessibility and search engine optimization, all images that convey meaning on web sites should have alternate text. Drupal also allows entry of title text for images, but it can lead to confusion for screen reader users and its use is not recommended. Image fields can be configured so that alternate and title text fields are enabled or disabled; if enabled, the fields can be set to be required. The recommended setting is to enable and require alternate text and disable title text.') . '
      '; - $output .= '
      ' . t('When you create an image field, you will need to choose whether the uploaded images will be stored in the public or private file directory defined in your settings.php file and shown on the File system page. This choice cannot be changed later. You can also configure your field to store files in a subdirectory of the public or private directory; this setting can be changed later and can be different for each entity sub-type using the field. For more information on file storage, see the System module help page.', array(':file-system' => \Drupal::url('system.file_system_settings'), ':system-help' => \Drupal::url('help.page', array('name' => 'system')))) . '
      '; + $output .= '
      ' . t('When you create an image field, you will need to choose whether the uploaded images will be stored in the public or private file directory defined in your settings.php file and shown on the File system page. This choice cannot be changed later. You can also configure your field to store files in a subdirectory of the public or private directory; this setting can be changed later and can be different for each entity sub-type using the field. For more information on file storage, see the System module help page.', array(':file-system' => Url::fromRoute('system.file_system_settings')->toString(), ':system-help' => Url::fromRoute('help.page', array('name' => 'system'))->toString())) . '
      '; $output .= '
      ' . t('The maximum file size that can be uploaded is limited by PHP settings of the server, but you can restrict it further by configuring a Maximum upload size in the field settings (this setting can be changed later). The maximum file size, either from PHP server settings or field configuration, is automatically displayed to users in the help text of the image field.') . '
      '; $output .= '
      ' . t('You can also configure a minimum and/or maximum resolution for uploaded images. Images that are too small will be rejected. Images that are to large will be resized. During the resizing the EXIF data in the image will be lost.') . '
      '; $output .= '
      ' . t('You can also configure a default image that will be used if no image is uploaded in an image field. This default can be defined for all instances of the field in the field storage settings when you create a field, and the setting can be overridden for each entity sub-type that uses the field.') . '
      '; diff --git a/core/modules/image/src/Tests/ImageAdminStylesTest.php b/core/modules/image/src/Tests/ImageAdminStylesTest.php index 4b7ff43..450b714 100644 --- a/core/modules/image/src/Tests/ImageAdminStylesTest.php +++ b/core/modules/image/src/Tests/ImageAdminStylesTest.php @@ -8,6 +8,7 @@ use Drupal\image\ImageStyleInterface; use Drupal\node\Entity\Node; use Drupal\file\Entity\File; +use Drupal\Core\Url; /** * Tests creation, deletion, and editing of image styles and effects. @@ -281,7 +282,7 @@ function testStyle() { // Confirm that the empty text is correct on the image styles page. $this->drupalGet($admin_path); $this->assertRaw(t('There are currently no styles. Add a new one.', [ - ':url' => \Drupal::url('image.style_add'), + ':url' => Url::fromRoute('image.style_add')->toString(), ])); } diff --git a/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/core/modules/image/src/Tests/ImageFieldDisplayTest.php index 666a791..14412a9 100644 --- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php +++ b/core/modules/image/src/Tests/ImageFieldDisplayTest.php @@ -6,6 +6,7 @@ use Drupal\field\Entity\FieldStorageConfig; use Drupal\user\RoleInterface; use Drupal\image\Entity\ImageStyle; +use Drupal\Core\Url; /** * Tests the display of image fields. @@ -55,7 +56,7 @@ function _testImageFieldFormatters($scheme) { // Test for existence of link to image styles configuration. $this->drupalPostAjaxForm(NULL, array(), "{$field_name}_settings_edit"); - $this->assertLinkByHref(\Drupal::url('entity.image_style.collection'), 0, 'Link to image styles configuration is found'); + $this->assertLinkByHref(Url::fromRoute('entity.image_style.collection')->toString(), 0, 'Link to image styles configuration is found'); // Remove 'administer image styles' permission from testing admin user. $admin_user_roles = $this->adminUser->getRoles(TRUE); @@ -66,7 +67,7 @@ function _testImageFieldFormatters($scheme) { // Test for absence of link to image styles configuration. $this->drupalPostAjaxForm(NULL, array(), "{$field_name}_settings_edit"); - $this->assertNoLinkByHref(\Drupal::url('entity.image_style.collection'), 'Link to image styles configuration is absent when permissions are insufficient'); + $this->assertNoLinkByHref(Url::fromRoute('entity.image_style.collection')->toString(), 'Link to image styles configuration is absent when permissions are insufficient'); // Restore 'administer image styles' permission to testing admin user user_role_change_permissions(reset($admin_user_roles), array('administer image styles' => TRUE)); diff --git a/core/modules/language/language.module b/core/modules/language/language.module index b4612f4..25d546d 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -5,6 +5,7 @@ * Add language handling functionality to Drupal. */ +use Drupal\Core\Url; use Drupal\Core\Access\AccessResult; use Drupal\Core\Entity\ContentEntityFormInterface; use Drupal\Core\Entity\EntityFormInterface; @@ -29,42 +30,42 @@ function language_help($route_name, RouteMatchInterface $route_match) { case 'help.page.language': $output = ''; $output .= '

      ' . t('About') . '

      '; - $output .= '

      ' . t('The Language module allows you to configure the languages used on your site, and provides information for the Content Translation, Interface Translation, and Configuration Translation modules, if they are enabled. For more information, see the online documentation for the Language module.', array(':doc_url' => 'https://www.drupal.org/documentation/modules/language', ':content' => (\Drupal::moduleHandler()->moduleExists('content_translation')) ? \Drupal::url('help.page', array('name' => 'content_translation')) : '#', ':interface' => (\Drupal::moduleHandler()->moduleExists('locale')) ? \Drupal::url('help.page', array('name' => 'locale')) : '#', ':configuration' => (\Drupal::moduleHandler()->moduleExists('config_translation')) ? \Drupal::url('help.page', array('name' => 'config_translation')) : '#')) . '

      '; + $output .= '

      ' . t('The Language module allows you to configure the languages used on your site, and provides information for the Content Translation, Interface Translation, and Configuration Translation modules, if they are enabled. For more information, see the online documentation for the Language module.', array(':doc_url' => 'https://www.drupal.org/documentation/modules/language', ':content' => (\Drupal::moduleHandler()->moduleExists('content_translation')) ? Url::fromRoute('help.page', array('name' => 'content_translation'))->toString() : '#', ':interface' => (\Drupal::moduleHandler()->moduleExists('locale')) ? Url::fromRoute('help.page', array('name' => 'locale'))->toString() : '#', ':configuration' => (\Drupal::moduleHandler()->moduleExists('config_translation')) ? Url::fromRoute('help.page', array('name' => 'config_translation'))->toString() : '#')) . '

      '; $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Adding languages') . '
      '; - $output .= '
      ' . t('You can add languages on the Languages page by selecting Add language and choosing a language from the drop-down menu. This language is then displayed in the languages list, where it can be configured further. If the Interface translation module is enabled, and the translation server is set as a translation source, then the interface translation for this language is automatically downloaded as well.', array(':language_list' => \Drupal::url('entity.configurable_language.collection'), ':interface' => (\Drupal::moduleHandler()->moduleExists('locale')) ? \Drupal::url('help.page', array('name' => 'locale')) : '#')) . '
      '; + $output .= '
      ' . t('You can add languages on the Languages page by selecting Add language and choosing a language from the drop-down menu. This language is then displayed in the languages list, where it can be configured further. If the Interface translation module is enabled, and the translation server is set as a translation source, then the interface translation for this language is automatically downloaded as well.', array(':language_list' => Url::fromRoute('entity.configurable_language.collection')->toString(), ':interface' => (\Drupal::moduleHandler()->moduleExists('locale')) ? Url::fromRoute('help.page', array('name' => 'locale'))->toString() : '#')) . '
      '; $output .= '
      ' . t('Adding custom languages') . '
      '; $output .= '
      ' . t('You can add a language that is not provided in the drop-down list by choosing Custom language at the end of the list. You then have to configure its language code, name, and direction in the form provided.') . '
      '; $output .= '
      ' . t('Configuring content languages') . '
      '; - $output .= '
      ' . t('By default, content is created in the site\'s default language and no language selector is displayed on content creation pages. On the Content language page you can customize the language configuration for any supported content entity on your site (for example for content types or menu links). After choosing an entity, you are provided with a drop-down menu to set the default language and a check-box to display language selectors.', array(':content_language' => \Drupal::url('language.content_settings_page'))) . '
      '; + $output .= '
      ' . t('By default, content is created in the site\'s default language and no language selector is displayed on content creation pages. On the Content language page you can customize the language configuration for any supported content entity on your site (for example for content types or menu links). After choosing an entity, you are provided with a drop-down menu to set the default language and a check-box to display language selectors.', array(':content_language' => Url::fromRoute('language.content_settings_page')->toString())) . '
      '; $output .= '
      ' . t('Adding a language switcher block') . '
      '; - $output .= '
      ' . t('If the Block module is enabled, then you can add a language switcher block on the Block layout page to allow users to switch between languages.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '
      '; + $output .= '
      ' . t('If the Block module is enabled, then you can add a language switcher block on the Block layout page to allow users to switch between languages.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? Url::fromRoute('block.admin_display')->toString() : '#')) . '
      '; $output .= '
      ' . t('Making a block visible per language') . '
      '; - $output .= '
      ' . t('If the Block module is enabled, then the Language module allows you to set the visibility of a block based on selected languages on the Block layout page.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '
      '; + $output .= '
      ' . t('If the Block module is enabled, then the Language module allows you to set the visibility of a block based on selected languages on the Block layout page.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? Url::fromRoute('block.admin_display')->toString() : '#')) . '
      '; $output .= '
      ' . t('Choosing user languages') . '
      '; $output .= '
      ' . t('Users can choose a Site language on their profile page. This language is used for email messages, and can be used by modules to determine a user\'s language. It can also be used for interface text, if the User method is enabled as a Detection and selection method (see below). Administrative users can choose a separate Administration pages language for the interface text on administration pages. This configuration is only available on the user\'s profile page if the Account administration pages method is enabled (see below).') . '
      '; $output .= '
      ' . t('Language detection and selection') . '
      '; - $output .= '
      ' . t('The Detection and selection page provides several methods for deciding which language is used for displaying interface text. When a method detects and selects an interface language, then the following methods in the list are not applied. You can order them by importance, with your preferred method at the top of the list, followed by one or several fall-back methods.', array(':detection' => \Drupal::url('language.negotiation'))); + $output .= '
      ' . t('The Detection and selection page provides several methods for deciding which language is used for displaying interface text. When a method detects and selects an interface language, then the following methods in the list are not applied. You can order them by importance, with your preferred method at the top of the list, followed by one or several fall-back methods.', array(':detection' => Url::fromRoute('language.negotiation')->toString())); $output .= '
      • ' . t('URL sets the interface language based on a path prefix or domain (for example specifying de for German would result in URLs like example.com/de/contact). The default language does not require a path prefix, but can have one assigned as well. If the language detection is done by domain name, a domain needs to be specified for each language.') . '
        • '; $output .= '
      • ' . t('Session determines the interface language from a request or session parameter (for example example.com?language=de would set the interface language to German based on the use of de as the language parameter).') . '
        • '; $output .= '
      • ' . t('User follows the language configuration set on the user\'s profile page.') . '
        • '; - $output .= '
      • ' . t('Browser sets the interface language based on the browser\'s language settings. Since browsers use different language codes to refer to the same languages, you can add and edit languages codes to map the browser language codes to the language codes used on your site.', array(':language_list' => \Drupal::url('entity.configurable_language.collection'))) . '
        • '; + $output .= '
      • ' . t('Browser sets the interface language based on the browser\'s language settings. Since browsers use different language codes to refer to the same languages, you can add and edit languages codes to map the browser language codes to the language codes used on your site.', array(':language_list' => Url::fromRoute('entity.configurable_language.collection')->toString())) . '
        • '; $output .= '
      • ' . t('Account administration pages follows the configuration set as Administration pages language on the profile page of an administrative user. This method is similar to the User method, but only sets the interface text language on administration pages, independent of the interface text language on other pages.') . '
        • '; $output .= '
      • ' . t('Selected language allows you to specify the site\'s default language or a specific language as the fall-back language. This method should be listed last.') . '
      '; $output .= '
      '; return $output; case 'entity.configurable_language.collection': - $output = '

      ' . t('Reorder the configured languages to set their order in the language switcher block and, when editing content, in the list of selectable languages. This ordering does not impact detection and selection.', array(':detection' => \Drupal::url('language.negotiation'))) . '

      '; - $output .= '

      ' . t('The site default language can also be set. It is not recommended to change the default language on a working site. Configure the Selected language setting on the detection and selection page to change the fallback language for language selection.', array(':language-detection' => \Drupal::url('language.negotiation'))) . '

      '; + $output = '

      ' . t('Reorder the configured languages to set their order in the language switcher block and, when editing content, in the list of selectable languages. This ordering does not impact detection and selection.', array(':detection' => Url::fromRoute('language.negotiation')->toString())) . '

      '; + $output .= '

      ' . t('The site default language can also be set. It is not recommended to change the default language on a working site. Configure the Selected language setting on the detection and selection page to change the fallback language for language selection.', array(':language-detection' => Url::fromRoute('language.negotiation')->toString())) . '

      '; return $output; case 'language.add': return '

      ' . t('Add a language to be supported by your site. If your desired language is not available, pick Custom language... at the end and provide a language code and other details manually.') . '

      '; case 'language.negotiation': - $output = '

      ' . t('Define how to decide which language is used to display page elements (primarily text provided by modules, such as field labels and help text). This decision is made by evaluating a series of detection methods for languages; the first detection method that gets a result will determine which language is used for that type of text. Be aware that some language detection methods are unreliable under certain conditions, such as browser detection when page-caching is enabled and a user is not currently logged in. Define the order of evaluation of language detection methods on this page. The default language can be changed in the list of languages.', array(':admin-change-language' => \Drupal::url('entity.configurable_language.collection'))) . '

      '; + $output = '

      ' . t('Define how to decide which language is used to display page elements (primarily text provided by modules, such as field labels and help text). This decision is made by evaluating a series of detection methods for languages; the first detection method that gets a result will determine which language is used for that type of text. Be aware that some language detection methods are unreliable under certain conditions, such as browser detection when page-caching is enabled and a user is not currently logged in. Define the order of evaluation of language detection methods on this page. The default language can be changed in the list of languages.', array(':admin-change-language' => Url::fromRoute('entity.configurable_language.collection')->toString())) . '

      '; return $output; case 'language.negotiation_session': @@ -72,11 +73,11 @@ function language_help($route_name, RouteMatchInterface $route_match) { return $output; case 'language.negotiation_browser': - $output = '

      ' . t('Browsers use different language codes to refer to the same languages. Internally, a best effort is made to determine the correct language based on the code that the browser sends. You can add and edit additional mappings from browser language codes to site languages.', array(':configure-languages' => \Drupal::url('entity.configurable_language.collection'))) . '

      '; + $output = '

      ' . t('Browsers use different language codes to refer to the same languages. Internally, a best effort is made to determine the correct language based on the code that the browser sends. You can add and edit additional mappings from browser language codes to site languages.', array(':configure-languages' => Url::fromRoute('entity.configurable_language.collection')->toString())) . '

      '; return $output; case 'language.negotiation_selected': - $output = '

      ' . t('Changing the selected language here (and leaving this option as the last among the detection and selection options) is the easiest way to change the fallback language for the website, if you need to change how your site works by default (e.g., when using an empty path prefix or using the default domain). Changing the site\'s default language itself might have other undesired side effects.', array(':admin-change-language' => \Drupal::url('entity.configurable_language.collection'))) . '

      '; + $output = '

      ' . t('Changing the selected language here (and leaving this option as the last among the detection and selection options) is the easiest way to change the fallback language for the website, if you need to change how your site works by default (e.g., when using an empty path prefix or using the default domain). Changing the site\'s default language itself might have other undesired side effects.', array(':admin-change-language' => Url::fromRoute('entity.configurable_language.collection')->toString())) . '

      '; return $output; case 'entity.block.edit_form': diff --git a/core/modules/language/src/Element/LanguageConfiguration.php b/core/modules/language/src/Element/LanguageConfiguration.php index 0779693..7de6f5e 100644 --- a/core/modules/language/src/Element/LanguageConfiguration.php +++ b/core/modules/language/src/Element/LanguageConfiguration.php @@ -5,6 +5,7 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Render\Element\FormElement; +use Drupal\Core\Url; /** * Provides language element configuration. @@ -41,7 +42,7 @@ public static function processLanguageConfiguration(&$element, FormStateInterfac '#type' => 'select', '#title' => t('Default language'), '#options' => $options + static::getDefaultOptions(), - '#description' => t('Explanation of the language options is found on the languages list page.', array(':languages_list_page' => \Drupal::url('entity.configurable_language.collection'))), + '#description' => t('Explanation of the language options is found on the languages list page.', array(':languages_list_page' => Url::fromRoute('entity.configurable_language.collection')->toString())), '#default_value' => ($default_config != NULL) ? $default_config->getDefaultLangcode() : LanguageInterface::LANGCODE_SITE_DEFAULT, ); diff --git a/core/modules/language/src/Tests/LanguageBrowserDetectionTest.php b/core/modules/language/src/Tests/LanguageBrowserDetectionTest.php index 3991b2a..3d5d08f 100644 --- a/core/modules/language/src/Tests/LanguageBrowserDetectionTest.php +++ b/core/modules/language/src/Tests/LanguageBrowserDetectionTest.php @@ -3,6 +3,7 @@ namespace Drupal\language\Tests; use Drupal\simpletest\WebTestBase; +use Drupal\Core\Url; /** * Tests browser language detection. @@ -50,7 +51,7 @@ function testUIBrowserLanguageMappings() { $this->assertRaw(t('The mapping for the %browser browser language code has been deleted.', $t_args), 'The test browser language code has been deleted.'); // Check we went back to the browser negotiation mapping overview. - $this->assertUrl(\Drupal::url('language.negotiation_browser', [], ['absolute' => TRUE])); + $this->assertUrl(Url::fromRoute('language.negotiation_browser', [], ['absolute' => TRUE])->toString()); // Check that ch-zn no longer exists. $this->assertNoField('edit-mappings-zh-cn-browser-langcode', 'Chinese browser language code no longer exists.'); @@ -60,7 +61,7 @@ function testUIBrowserLanguageMappings() { 'new_mapping[drupal_langcode]' => 'en', ); $this->drupalPostForm('admin/config/regional/language/detection/browser', $edit, t('Save configuration')); - $this->assertUrl(\Drupal::url('language.negotiation_browser', [], ['absolute' => TRUE])); + $this->assertUrl(Url::fromRoute('language.negotiation_browser', [], ['absolute' => TRUE])->toString()); $this->assertField('edit-mappings-xx-browser-langcode', 'xx', 'Browser language code found.'); $this->assertField('edit-mappings-xx-drupal-langcode', 'en', 'Drupal language code found.'); @@ -82,7 +83,7 @@ function testUIBrowserLanguageMappings() { 'mappings[xx][drupal_langcode]' => 'zh-hans', ); $this->drupalPostForm('admin/config/regional/language/detection/browser', $edit, t('Save configuration')); - $this->assertUrl(\Drupal::url('language.negotiation_browser', [], ['absolute' => TRUE])); + $this->assertUrl(Url::fromRoute('language.negotiation_browser', [], ['absolute' => TRUE])->toString()); $this->assertField('edit-mappings-xx-browser-langcode', 'xx', 'Browser language code found.'); $this->assertField('edit-mappings-xx-drupal-langcode', 'zh-hans', 'Drupal language code found.'); } diff --git a/core/modules/language/src/Tests/LanguageConfigurationTest.php b/core/modules/language/src/Tests/LanguageConfigurationTest.php index cf049f1..b139082 100644 --- a/core/modules/language/src/Tests/LanguageConfigurationTest.php +++ b/core/modules/language/src/Tests/LanguageConfigurationTest.php @@ -5,6 +5,7 @@ use Drupal\Core\Language\LanguageInterface; use Drupal\language\Entity\ConfigurableLanguage; use Drupal\simpletest\WebTestBase; +use Drupal\Core\Url; /** * Adds and configures languages to check negotiation changes. @@ -46,7 +47,7 @@ function testLanguageConfiguration() { ); $this->drupalPostForm(NULL, $edit, 'Add language'); $this->assertText('French'); - $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.'); + $this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE])->toString(), [], 'Correct page redirection.'); // Langcode for Languages is always 'en'. $language = $this->config('language.entity.fr')->get(); $this->assertEqual($language['langcode'], 'en'); @@ -69,7 +70,7 @@ function testLanguageConfiguration() { $this->drupalPostForm(NULL, $edit, t('Save configuration')); $this->rebuildContainer(); $this->assertFieldChecked('edit-site-default-language-fr', 'Default language updated.'); - $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'langcode' => 'fr']), [], 'Correct page redirection.'); + $this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE, 'langcode' => 'fr'])->toString(), [], 'Correct page redirection.'); // Check if a valid language prefix is added after changing the default // language. diff --git a/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php b/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php index dbd35cd..7a9ce7a 100644 --- a/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php +++ b/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php @@ -2,6 +2,7 @@ namespace Drupal\language\Tests; +use Drupal\Core\Url; use Drupal\simpletest\WebTestBase; use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageInterface; @@ -39,7 +40,7 @@ public function testLanguageConfiguration() { $this->assertText(t('@name field is required.', array('@name' => t('Language name')))); $empty_language = new Language(); $this->assertFieldChecked('edit-direction-' . $empty_language->getDirection(), 'Consistent usage of language direction.'); - $this->assertUrl(\Drupal::url('language.add', array(), array('absolute' => TRUE)), [], 'Correct page redirection.'); + $this->assertUrl(Url::fromRoute('language.add', array(), array('absolute' => TRUE))->toString(), [], 'Correct page redirection.'); // Test validation of invalid values. $edit = array( @@ -56,7 +57,7 @@ public function testLanguageConfiguration() { ))); $this->assertRaw(t('%field cannot contain any markup.', array('%field' => t('Language name')))); - $this->assertUrl(\Drupal::url('language.add', array(), array('absolute' => TRUE)), [], 'Correct page redirection.'); + $this->assertUrl(Url::fromRoute('language.add', array(), array('absolute' => TRUE))->toString(), [], 'Correct page redirection.'); // Test adding a custom language with a numeric region code. $edit = array( @@ -71,7 +72,7 @@ public function testLanguageConfiguration() { 'The language %language has been created and can now be used.', array('%language' => $edit['label']) )); - $this->assertUrl(\Drupal::url('entity.configurable_language.collection', array(), array('absolute' => TRUE)), [], 'Correct page redirection.'); + $this->assertUrl(Url::fromRoute('entity.configurable_language.collection', array(), array('absolute' => TRUE))->toString(), [], 'Correct page redirection.'); // Test validation of existing language values. $edit = array( @@ -87,7 +88,7 @@ public function testLanguageConfiguration() { 'The language %language has been created and can now be used.', array('%language' => $edit['label']) )); - $this->assertUrl(\Drupal::url('entity.configurable_language.collection', array(), array('absolute' => TRUE)), [], 'Correct page redirection.'); + $this->assertUrl(Url::fromRoute('entity.configurable_language.collection', array(), array('absolute' => TRUE))->toString(), [], 'Correct page redirection.'); // Add the language a second time and confirm that this is not allowed. $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language')); @@ -95,7 +96,7 @@ public function testLanguageConfiguration() { 'The language %language (%langcode) already exists.', array('%language' => $edit['label'], '%langcode' => $edit['langcode']) )); - $this->assertUrl(\Drupal::url('language.add', array(), array('absolute' => TRUE)), [], 'Correct page redirection.'); + $this->assertUrl(Url::fromRoute('language.add', array(), array('absolute' => TRUE))->toString(), [], 'Correct page redirection.'); } } diff --git a/core/modules/language/src/Tests/LanguageListTest.php b/core/modules/language/src/Tests/LanguageListTest.php index d407530..2ddfcfa 100644 --- a/core/modules/language/src/Tests/LanguageListTest.php +++ b/core/modules/language/src/Tests/LanguageListTest.php @@ -6,6 +6,7 @@ use Drupal\simpletest\WebTestBase; use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageInterface; +use Drupal\Core\Url; /** * Adds a new language and tests changing its status and the default language. @@ -40,7 +41,7 @@ function testLanguageList() { ); $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language')); $this->assertText('French', 'Language added successfully.'); - $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE])); + $this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE])->toString()); // Get the weight of the last language and check that the weight is one unit // heavier than the last configurable language. @@ -60,7 +61,7 @@ function testLanguageList() { 'direction' => Language::DIRECTION_LTR, ); $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language')); - $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE])); + $this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE])->toString()); $this->assertRaw('"edit-languages-' . $langcode . '-weight"', 'Language code found.'); $this->assertText(t($name), 'Test language added.'); @@ -78,7 +79,7 @@ function testLanguageList() { $this->drupalPostForm(NULL, $edit, t('Save configuration')); $this->rebuildContainer(); $this->assertNoFieldChecked('edit-site-default-language-en', 'Default language updated.'); - $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $language])); + $this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $language])->toString()); // Ensure we can't delete the default language. $this->drupalGet('admin/config/regional/language/delete/' . $langcode); @@ -95,7 +96,7 @@ function testLanguageList() { ); $this->drupalPostForm('admin/config/regional/language/edit/' . $langcode, $edit, t('Save language')); $this->assertRaw($name, 'The language has been updated.'); - $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $language])); + $this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $language])->toString()); // Change back the default language. $edit = array( @@ -111,7 +112,7 @@ function testLanguageList() { $this->drupalGet('admin/config/regional/language/delete/' . $langcode); // First test the 'cancel' link. $this->clickLink(t('Cancel')); - $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $english])); + $this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $english])->toString()); $this->assertRaw($name, 'The language was not deleted.'); // Delete the language for real. This a confirm form, we do not need any // fields changed. @@ -119,7 +120,7 @@ function testLanguageList() { // We need raw here because %language and %langcode will add HTML. $t_args = array('%language' => $name, '%langcode' => $langcode); $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args), 'The test language has been removed.'); - $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $english])); + $this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $english])->toString()); // Verify that language is no longer found. $this->drupalGet('admin/config/regional/language/delete/' . $langcode); $this->assertResponse(404, 'Language no longer found.'); @@ -131,7 +132,7 @@ function testLanguageList() { // We need raw here because %language and %langcode will add HTML. $t_args = array('%language' => 'French', '%langcode' => 'fr'); $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args), 'The French language has been removed.'); - $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE])); + $this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE])->toString()); // Verify that language is no longer found. $this->drupalGet('admin/config/regional/language/delete/fr'); $this->assertResponse(404, 'Language no longer found.'); @@ -149,7 +150,7 @@ function testLanguageList() { 'direction' => Language::DIRECTION_LTR, ); $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language')); - $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE])); + $this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE])->toString()); $this->assertText($name, 'Name found.'); // Check if we can change the default language. @@ -163,7 +164,7 @@ function testLanguageList() { $this->drupalPostForm(NULL, $edit, t('Save configuration')); $this->rebuildContainer(); $this->assertNoFieldChecked('edit-site-default-language-en', 'Default language updated.'); - $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $language])); + $this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $language])->toString()); $this->drupalPostForm('admin/config/regional/language/delete/en', array(), t('Delete')); // We need raw here because %language and %langcode will add HTML. diff --git a/core/modules/language/src/Tests/LanguageLocaleListTest.php b/core/modules/language/src/Tests/LanguageLocaleListTest.php index dd3e02a..aa8b998 100644 --- a/core/modules/language/src/Tests/LanguageLocaleListTest.php +++ b/core/modules/language/src/Tests/LanguageLocaleListTest.php @@ -3,6 +3,7 @@ namespace Drupal\language\Tests; use Drupal\simpletest\WebTestBase; +use Drupal\Core\Url; /** * Adds a new language with translations and tests language list order. @@ -41,7 +42,7 @@ function testLanguageLocaleList() { ); $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language')); $this->assertText('The language French has been created and can now be used'); - $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE])); + $this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE])->toString()); $this->rebuildContainer(); // Translate Spanish language to French (Espagnol). diff --git a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php index ef2abee..f6b5c7f 100644 --- a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php +++ b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php @@ -404,7 +404,7 @@ function testUrlLanguageFallback() { // Check that the language switcher active link matches the given browser // language. - $args = array(':id' => 'block-test-language-block', ':url' => \Drupal::url('') . $langcode_browser_fallback); + $args = array(':id' => 'block-test-language-block', ':url' => Url::fromRoute('')->toString(). langcode_browser_fallback); $fields = $this->xpath('//div[@id=:id]//a[@class="language-link is-active" and starts-with(@href, :url)]', $args); $this->assertTrue($fields[0] == $languages[$langcode_browser_fallback]->getName(), 'The browser language is the URL active language'); diff --git a/core/modules/language/src/Tests/LanguageUrlRewritingTest.php b/core/modules/language/src/Tests/LanguageUrlRewritingTest.php index 5cd80dc..f3af5f8 100644 --- a/core/modules/language/src/Tests/LanguageUrlRewritingTest.php +++ b/core/modules/language/src/Tests/LanguageUrlRewritingTest.php @@ -81,7 +81,7 @@ function testUrlRewritingEdgeCases() { private function checkUrl(LanguageInterface $language, $message1, $message2) { $options = array('language' => $language, 'script' => ''); $base_path = trim(base_path(), '/'); - $rewritten_path = trim(str_replace($base_path, '', \Drupal::url('', array(), $options)), '/'); + $rewritten_path = trim(str_replace($base_path, '', Url::fromRoute('', array(), $options)->toString()), '/'); $segments = explode('/', $rewritten_path, 2); $prefix = $segments[0]; $path = isset($segments[1]) ? $segments[1] : $prefix; @@ -126,7 +126,7 @@ function testDomainNameNegotiationPort() { // In case index.php is part of the URLs, we need to adapt the asserted // URLs as well. - $index_php = strpos(\Drupal::url('', array(), array('absolute' => TRUE)), 'index.php') !== FALSE; + $index_php = strpos(Url::fromRoute('', array(), array('absolute' => TRUE))->toString(), 'index.php') !== FALSE; $request = Request::createFromGlobals(); $server = $request->server->all(); diff --git a/core/modules/link/link.module b/core/modules/link/link.module index 46aeeba..fa0c630 100644 --- a/core/modules/link/link.module +++ b/core/modules/link/link.module @@ -6,6 +6,7 @@ */ use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -15,11 +16,11 @@ function link_help($route_name, RouteMatchInterface $route_match) { case 'help.page.link': $output = ''; $output .= '

      ' . t('About') . '

      '; - $output .= '

      ' . t('The Link module allows you to create fields that contain internal or external URLs and optional link text. See the Field module help and the Field UI help pages for general information on fields and how to create and manage them. For more information, see the online documentation for the Link module.', array(':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#', ':link_documentation' => 'https://www.drupal.org/documentation/modules/link')) . '

      '; + $output .= '

      ' . t('The Link module allows you to create fields that contain internal or external URLs and optional link text. See the Field module help and the Field UI help pages for general information on fields and how to create and manage them. For more information, see the online documentation for the Link module.', array(':field' => Url::fromRoute('help.page', array('name' => 'field'))->toString(), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#', ':link_documentation' => 'https://www.drupal.org/documentation/modules/link')) . '

      '; $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Managing and displaying link fields') . '
      '; - $output .= '
      ' . t('The settings and the display of the link field can be configured separately. See the Field UI help for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '
      '; + $output .= '
      ' . t('The settings and the display of the link field can be configured separately. See the Field UI help for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#')) . '
      '; $output .= '
      ' . t('Setting the allowed link type') . '
      '; $output .= '
      ' . t('In the field settings you can define the allowed link type to be internal links only, external links only, or both internal and external links. Internal links only and both internal and external links options enable an autocomplete widget for internal links, so a user does not have to copy or remember a URL.') . '
      '; $output .= '
      ' . t('Adding link text') . '
      '; diff --git a/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php b/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php index fd670fd..bb2c0ba 100644 --- a/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php +++ b/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php @@ -9,6 +9,7 @@ use Drupal\link\LinkItemInterface; use Symfony\Component\Validator\ConstraintViolation; use Symfony\Component\Validator\ConstraintViolationListInterface; +use Drupal\Core\Url; /** * Plugin implementation of the 'link' widget. @@ -195,7 +196,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen // If the field is configured to allow only internal links, add a useful // element prefix. if (!$this->supportsExternalLinks()) { - $element['uri']['#field_prefix'] = rtrim(\Drupal::url('', array(), array('absolute' => TRUE)), '/'); + $element['uri']['#field_prefix'] = rtrim(Url::fromRoute('', array(), array('absolute' => TRUE))->toString(), '/'); } // If the field is configured to allow both internal and external links, // show a useful description. diff --git a/core/modules/locale/locale.batch.inc b/core/modules/locale/locale.batch.inc index 81ca966..2a61a2b 100644 --- a/core/modules/locale/locale.batch.inc +++ b/core/modules/locale/locale.batch.inc @@ -9,6 +9,7 @@ use Psr\Http\Message\RequestInterface; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\UriInterface; +use Drupal\Core\Url; /** * Load the common translation API. @@ -99,7 +100,7 @@ function locale_translation_batch_status_finished($success, $results) { if ($success) { if (isset($results['failed_files'])) { if (\Drupal::moduleHandler()->moduleExists('dblog') && \Drupal::currentUser()->hasPermission('access site reports')) { - $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation file could not be checked. See the log for details.', '@count translation files could not be checked. See the log for details.', array(':url' => \Drupal::url('dblog.overview'))); + $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation file could not be checked. See the log for details.', '@count translation files could not be checked. See the log for details.', array(':url' => Url::fromRoute('dblog.overview')->toString())); } else { $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation files could not be checked. See the log for details.', '@count translation files could not be checked. See the log for details.'); diff --git a/core/modules/locale/locale.bulk.inc b/core/modules/locale/locale.bulk.inc index 1181b50..aef2f04 100644 --- a/core/modules/locale/locale.bulk.inc +++ b/core/modules/locale/locale.bulk.inc @@ -9,6 +9,7 @@ use Drupal\file\FileInterface; use Drupal\locale\Gettext; use Drupal\locale\Locale; +use Drupal\Core\Url; /** * Prepare a batch to import all translations. @@ -367,7 +368,7 @@ function locale_translate_batch_finished($success, array $results) { $additions = $updates = $deletes = $skips = $config = 0; if (isset($results['failed_files'])) { if (\Drupal::moduleHandler()->moduleExists('dblog') && \Drupal::currentUser()->hasPermission('access site reports')) { - $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation file could not be imported. See the log for details.', '@count translation files could not be imported. See the log for details.', array(':url' => \Drupal::url('dblog.overview'))); + $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation file could not be imported. See the log for details.', '@count translation files could not be imported. See the log for details.', array(':url' => Url::fromRoute('dblog.overview')->toString())); } else { $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation file could not be imported. See the log for details.', '@count translation files could not be imported. See the log for details.'); @@ -398,7 +399,7 @@ function locale_translate_batch_finished($success, array $results) { if ($skips) { if (\Drupal::moduleHandler()->moduleExists('dblog') && \Drupal::currentUser()->hasPermission('access site reports')) { - $message = \Drupal::translation()->formatPlural($skips, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', array(':url' => \Drupal::url('dblog.overview'))); + $message = \Drupal::translation()->formatPlural($skips, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', array(':url' => Url::fromRoute('dblog.overview')->toString())); } else { $message = \Drupal::translation()->formatPlural($skips, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.'); diff --git a/core/modules/locale/locale.install b/core/modules/locale/locale.install index 0755104..2fdff98 100644 --- a/core/modules/locale/locale.install +++ b/core/modules/locale/locale.install @@ -262,7 +262,7 @@ function locale_requirements($phase) { 'title' => 'Translation update status', 'value' => \Drupal::l(t('Updates available'), new Url('locale.translate_status')), 'severity' => REQUIREMENT_WARNING, - 'description' => t('Updates available for: @languages. See the Available translation updates page for more information.', array('@languages' => implode(', ', $available_updates), ':updates' => \Drupal::url('locale.translate_status'))), + 'description' => t('Updates available for: @languages. See the Available translation updates page for more information.', array('@languages' => implode(', ', $available_updates), ':updates' => Url::fromRoute('locale.translate_status')->toString())), ); } else { @@ -270,7 +270,7 @@ function locale_requirements($phase) { 'title' => 'Translation update status', 'value' => t('Missing translations'), 'severity' => REQUIREMENT_INFO, - 'description' => t('Missing translations for: @languages. See the Available translation updates page for more information.', array('@languages' => implode(', ', $untranslated), ':updates' => \Drupal::url('locale.translate_status'))), + 'description' => t('Missing translations for: @languages. See the Available translation updates page for more information.', array('@languages' => implode(', ', $untranslated), ':updates' => Url::fromRoute('locale.translate_status')->toString())), ); } } @@ -287,7 +287,7 @@ function locale_requirements($phase) { 'title' => 'Translation update status', 'value' => \Drupal::l(t('Can not determine status'), new Url('locale.translate_status')), 'severity' => REQUIREMENT_WARNING, - 'description' => t('No translation status is available. See the Available translation updates page for more information.', array(':updates' => \Drupal::url('locale.translate_status'))), + 'description' => t('No translation status is available. See the Available translation updates page for more information.', array(':updates' => Url::fromRoute('locale.translate_status')->toString())), ); } } diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module index aecad6c..e2581c8 100644 --- a/core/modules/locale/locale.module +++ b/core/modules/locale/locale.module @@ -146,30 +146,30 @@ function locale_help($route_name, RouteMatchInterface $route_match) { case 'help.page.locale': $output = ''; $output .= '

      ' . t('About') . '

      '; - $output .= '

      ' . t('The Interface Translation module allows you to translate interface text (strings) into different languages, and to switch between them for the display of interface text. It uses the functionality provided by the Language module. For more information, see the online documentation for the Interface Translation module.', array(':doc-url' => 'https://www.drupal.org/documentation/modules/locale/', ':language' => \Drupal::url('help.page', array('name' => 'language')))) . '

      '; + $output .= '

      ' . t('The Interface Translation module allows you to translate interface text (strings) into different languages, and to switch between them for the display of interface text. It uses the functionality provided by the Language module. For more information, see the online documentation for the Interface Translation module.', array(':doc-url' => 'https://www.drupal.org/documentation/modules/locale/', ':language' => Url::fromRoute('help.page', array('name' => 'language'))->toString())) . '

      '; $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Importing translation files') . '
      '; - $output .= '
      ' . t('Translation files with translated interface text are imported automatically when languages are added on the Languages page, or when modules or themes are enabled. On the Interface translation settings page, the Translation source can be restricted to local files only, or to include the Drupal translation server. Although modules and themes may not be fully translated in all languages, new translations become available frequently. You can specify whether and how often to check for translation file updates and whether to overwrite existing translations on the Interface translation settings page. You can also manually import a translation file on the Interface translation import page.', array(':import' => \Drupal::url('locale.translate_import'), ':locale-settings' => \Drupal::url('locale.settings'), ':languages' => \Drupal::url('entity.configurable_language.collection'), ':server' => 'https://localize.drupal.org')) . '
      '; + $output .= '
      ' . t('Translation files with translated interface text are imported automatically when languages are added on the Languages page, or when modules or themes are enabled. On the Interface translation settings page, the Translation source can be restricted to local files only, or to include the Drupal translation server. Although modules and themes may not be fully translated in all languages, new translations become available frequently. You can specify whether and how often to check for translation file updates and whether to overwrite existing translations on the Interface translation settings page. You can also manually import a translation file on the Interface translation import page.', array(':import' => Url::fromRoute('locale.translate_import')->toString(), ':locale-settings' => Url::fromRoute('locale.settings')->toString(), ':languages' => Url::fromRoute('entity.configurable_language.collection')->toString(), ':server' => 'https://localize.drupal.org')) . '
      '; $output .= '
      ' . t('Checking the translation status') . '
      '; - $output .= '
      ' . t('You can check how much of the interface on your site is translated into which language on the Languages page. On the Available translation updates page, you can check whether interface translation updates are available on the Drupal translation server.', array(':languages' => \Drupal::url('entity.configurable_language.collection'), ':translation-updates' => \Drupal::url('locale.translate_status'), ':server' => 'https://localize.drupal.org')) . '
      '; + $output .= '
      ' . t('You can check how much of the interface on your site is translated into which language on the Languages page. On the Available translation updates page, you can check whether interface translation updates are available on the Drupal translation server.', array(':languages' => Url::fromRoute('entity.configurable_language.collection')->toString(), ':translation-updates' => Url::fromRoute('locale.translate_status')->toString(), ':server' => 'https://localize.drupal.org')) . '
      '; $output .= '
      ' . t('Translating individual strings') . '
      '; - $output .= '
      ' . t('You can translate individual strings directly on the User interface translation page, or download the currently-used translation file for a specific language on the Interface translation export page. Once you have edited the translation file, you can then import it again on the Interface translation import page.', array(':translate' => \Drupal::url('locale.translate_page'), ':export' => \Drupal::url('locale.translate_export'), ':import' => \Drupal::url('locale.translate_import'))) . '
      '; + $output .= '
      ' . t('You can translate individual strings directly on the User interface translation page, or download the currently-used translation file for a specific language on the Interface translation export page. Once you have edited the translation file, you can then import it again on the Interface translation import page.', array(':translate' => Url::fromRoute('locale.translate_page')->toString(), ':export' => Url::fromRoute('locale.translate_export')->toString(), ':import' => Url::fromRoute('locale.translate_import')->toString())) . '
      '; $output .= '
      ' . t('Overriding default English strings') . '
      '; - $output .= '
      ' . t('If translation is enabled for English, you can override the default English interface text strings in your site with other English text strings on the User interface translation page. Translation is off by default for English, but you can turn it on by visiting the Edit language page for English from the Languages page.', array(':translate' => \Drupal::url('locale.translate_page'), ':languages' => \Drupal::url('entity.configurable_language.collection'))) . '
      '; + $output .= '
      ' . t('If translation is enabled for English, you can override the default English interface text strings in your site with other English text strings on the User interface translation page. Translation is off by default for English, but you can turn it on by visiting the Edit language page for English from the Languages page.', array(':translate' => Url::fromRoute('locale.translate_page')->toString(), ':languages' => Url::fromRoute('entity.configurable_language.collection')->toString())) . '
      '; $output .= '
      '; return $output; case 'entity.configurable_language.collection': - return '

      ' . t('Interface translations are automatically imported when a language is added, or when new modules or themes are enabled. The report Available translation updates shows the status. Interface text can be customized in the user interface translation page.', array(':update' => \Drupal::url('locale.translate_status'), ':translate' => \Drupal::url('locale.translate_page'))) . '

      '; + return '

      ' . t('Interface translations are automatically imported when a language is added, or when new modules or themes are enabled. The report Available translation updates shows the status. Interface text can be customized in the user interface translation page.', array(':update' => Url::fromRoute('locale.translate_status')->toString(), ':translate' => Url::fromRoute('locale.translate_page')->toString())) . '

      '; case 'locale.translate_page': - $output = '

      ' . t('This page allows a translator to search for specific translated and untranslated strings, and is used when creating or editing translations. (Note: Because translation tasks involve many strings, it may be more convenient to export strings for offline editing in a desktop Gettext translation editor.) Searches may be limited to strings in a specific language.', array(':export' => \Drupal::url('locale.translate_export'))) . '

      '; + $output = '

      ' . t('This page allows a translator to search for specific translated and untranslated strings, and is used when creating or editing translations. (Note: Because translation tasks involve many strings, it may be more convenient to export strings for offline editing in a desktop Gettext translation editor.) Searches may be limited to strings in a specific language.', array(':export' => Url::fromRoute('locale.translate_export')->toString())) . '

      '; return $output; case 'locale.translate_import': - $output = '

      ' . t('Translation files are automatically downloaded and imported when languages are added, or when modules or themes are enabled.', array(':language' => \Drupal::url('entity.configurable_language.collection'))) . '

      '; - $output .= '

      ' . t('This page allows translators to manually import translated strings contained in a Gettext Portable Object (.po) file. Manual import may be used for customized translations or for the translation of custom modules and themes. To customize translations you can download a translation file from the Drupal translation server or export translations from the site, customize the translations using a Gettext translation editor, and import the result using this page.', array(':url' => 'https://localize.drupal.org', ':export' => \Drupal::url('locale.translate_export'))) . '

      '; + $output = '

      ' . t('Translation files are automatically downloaded and imported when languages are added, or when modules or themes are enabled.', array(':language' => Url::fromRoute('entity.configurable_language.collection')->toString())) . '

      '; + $output .= '

      ' . t('This page allows translators to manually import translated strings contained in a Gettext Portable Object (.po) file. Manual import may be used for customized translations or for the translation of custom modules and themes. To customize translations you can download a translation file from the Drupal translation server or export translations from the site, customize the translations using a Gettext translation editor, and import the result using this page.', array(':url' => 'https://localize.drupal.org', ':export' => Url::fromRoute('locale.translate_export')->toString())) . '

      '; $output .= '

      ' . t('Note that importing large .po files may take several minutes.') . '

      '; return $output; diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc index 9b2be23..b858642 100644 --- a/core/modules/locale/locale.pages.inc +++ b/core/modules/locale/locale.pages.inc @@ -29,7 +29,7 @@ function locale_translation_manual_status() { if (batch_get()) { return batch_process('admin/reports/translations'); } - return new RedirectResponse(\Drupal::url('locale.translate_status', array(), array('absolute' => TRUE))); + return new RedirectResponse(Url::fromRoute('locale.translate_status', array(), array('absolute' => TRUE))->toString()); } /** diff --git a/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php b/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php index 0b69da2..a6381d0 100644 --- a/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php +++ b/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php @@ -4,6 +4,7 @@ use Drupal\simpletest\WebTestBase; use Drupal\Core\Language\LanguageInterface; +use Drupal\Core\Url; /** * Tests the import of locale files. @@ -75,7 +76,7 @@ public function testStandalonePoFile() { $this->assertEqual(2, $locale_plurals, 'Plural number initialized.'); // Ensure we were redirected correctly. - $this->assertUrl(\Drupal::url('locale.translate_page', [], ['absolute' => TRUE]), [], 'Correct page redirection.'); + $this->assertUrl(Url::fromRoute('locale.translate_page', [], ['absolute' => TRUE])->toString(), [], 'Correct page redirection.'); // Try importing a .po file with invalid tags. $this->importPoFile($this->getBadPoFile(), array( @@ -85,7 +86,7 @@ public function testStandalonePoFile() { // The import should have created 1 string and rejected 2. $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', array('%number' => 1, '%update' => 0, '%delete' => 0)), 'The translation file was successfully imported.'); - $skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', array(':url' => \Drupal::url('dblog.overview'))); + $skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', array(':url' => Url::fromRoute('dblog.overview')->toString())); $this->assertRaw($skip_message, 'Unsafe strings were skipped.'); // Repeat the process with a user that can access site reports, and this @@ -97,7 +98,7 @@ public function testStandalonePoFile() { 'langcode' => 'fr', )); - $skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', array(':url' => \Drupal::url('dblog.overview'))); + $skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', array(':url' => Url::fromRoute('dblog.overview')->toString())); $this->assertRaw($skip_message, 'Unsafe strings were skipped.'); // Check empty files import with a user that cannot access site reports.. @@ -117,7 +118,7 @@ public function testStandalonePoFile() { 'langcode' => 'fr', )); // The import should have created 0 string and rejected 0. - $this->assertRaw(t('One translation file could not be imported. See the log for details.', array(':url' => \Drupal::url('dblog.overview'))), 'The empty translation file import reported no translations imported.'); + $this->assertRaw(t('One translation file could not be imported. See the log for details.', array(':url' => Url::fromRoute('dblog.overview')->toString())), 'The empty translation file import reported no translations imported.'); // Try importing a .po file which doesn't exist. $name = $this->randomMachineName(16); @@ -125,7 +126,7 @@ public function testStandalonePoFile() { 'langcode' => 'fr', 'files[file]' => $name, ), t('Import')); - $this->assertUrl(\Drupal::url('locale.translate_import', [], ['absolute' => TRUE]), [], 'Correct page redirection.'); + $this->assertUrl(Url::fromRoute('locale.translate_import', [], ['absolute' => TRUE])->toString(), [], 'Correct page redirection.'); $this->assertText(t('File to import not found.'), 'File to import not found message.'); // Try importing a .po file with overriding strings, and ensure existing diff --git a/core/modules/locale/src/Tests/LocaleTranslationUiTest.php b/core/modules/locale/src/Tests/LocaleTranslationUiTest.php index aad0119..e2ad9dd 100644 --- a/core/modules/locale/src/Tests/LocaleTranslationUiTest.php +++ b/core/modules/locale/src/Tests/LocaleTranslationUiTest.php @@ -6,6 +6,7 @@ use Drupal\simpletest\WebTestBase; use Drupal\Core\Language\LanguageInterface; use Drupal\Component\Utility\SafeMarkup; +use Drupal\Core\Url; /** * Adds a new locale and translates its name. Checks the validation of @@ -96,7 +97,7 @@ public function testStringTranslation() { $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations')); $this->assertText(t('The strings have been saved.'), 'The strings have been saved.'); $url_bits = explode('?', $this->getUrl()); - $this->assertEqual($url_bits[0], \Drupal::url('locale.translate_page', array(), array('absolute' => TRUE)), 'Correct page redirection.'); + $this->assertEqual($url_bits[0], Url::fromRoute('locale.translate_page', array(), array('absolute' => TRUE))->toString(), 'Correct page redirection.'); $search = array( 'string' => $name, 'langcode' => $langcode, diff --git a/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php b/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php index 6337b32..b8ba54b 100644 --- a/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php +++ b/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php @@ -4,7 +4,7 @@ use Drupal\Component\Render\FormattableMarkup; use Drupal\Component\Utility\SafeMarkup; - +use Drupal\Core\Url; /** * Tests for the user interface of project interface translations. * @@ -41,7 +41,7 @@ public function testInterface() { $this->assertNoText(t('Translation update status'), 'No status message'); $this->drupalGet('admin/reports/translations'); - $this->assertRaw(t('No translatable languages available. Add a language first.', array(':add_language' => \Drupal::url('entity.configurable_language.collection'))), 'Language message'); + $this->assertRaw(t('No translatable languages available. Add a language first.', array(':add_language' => Url::fromRoute('entity.configurable_language.collection')->toString())), 'Language message'); // Add German language. $this->addLanguage('de'); @@ -66,7 +66,7 @@ public function testInterface() { // Check if updates are available for German. $this->drupalGet('admin/reports/status'); $this->assertText(t('Translation update status'), 'Status message'); - $this->assertRaw(t('Updates available for: @languages. See the Available translation updates page for more information.', array('@languages' => t('German'), ':updates' => \Drupal::url('locale.translate_status'))), 'Updates available message'); + $this->assertRaw(t('Updates available for: @languages. See the Available translation updates page for more information.', array('@languages' => t('German'), ':updates' => Url::fromRoute('locale.translate_status')->toString())), 'Updates available message'); $this->drupalGet('admin/reports/translations'); $this->assertText(t('Updates for: @modules', array('@modules' => 'Locale test translate')), 'Translations available'); @@ -80,7 +80,7 @@ public function testInterface() { // Check if no updates were found. $this->drupalGet('admin/reports/status'); $this->assertText(t('Translation update status'), 'Status message'); - $this->assertRaw(t('Missing translations for: @languages. See the Available translation updates page for more information.', array('@languages' => t('German'), ':updates' => \Drupal::url('locale.translate_status'))), 'Missing translations message'); + $this->assertRaw(t('Missing translations for: @languages. See the Available translation updates page for more information.', array('@languages' => t('German'), ':updates' => Url::fromRoute('locale.translate_status')->toString())), 'Missing translations message'); $this->drupalGet('admin/reports/translations'); $this->assertText(t('Missing translations for one project'), 'No translations found'); $release_details = new FormattableMarkup('@module (@version). @info', [ diff --git a/core/modules/locale/tests/modules/locale_test/locale_test.module b/core/modules/locale/tests/modules/locale_test/locale_test.module index b59dfee..89e1b26 100644 --- a/core/modules/locale/tests/modules/locale_test/locale_test.module +++ b/core/modules/locale/tests/modules/locale_test/locale_test.module @@ -7,6 +7,7 @@ use Drupal\Core\Extension\Extension; use Drupal\Core\StreamWrapper\PublicStream; +use Drupal\Core\Url; /** * Implements hook_system_info_alter(). @@ -53,7 +54,7 @@ function locale_test_locale_translation_projects_alter(&$projects) { // Instead of the default ftp.drupal.org we use the file system of the test // instance to simulate a remote file location. - $url = \Drupal::url('', [], ['absolute' => TRUE]); + $url = Url::fromRoute('', [], ['absolute' => TRUE])->toString(); $remote_url = $url . PublicStream::basePath() . '/remote/'; // Completely replace the project data with a set of test projects. diff --git a/core/modules/menu_link_content/menu_link_content.module b/core/modules/menu_link_content/menu_link_content.module index 98357c6..a6bffca 100644 --- a/core/modules/menu_link_content/menu_link_content.module +++ b/core/modules/menu_link_content/menu_link_content.module @@ -7,6 +7,7 @@ use Drupal\Core\Routing\RouteMatchInterface; use Drupal\system\MenuInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -18,7 +19,7 @@ function menu_link_content_help($route_name, RouteMatchInterface $route_match) { $output .= '

      ' . t('About') . '

      '; $output .= '

      ' . t('The Custom Menu Links module allows users to create menu links. These links can be translated if multiple languages are used for the site.'); if (\Drupal::moduleHandler()->moduleExists('menu_ui')) { - $output .= ' ' . t('It is required by the Menu UI module, which provides an interface for managing menus and menu links. For more information, see the Menu UI module help page and the online documentation for the Custom Menu Links module.', array(':menu-help' => \Drupal::url('help.page', array('name' => 'menu_ui')), ':drupal-org-help' => 'https://www.drupal.org/documentation/modules/menu_link')); + $output .= ' ' . t('It is required by the Menu UI module, which provides an interface for managing menus and menu links. For more information, see the Menu UI module help page and the online documentation for the Custom Menu Links module.', array(':menu-help' => Url::fromRoute('help.page', array('name' => 'menu_ui'))->toString(), ':drupal-org-help' => 'https://www.drupal.org/documentation/modules/menu_link')); } else { $output .= ' ' . t('For more information, see the online documentation for the Custom Menu Links module. If you enable the Menu UI module, it provides an interface for managing menus and menu links.', array(':drupal-org-help' => 'https://www.drupal.org/documentation/modules/menu_link')); diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module index d642247..996f08d 100644 --- a/core/modules/menu_ui/menu_ui.module +++ b/core/modules/menu_ui/menu_ui.module @@ -20,6 +20,7 @@ use Drupal\node\NodeTypeInterface; use Drupal\system\Entity\Menu; use Drupal\node\NodeInterface; +use Drupal\Core\Url; /** * Maximum length of menu name as entered by the user. Database length is 32 @@ -39,17 +40,17 @@ function menu_ui_help($route_name, RouteMatchInterface $route_match) { $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Managing menus') . '
      '; - $output .= '
      ' . t('Users with the Administer menus and menu items permission can add, edit, and delete custom menus on the Menus page. Custom menus can be special site menus, menus of external links, or any combination of internal and external links. You may create an unlimited number of additional menus, each of which will automatically have an associated block (if you have the Block module installed). By selecting Edit menu, you can add, edit, or delete links for a given menu. The links listing page provides a drag-and-drop interface for controlling the order of links, and creating a hierarchy within the menu.', array(':block_help' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('help.page', array('name' => 'block')) : '#', ':menu' => \Drupal::url('entity.menu.collection'))) . '
      '; + $output .= '
      ' . t('Users with the Administer menus and menu items permission can add, edit, and delete custom menus on the Menus page. Custom menus can be special site menus, menus of external links, or any combination of internal and external links. You may create an unlimited number of additional menus, each of which will automatically have an associated block (if you have the Block module installed). By selecting Edit menu, you can add, edit, or delete links for a given menu. The links listing page provides a drag-and-drop interface for controlling the order of links, and creating a hierarchy within the menu.', array(':block_help' => (\Drupal::moduleHandler()->moduleExists('block')) ? Url::fromRoute('help.page', array('name' => 'block'))->toString() : '#', ':menu' => Url::fromRoute('entity.menu.collection')->toString())) . '
      '; $output .= '
      ' . t('Displaying menus') . '
      '; - $output .= '
      ' . t('If you have the Block module enabled, then each menu that you create is rendered in a block that you enable and position on the Block layout page. In some themes, the main menu and possibly the secondary menu will be output automatically; you may be able to disable this behavior on the theme\'s settings page.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#', ':themes' => \Drupal::url('system.themes_page'), ':theme_settings' => \Drupal::url('system.theme_settings'))) . '
      '; + $output .= '
      ' . t('If you have the Block module enabled, then each menu that you create is rendered in a block that you enable and position on the Block layout page. In some themes, the main menu and possibly the secondary menu will be output automatically; you may be able to disable this behavior on the theme\'s settings page.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? Url::fromRoute('block.admin_display')->toString() : '#', ':themes' => Url::fromRoute('system.themes_page')->toString(), ':theme_settings' => Url::fromRoute('system.theme_settings')->toString())) . '
      '; $output .= '
      '; return $output; } if ($route_name == 'entity.menu.add_form' && \Drupal::moduleHandler()->moduleExists('block') && \Drupal::currentUser()->hasPermission('administer blocks')) { - return '

      ' . t('You can enable the newly-created block for this menu on the Block layout page.', array(':blocks' => \Drupal::url('block.admin_display'))) . '

      '; + return '

      ' . t('You can enable the newly-created block for this menu on the Block layout page.', array(':blocks' => Url::fromRoute('block.admin_display')->toString())) . '

      '; } elseif ($route_name == 'entity.menu.collection' && \Drupal::moduleHandler()->moduleExists('block') && \Drupal::currentUser()->hasPermission('administer blocks')) { - return '

      ' . t('Each menu has a corresponding block that is managed on the Block layout page.', array(':blocks' => \Drupal::url('block.admin_display'))) . '

      '; + return '

      ' . t('Each menu has a corresponding block that is managed on the Block layout page.', array(':blocks' => Url::fromRoute('block.admin_display')->toString())) . '

      '; } } diff --git a/core/modules/migrate_drupal/migrate_drupal.module b/core/modules/migrate_drupal/migrate_drupal.module index dc3ab4e..f0b8bd0 100644 --- a/core/modules/migrate_drupal/migrate_drupal.module +++ b/core/modules/migrate_drupal/migrate_drupal.module @@ -11,6 +11,7 @@ use Drupal\migrate\MigrateExecutable; use Drupal\migrate\MigrateMessage; use Drupal\migrate\Plugin\RequirementsInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -20,7 +21,7 @@ function migrate_drupal_help($route_name, RouteMatchInterface $route_match) { case 'help.page.migrate_drupal': $output = ''; $output .= '

      ' . t('About') . '

      '; - $output .= '

      ' . t('The Migrate Drupal module provides a framework based on the Migrate module to facilitate migration from a Drupal (6, 7, or 8) site to your website. It does not provide a user interface. For more information, see the online documentation for the Migrate Drupal module.', array(':migrate' => \Drupal::url('help.page', array('name' => 'migrate')), ':migrate_drupal' => 'https://www.drupal.org/documentation/modules/migrate_drupal')) . '

      '; + $output .= '

      ' . t('The Migrate Drupal module provides a framework based on the Migrate module to facilitate migration from a Drupal (6, 7, or 8) site to your website. It does not provide a user interface. For more information, see the online documentation for the Migrate Drupal module.', array(':migrate' => Url::fromRoute('help.page', array('name' => 'migrate'))->toString(), ':migrate_drupal' => 'https://www.drupal.org/documentation/modules/migrate_drupal')) . '

      '; return $output; } } diff --git a/core/modules/node/node.install b/core/modules/node/node.install index c754880..5010bfd 100644 --- a/core/modules/node/node.install +++ b/core/modules/node/node.install @@ -7,6 +7,7 @@ use Drupal\Core\Field\BaseFieldDefinition; use Drupal\user\RoleInterface; +use Drupal\Core\Url; /** * Implements hook_requirements(). @@ -29,7 +30,7 @@ function node_requirements($phase) { 'title' => t('Node Access Permissions'), 'value' => $value, 'description' => t('If the site is experiencing problems with permissions to content, you may have to rebuild the permissions cache. Rebuilding will remove all privileges to content and replace them with permissions based on the current modules and settings. Rebuilding may take some time if there is a lot of content or complex permission settings. After rebuilding has completed, content will automatically use the new permissions. Rebuild permissions', array( - ':rebuild' => \Drupal::url('node.configure_rebuild_confirm'), + ':rebuild' => Url::fromRoute('node.configure_rebuild_confirm')->toString(), )), ); } diff --git a/core/modules/node/node.module b/core/modules/node/node.module index fa9d3e9..bfa3332 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -72,7 +72,7 @@ function node_help($route_name, RouteMatchInterface $route_match) { $message = t('The content access permissions need to be rebuilt.'); } else { - $message = t('The content access permissions need to be rebuilt. Rebuild permissions.', array(':node_access_rebuild' => \Drupal::url('node.configure_rebuild_confirm'))); + $message = t('The content access permissions need to be rebuilt. Rebuild permissions.', array(':node_access_rebuild' => Url::fromRoute('node.configure_rebuild_confirm')->toString())); } drupal_set_message($message, 'error'); } @@ -81,19 +81,19 @@ function node_help($route_name, RouteMatchInterface $route_match) { case 'help.page.node': $output = ''; $output .= '

      ' . t('About') . '

      '; - $output .= '

      ' . t('The Node module manages the creation, editing, deletion, settings, and display of the main site content. Content items managed by the Node module are typically displayed as pages on your site, and include a title, some meta-data (author, creation time, content type, etc.), and optional fields containing text or other data (fields are managed by the Field module). For more information, see the online documentation for the Node module.', array(':node' => 'https://www.drupal.org/documentation/modules/node', ':field' => \Drupal::url('help.page', array('name' => 'field')))) . '

      '; + $output .= '

      ' . t('The Node module manages the creation, editing, deletion, settings, and display of the main site content. Content items managed by the Node module are typically displayed as pages on your site, and include a title, some meta-data (author, creation time, content type, etc.), and optional fields containing text or other data (fields are managed by the Field module). For more information, see the online documentation for the Node module.', array(':node' => 'https://www.drupal.org/documentation/modules/node', ':field' => Url::fromRoute('help.page', array('name' => 'field'))->toString())) . '

      '; $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Creating content') . '
      '; - $output .= '
      ' . t('When new content is created, the Node module records basic information about the content, including the author, date of creation, and the Content type. It also manages the publishing options, which define whether or not the content is published, promoted to the front page of the site, and/or sticky at the top of content lists. Default settings can be configured for each type of content on your site.', array(':content-type' => \Drupal::url('entity.node_type.collection'))) . '
      '; + $output .= '
      ' . t('When new content is created, the Node module records basic information about the content, including the author, date of creation, and the Content type. It also manages the publishing options, which define whether or not the content is published, promoted to the front page of the site, and/or sticky at the top of content lists. Default settings can be configured for each type of content on your site.', array(':content-type' => Url::fromRoute('entity.node_type.collection')->toString())) . '
      '; $output .= '
      ' . t('Creating custom content types') . '
      '; - $output .= '
      ' . t('The Node module gives users with the Administer content types permission the ability to create new content types in addition to the default ones already configured. Creating custom content types gives you the flexibility to add fields and configure default settings that suit the differing needs of various site content.', array(':content-new' => \Drupal::url('node.type_add'), ':field' => \Drupal::url('help.page', array('name' => 'field')))) . '
      '; + $output .= '
      ' . t('The Node module gives users with the Administer content types permission the ability to create new content types in addition to the default ones already configured. Creating custom content types gives you the flexibility to add fields and configure default settings that suit the differing needs of various site content.', array(':content-new' => url::fromRoute('node.type_add')->toString(), ':field' => Url::fromRoute('help.page', array('name' => 'field'))->toString())) . '
      '; $output .= '
      ' . t('Administering content') . '
      '; - $output .= '
      ' . t('The Content page lists your content, allowing you add new content, filter, edit or delete existing content, or perform bulk operations on existing content.', array(':content' => \Drupal::url('system.admin_content'))) . '
      '; + $output .= '
      ' . t('The Content page lists your content, allowing you add new content, filter, edit or delete existing content, or perform bulk operations on existing content.', array(':content' => url::fromRoute('system.admin_content')->toString())) . '
      '; $output .= '
      ' . t('Creating revisions') . '
      '; $output .= '
      ' . t('The Node module also enables you to create multiple versions of any content, and revert to older versions using the Revision information settings.') . '
      '; $output .= '
      ' . t('User permissions') . '
      '; - $output .= '
      ' . t('The Node module makes a number of permissions available for each content type, which can be set by role on the permissions page.', array(':permissions' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-node')))) . '
      '; + $output .= '
      ' . t('The Node module makes a number of permissions available for each content type, which can be set by role on the permissions page.', array(':permissions' => Url::fromRoute('user.admin_permissions', array(), array('fragment' => 'module-node'))->toString())) . '
      '; $output .= '
      '; return $output; diff --git a/core/modules/node/src/Plugin/views/field/Path.php b/core/modules/node/src/Plugin/views/field/Path.php index 176ce81..9025706 100644 --- a/core/modules/node/src/Plugin/views/field/Path.php +++ b/core/modules/node/src/Plugin/views/field/Path.php @@ -7,6 +7,7 @@ use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\ResultRow; use Drupal\views\ViewExecutable; +use Drupal\Core\Url; /** * Field handler to present the path to the node. @@ -63,7 +64,7 @@ public function query() { */ public function render(ResultRow $values) { $nid = $this->getValue($values, 'nid'); - return \Drupal::url('entity.node.canonical', ['node' => $nid], ['absolute' => $this->options['absolute']]); + return Url::fromRoute('entity.node.canonical', ['node' => $nid], ['absolute' => $this->options['absolute']])->toString(); } } diff --git a/core/modules/node/src/Tests/PagePreviewTest.php b/core/modules/node/src/Tests/PagePreviewTest.php index 9777ccc..e44991f 100644 --- a/core/modules/node/src/Tests/PagePreviewTest.php +++ b/core/modules/node/src/Tests/PagePreviewTest.php @@ -12,6 +12,7 @@ use Drupal\node\Entity\NodeType; use Drupal\taxonomy\Entity\Term; use Drupal\taxonomy\Entity\Vocabulary; +use Drupal\Core\Url; /** * Tests the node entity preview functionality. @@ -316,7 +317,7 @@ public function testSimultaneousPreview() { $edit2 = array($title_key => 'Another page title'); $this->drupalPostForm('node/' . $node->id() . '/edit', $edit2, t('Preview')); - $this->assertUrl(\Drupal::url('entity.node.preview', ['node_preview' => $node->uuid(), 'view_mode_id' => 'default'], ['absolute' => TRUE])); + $this->assertUrl(Url::fromRoute('entity.node.preview', ['node_preview' => $node->uuid(), 'view_mode_id' => 'default'], ['absolute' => TRUE])->toString()); $this->assertText($edit2[$title_key]); } diff --git a/core/modules/node/src/Tests/Views/NodeContextualLinksTest.php b/core/modules/node/src/Tests/Views/NodeContextualLinksTest.php index acd7d7b..923232e 100644 --- a/core/modules/node/src/Tests/Views/NodeContextualLinksTest.php +++ b/core/modules/node/src/Tests/Views/NodeContextualLinksTest.php @@ -4,6 +4,7 @@ use Drupal\Component\Serialization\Json; use Drupal\user\Entity\User; +use Drupal\Core\Url; /** * Tests views contextual links on nodes. @@ -79,7 +80,7 @@ protected function renderContextualLinks($ids, $current_path) { // Perform HTTP request. return $this->curlExec(array( - CURLOPT_URL => \Drupal::url('contextual.render', [], ['absolute' => TRUE, 'query' => array('destination' => $current_path)]), + CURLOPT_URL => Url::fromRoute('contextual.render', [], ['absolute' => TRUE, 'query' => array('destination' => $current_path)])->toString(), CURLOPT_POST => TRUE, CURLOPT_POSTFIELDS => $post, CURLOPT_HTTPHEADER => array( diff --git a/core/modules/options/options.module b/core/modules/options/options.module index 90b70ff..d78f1e6 100644 --- a/core/modules/options/options.module +++ b/core/modules/options/options.module @@ -10,6 +10,7 @@ use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\field\FieldStorageConfigInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -19,11 +20,11 @@ function options_help($route_name, RouteMatchInterface $route_match) { case 'help.page.options': $output = ''; $output .= '

      ' . t('About') . '

      '; - $output .= '

      ' . t('The Options module allows you to create fields where data values are selected from a fixed list of options. Usually these items are entered through a select list, checkboxes, or radio buttons. See the Field module help and the Field UI help pages for general information on fields and how to create and manage them. For more information, see the online documentation for the Options module.', array(':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#', ':options_do' => 'https://www.drupal.org/documentation/modules/options')) . '

      '; + $output .= '

      ' . t('The Options module allows you to create fields where data values are selected from a fixed list of options. Usually these items are entered through a select list, checkboxes, or radio buttons. See the Field module help and the Field UI help pages for general information on fields and how to create and manage them. For more information, see the online documentation for the Options module.', array(':field' => Url::fromRoute('help.page', array('name' => 'field'))->toString(), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#', ':options_do' => 'https://www.drupal.org/documentation/modules/options')) . '

      '; $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Managing and displaying list fields') . '
      '; - $output .= '
      ' . t('The settings and the display of the list fields can be configured separately. See the Field UI help for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '
      '; + $output .= '
      ' . t('The settings and the display of the list fields can be configured separately. See the Field UI help for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#')) . '
      '; $output .= '
      ' . t('Defining option keys and labels') . '
      '; $output .= '
      ' . t('When you define the list options you can define a key and a label for each option in the list. The label will be shown to the users while the key gets stored in the database.') . '
      '; $output .= '
      ' . t('Choosing list field type') . '
      '; diff --git a/core/modules/page_cache/page_cache.module b/core/modules/page_cache/page_cache.module index 3b8baf4..a1179cb 100644 --- a/core/modules/page_cache/page_cache.module +++ b/core/modules/page_cache/page_cache.module @@ -23,7 +23,7 @@ function page_cache_help($route_name, RouteMatchInterface $route_match) { $output .= '
      ' . t('Pages are usually identical for all anonymous users, while they can be personalized for each authenticated user. This is why entire pages can be cached for anonymous users, whereas they will have to be rebuilt for every authenticated user.') . '
      '; $output .= '
      ' . t('To speed up your site for authenticated users, see the Dynamic Page Cache module.', [':dynamic_page_cache-help' => (\Drupal::moduleHandler()->moduleExists('dynamic_page_cache')) ? Url::fromRoute('help.page', ['name' => 'dynamic_page_cache'])->toString() : '#']) . '

      '; $output .= '
      ' . t('Configuring the internal page cache') . '
      '; - $output .= '
      ' . t('On the Performance page, you can configure how long browsers and proxies may cache pages; that setting is also respected by the Internal Page Cache module. There is no other configuration.', array(':cache-settings' => \Drupal::url('system.performance_settings'))) . '
      '; + $output .= '
      ' . t('On the Performance page, you can configure how long browsers and proxies may cache pages; that setting is also respected by the Internal Page Cache module. There is no other configuration.', array(':cache-settings' => Url::fromRoute('system.performance_settings')->toString())) . '
      '; $output .= '
      '; return $output; diff --git a/core/modules/page_cache/src/Tests/PageCacheTest.php b/core/modules/page_cache/src/Tests/PageCacheTest.php index 9194e65..c60f886 100644 --- a/core/modules/page_cache/src/Tests/PageCacheTest.php +++ b/core/modules/page_cache/src/Tests/PageCacheTest.php @@ -58,7 +58,7 @@ function testPageCacheTags() { // Verify a cache hit, but also the presence of the correct cache tags. $this->drupalGet($path); $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT'); - $cid_parts = array(\Drupal::url('system_test.cache_tags_page', array(), array('absolute' => TRUE)), 'html'); + $cid_parts = array(Url::fromRoute('system_test.cache_tags_page', array(), array('absolute' => TRUE))->toString(), 'html'); $cid = implode(':', $cid_parts); $cache_entry = \Drupal::cache('render')->get($cid); sort($cache_entry->tags); @@ -89,7 +89,7 @@ function testPageCacheTagsIndependentFromCacheabilityHeaders() { // Verify a cache hit, but also the presence of the correct cache tags. $this->drupalGet($path); $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT'); - $cid_parts = array(\Drupal::url('system_test.cache_tags_page', array(), array('absolute' => TRUE)), 'html'); + $cid_parts = array(Url::fromRoute('system_test.cache_tags_page', array(), array('absolute' => TRUE))->toString(), 'html'); $cid = implode(':', $cid_parts); $cache_entry = \Drupal::cache('render')->get($cid); sort($cache_entry->tags); diff --git a/core/modules/path/path.module b/core/modules/path/path.module index 3d7f1d0..1258936 100644 --- a/core/modules/path/path.module +++ b/core/modules/path/path.module @@ -10,6 +10,7 @@ use Drupal\Core\Field\BaseFieldDefinition; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -23,9 +24,9 @@ function path_help($route_name, RouteMatchInterface $route_match) { $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Creating aliases') . '
      '; - $output .= '
      ' . t('If you create or edit a taxonomy term you can add an alias (for example music/jazz) in the field "URL alias". When creating or editing content you can add an alias (for example about-us/team) under the section "URL path settings" in the field "URL alias". Aliases for any other path can be added through the page URL aliases. To add aliases a user needs the permission Create and edit URL aliases.', array(':aliases' => \Drupal::url('path.admin_overview'), ':permissions' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-path')))) . '
      '; + $output .= '
      ' . t('If you create or edit a taxonomy term you can add an alias (for example music/jazz) in the field "URL alias". When creating or editing content you can add an alias (for example about-us/team) under the section "URL path settings" in the field "URL alias". Aliases for any other path can be added through the page URL aliases. To add aliases a user needs the permission Create and edit URL aliases.', array(':aliases' => Url::fromRoute('path.admin_overview')->toString(), ':permissions' => Url::fromRoute('user.admin_permissions', array(), array('fragment' => 'module-path'))->toString())) . '
      '; $output .= '
      ' . t('Managing aliases') . '
      '; - $output .= '
      ' . t('The Path module provides a way to search and view a list of all aliases that are in use on your website. Aliases can be added, edited and deleted through this list.', array(':aliases' => \Drupal::url('path.admin_overview'))) . '
      '; + $output .= '
      ' . t('The Path module provides a way to search and view a list of all aliases that are in use on your website. Aliases can be added, edited and deleted through this list.', array(':aliases' => Url::fromRoute('path.admin_overview')->toString())) . '
      '; $output .= '
      '; return $output; diff --git a/core/modules/quickedit/quickedit.module b/core/modules/quickedit/quickedit.module index 2d69a66..afa7093 100644 --- a/core/modules/quickedit/quickedit.module +++ b/core/modules/quickedit/quickedit.module @@ -14,6 +14,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\Display\EntityViewDisplayInterface; use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -22,12 +23,12 @@ function quickedit_help($route_name, RouteMatchInterface $route_match) { switch ($route_name) { case 'help.page.quickedit': $output = '

      ' . t('About') . '

      '; - $output .= '

      ' . t('The Quick Edit module allows users with the Access in-place editing and Use contextual links permissions to edit field content without visiting a separate page. For more information, see the online documentation for the Quick Edit module.', array(':handbook_url' => 'https://www.drupal.org/documentation/modules/edit', ':quickedit_permission' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-quickedit')), ':contextual_permission' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-contextual')))) . '

      '; + $output .= '

      ' . t('The Quick Edit module allows users with the Access in-place editing and Use contextual links permissions to edit field content without visiting a separate page. For more information, see the online documentation for the Quick Edit module.', array(':handbook_url' => 'https://www.drupal.org/documentation/modules/edit', ':quickedit_permission' => Url::fromRoute('user.admin_permissions', array(), array('fragment' => 'module-quickedit'))->toString(), ':contextual_permission' => Url::fromRoute('user.admin_permissions', array(), array('fragment' => 'module-contextual'))->toString())) . '

      '; $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Editing content in-place') . '
      '; $output .= '
      '; - $output .= '

      ' . t('To edit content in place, you need to activate quick edit mode for a content item. Activate quick edit mode by choosing Quick edit from the contextual links for an area displaying the content (see the Contextual Links module help for more information about how to use contextual links).', array(':contextual' => \Drupal::url('help.page', array('name' => 'contextual')))) . '

      '; + $output .= '

      ' . t('To edit content in place, you need to activate quick edit mode for a content item. Activate quick edit mode by choosing Quick edit from the contextual links for an area displaying the content (see the Contextual Links module help for more information about how to use contextual links).', array(':contextual' => Url::fromRoute('help.page', array('name' => 'contextual'))->toString())) . '

      '; $output .= '

      ' . t('Once quick edit mode is activated, you will be able to edit the individual fields of your content. In the default theme, with a JavaScript-enabled browser and a mouse, the output of different fields in your content is outlined in blue, a pop-up gives the field name as you hover over the field output, and clicking on a field activates the editor. Closing the pop-up window ends quick edit mode.') . '

      '; $output .= '
      '; $output .= '
      '; diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module index 4c5f98b..53c96a7 100644 --- a/core/modules/rdf/rdf.module +++ b/core/modules/rdf/rdf.module @@ -8,6 +8,7 @@ use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Template\Attribute; use Drupal\rdf\Entity\RdfMapping; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -409,7 +410,7 @@ function rdf_preprocess_username(&$variables) { // a user profile URI for it (only a homepage which cannot be used as user // profile in RDF.) if ($variables['uid'] > 0) { - $variables['attributes']['about'] = \Drupal::url('entity.user.canonical', ['user' => $variables['uid']]); + $variables['attributes']['about'] = Url::fromRoute('entity.user.canonical', ['user' => $variables['uid']])->toString(); } // Add RDF type of user. diff --git a/core/modules/rdf/src/Tests/CommentAttributesTest.php b/core/modules/rdf/src/Tests/CommentAttributesTest.php index 5febcb9..5e184bb 100644 --- a/core/modules/rdf/src/Tests/CommentAttributesTest.php +++ b/core/modules/rdf/src/Tests/CommentAttributesTest.php @@ -7,6 +7,7 @@ use Drupal\comment\Tests\CommentTestBase; use Drupal\user\RoleInterface; use Drupal\comment\Entity\Comment; +use Drupal\Core\Url; /** * Tests the RDFa markup of comments. @@ -53,7 +54,7 @@ protected function setUp() { $this->setCommentSettings('comment_default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Comment paging changed.'); // Prepares commonly used URIs. - $this->baseUri = \Drupal::url('', [], ['absolute' => TRUE]); + $this->baseUri = Url::fromRoute('', [], ['absolute' => TRUE])->toString(); $this->nodeUri = $this->node->url('canonical', ['absolute' => TRUE]); // Set relation between node and comment. @@ -300,7 +301,7 @@ function _testBasicCommentRdfaMarkup($graph, CommentInterface $comment, $account // The comment author can be a registered user or an anonymous user. if ($comment->getOwnerId() > 0) { - $author_uri = \Drupal::url('entity.user.canonical', ['user' => $comment->getOwnerId()], array('absolute' => TRUE)); + $author_uri = Url::fromRoute('entity.user.canonical', ['user' => $comment->getOwnerId()], array('absolute' => TRUE))->toString(); // Comment relation to author. $expected_value = array( 'type' => 'uri', diff --git a/core/modules/rdf/src/Tests/EntityReferenceFieldAttributesTest.php b/core/modules/rdf/src/Tests/EntityReferenceFieldAttributesTest.php index 48653a5..3b077cc 100644 --- a/core/modules/rdf/src/Tests/EntityReferenceFieldAttributesTest.php +++ b/core/modules/rdf/src/Tests/EntityReferenceFieldAttributesTest.php @@ -4,6 +4,7 @@ use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\taxonomy\Tests\TaxonomyTestBase; +use Drupal\Core\Url; /** * Tests RDFa markup generation for taxonomy term fields. @@ -103,7 +104,7 @@ function testNodeTeaser() { // Parse the teaser. $parser = new \EasyRdf_Parser_Rdfa(); $graph = new \EasyRdf_Graph(); - $base_uri = \Drupal::url('', [], ['absolute' => TRUE]); + $base_uri = Url::fromRoute('', [], ['absolute' => TRUE])->toString(); $parser->parse($graph, $html, 'rdfa', $base_uri); // Node relations to taxonomy terms. diff --git a/core/modules/rdf/src/Tests/FileFieldAttributesTest.php b/core/modules/rdf/src/Tests/FileFieldAttributesTest.php index 34e76ae..8777471 100644 --- a/core/modules/rdf/src/Tests/FileFieldAttributesTest.php +++ b/core/modules/rdf/src/Tests/FileFieldAttributesTest.php @@ -4,6 +4,7 @@ use Drupal\file\Tests\FileFieldTestBase; use Drupal\file\Entity\File; +use Drupal\Core\Url; /** * Tests the RDFa markup of filefields. @@ -81,7 +82,7 @@ function testNodeTeaser() { // Parses front page where the node is displayed in its teaser form. $parser = new \EasyRdf_Parser_Rdfa(); $graph = new \EasyRdf_Graph(); - $base_uri = \Drupal::url('', [], ['absolute' => TRUE]); + $base_uri = Url::fromRoute('', [], ['absolute' => TRUE])->toString(); $parser->parse($graph, $html, 'rdfa', $base_uri); $node_uri = $this->node->url('canonical', ['absolute' => TRUE]); diff --git a/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php b/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php index cce663b..179222c 100644 --- a/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php +++ b/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php @@ -6,6 +6,7 @@ use Drupal\image\Tests\ImageFieldTestBase; use Drupal\node\Entity\Node; use Drupal\file\Entity\File; +use Drupal\Core\Url; /** * Tests the RDFa markup of imagefields. @@ -88,7 +89,7 @@ function testNodeTeaser() { // Parse the teaser. $parser = new \EasyRdf_Parser_Rdfa(); $graph = new \EasyRdf_Graph(); - $base_uri = \Drupal::url('', [], ['absolute' => TRUE]); + $base_uri = Url::fromRoute('', [], ['absolute' => TRUE])->toString(); $parser->parse($graph, $html, 'rdfa', $base_uri); // Construct the node and image URIs for testing. diff --git a/core/modules/rdf/src/Tests/NodeAttributesTest.php b/core/modules/rdf/src/Tests/NodeAttributesTest.php index 5c6b267..3b47384 100644 --- a/core/modules/rdf/src/Tests/NodeAttributesTest.php +++ b/core/modules/rdf/src/Tests/NodeAttributesTest.php @@ -3,6 +3,7 @@ namespace Drupal\rdf\Tests; use Drupal\node\Tests\NodeTestBase; +use Drupal\Core\Url; /** * Tests the RDFa markup of Nodes. @@ -48,7 +49,7 @@ function testNodeAttributes() { )); $node_uri = $node->url('canonical', ['absolute' => TRUE]); - $base_uri = \Drupal::url('', [], ['absolute' => TRUE]); + $base_uri = Url::fromRoute('', [], ['absolute' => TRUE])->toString(); // Parses front page where the node is displayed in its teaser form. $parser = new \EasyRdf_Parser_Rdfa(); diff --git a/core/modules/rdf/src/Tests/StandardProfileTest.php b/core/modules/rdf/src/Tests/StandardProfileTest.php index e6c358d..25d179c 100644 --- a/core/modules/rdf/src/Tests/StandardProfileTest.php +++ b/core/modules/rdf/src/Tests/StandardProfileTest.php @@ -109,7 +109,7 @@ protected function setUp() { \Drupal::service('theme_handler')->install(['classy']); \Drupal::service('theme_handler')->setDefault('classy'); - $this->baseUri = \Drupal::url('', [], ['absolute' => TRUE]); + $this->baseUri = Url::fromRoute('', [], ['absolute' => TRUE])->toString(); // Create two test users. $this->adminUser = $this->drupalCreateUser(array( diff --git a/core/modules/rdf/src/Tests/TaxonomyAttributesTest.php b/core/modules/rdf/src/Tests/TaxonomyAttributesTest.php index 6be2c5b..f10e1a8 100644 --- a/core/modules/rdf/src/Tests/TaxonomyAttributesTest.php +++ b/core/modules/rdf/src/Tests/TaxonomyAttributesTest.php @@ -3,6 +3,7 @@ namespace Drupal\rdf\Tests; use Drupal\taxonomy\Tests\TaxonomyTestBase; +use Drupal\Core\Url; /** * Tests the RDFa markup of Taxonomy terms. @@ -49,7 +50,7 @@ function testTaxonomyTermRdfaAttributes() { // Parses the term's page and checks that the RDF output is correct. $parser = new \EasyRdf_Parser_Rdfa(); $graph = new \EasyRdf_Graph(); - $base_uri = \Drupal::url('', [], ['absolute' => TRUE]); + $base_uri = Url::fromRoute('', [], ['absolute' => TRUE])->toString(); $parser->parse($graph, $this->drupalGet('taxonomy/term/' . $term->id()), 'rdfa', $base_uri); // Inspects RDF graph output. diff --git a/core/modules/rdf/src/Tests/UserAttributesTest.php b/core/modules/rdf/src/Tests/UserAttributesTest.php index 232b5b2..4b5a587 100644 --- a/core/modules/rdf/src/Tests/UserAttributesTest.php +++ b/core/modules/rdf/src/Tests/UserAttributesTest.php @@ -3,6 +3,7 @@ namespace Drupal\rdf\Tests; use Drupal\simpletest\WebTestBase; +use Drupal\Core\Url; /** * Tests the RDFa markup of Users. @@ -60,7 +61,7 @@ function testUserAttributesInMarkup() { // should be used. $parser = new \EasyRdf_Parser_Rdfa(); $graph = new \EasyRdf_Graph(); - $base_uri = \Drupal::url('', [], ['absolute' => TRUE]); + $base_uri = Url::fromRoute('', [], ['absolute' => TRUE])->toString(); $parser->parse($graph, $this->drupalGet('user/' . $author->id()), 'rdfa', $base_uri); // Inspects RDF graph output. @@ -85,7 +86,7 @@ function testUserAttributesInMarkup() { // Parses the node created by the user. $parser = new \EasyRdf_Parser_Rdfa(); $graph = new \EasyRdf_Graph(); - $base_uri = \Drupal::url('', [], ['absolute' => TRUE]); + $base_uri = Url::fromRoute('', [], ['absolute' => TRUE])->toString(); $parser->parse($graph, $this->drupalGet('node/' . $node->id()), 'rdfa', $base_uri); // Ensures the default bundle mapping for user is used on the Authored By diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module index 89ac37f..9731d1b 100644 --- a/core/modules/responsive_image/responsive_image.module +++ b/core/modules/responsive_image/responsive_image.module @@ -13,6 +13,7 @@ use Drupal\responsive_image\Entity\ResponsiveImageStyle; use Drupal\Core\Image\ImageInterface; use Drupal\breakpoint\BreakpointInterface; +use Drupal\Core\Url; /** * The machine name for the empty image breakpoint image style option. @@ -32,21 +33,21 @@ function responsive_image_help($route_name, RouteMatchInterface $route_match) { $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Defining responsive image styles') . '
      '; - $output .= '
      ' . t('By creating responsive image styles you define which options the browser has in selecting which image file to display. In most cases this means providing different image sizes based on the viewport size. On the Responsive image styles page, click Add responsive image style to create a new style. First choose a label, a fallback image style and a breakpoint group and click Save.', array(':responsive_image_style' => \Drupal::url('entity.responsive_image_style.collection'))) . '
      '; + $output .= '
      ' . t('By creating responsive image styles you define which options the browser has in selecting which image file to display. In most cases this means providing different image sizes based on the viewport size. On the Responsive image styles page, click Add responsive image style to create a new style. First choose a label, a fallback image style and a breakpoint group and click Save.', array(':responsive_image_style' => Url::fromRoute('entity.responsive_image_style.collection')->toString())) . '
      '; $output .= '
      '; $output .= '
      ' . t('Fallback image style') . '
      '; $output .= '
      ' . t('The fallback image style is typically the smallest size image you expect to appear in this space. Because the responsive images module uses the Picturefill library so that responsive images can work in older browsers, the fallback image should only appear on a site if an error occurs.)
      '); $output .= '
      ' . t('Breakpoint groups: viewport sizing vs art direction') . '
      '; - $output .= '
      ' . t('The breakpoint group typically only needs a single breakpoint with an empty media query in order to do viewport sizing. Multiple breakpoints are used for changing the crop or aspect ratio of images at different viewport sizes, which is often referred to as art direction. Once you select a breakpoint group, you can choose which breakpoints to use for the responsive image style. By default, the option do not use this breakpoint is selected for each breakpoint. See the help page of the Breakpoint module for more information.', array(':breakpoint_help' => \Drupal::url('help.page', array('name' => 'breakpoint')))) . '
      '; + $output .= '
      ' . t('The breakpoint group typically only needs a single breakpoint with an empty media query in order to do viewport sizing. Multiple breakpoints are used for changing the crop or aspect ratio of images at different viewport sizes, which is often referred to as art direction. Once you select a breakpoint group, you can choose which breakpoints to use for the responsive image style. By default, the option do not use this breakpoint is selected for each breakpoint. See the help page of the Breakpoint module for more information.', array(':breakpoint_help' => Url::fromRoute('help.page', array('name' => 'breakpoint'))->toString())) . '
      '; $output .= '
      ' . t('Breakpoint settings: sizes vs image styles') . '
      '; $output .= '
      ' . t('While you have the option to provide only one image style per breakpoint, the sizes option allows you to provide more options to browsers as to which image file it can display, even when using multiple breakpoints for art direction. Breakpoints are defined in the configuration files of the theme.
      '); $output .= '
      ' . t('Sizes field') . '
      '; $output .= '
      ' . t('Once the sizes option is selected, you can let the browser know the size of this image in relation to the site layout, using the Sizes field. For a hero image that always fills the entire screen, you could simply enter 100vw, which means 100% of the viewport width. For an image that fills 90% of the screen for small viewports, but only fills 40% of the screen when the viewport is larger than 40em (typically 640px), you could enter "(min-width: 40em) 40vw, 90vw" in the Sizes field. The last item in the comma-separated list is the smallest viewport size: other items in the comma-separated list should have a media condition paired with an image width. Media conditions are similar to a media query, often a min-width paired with a viewport width using em or px units: e.g. (min-width: 640px) or (min-width: 40em). This is paired with the image width at that viewport size using px, em or vw units. The vw unit is viewport width and is used instead of a percentage because the percentage always refers to the width of the entire viewport.
      '); $output .= '
      ' . t('Image styles for sizes') . '
      '; - $output .= '
      ' . t('Below the Sizes field you can choose multiple image styles so the browser can choose the best image file size to fill the space defined in the Sizes field. Typically you will want to use image styles that resize your image to have options that range from the smallest px width possible for the space the image will appear in to the largest px width possible, with a variety of widths in between. You may want to provide image styles with widths that are 1.5x to 2x the space available in the layout to account for high resolution screens. Image styles can be defined on the Image styles page that is provided by the Image module.', array(':image_styles' => \Drupal::url('entity.image_style.collection'), ':image_help' => \Drupal::url('help.page', array('name' => 'image')))) . '
      '; + $output .= '
      ' . t('Below the Sizes field you can choose multiple image styles so the browser can choose the best image file size to fill the space defined in the Sizes field. Typically you will want to use image styles that resize your image to have options that range from the smallest px width possible for the space the image will appear in to the largest px width possible, with a variety of widths in between. You may want to provide image styles with widths that are 1.5x to 2x the space available in the layout to account for high resolution screens. Image styles can be defined on the Image styles page that is provided by the Image module.', array(':image_styles' => Url::fromRoute('entity.image_style.collection')->toString(), ':image_help' => Url::fromRoute('help.page', array('name' => 'image'))->toString())) . '
      '; $output .= '
      '; $output .= '
      ' . t('Using responsive image styles in Image fields') . '
      '; - $output .= '
      ' . t('After defining responsive image styles, you can use them in the display settings for your Image fields, so that the site displays responsive images using the HTML5 picture tag. Open the Manage display page for the entity type (content type, taxonomy vocabulary, etc.) that the Image field is attached to. Choose the format Responsive image, click the Edit icon, and select one of the responsive image styles that you have created. For general information on how to manage fields and their display see the Field UI module help page. For background information about entities and fields see the Field module help page.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#', ':field_help' => \Drupal::url('help.page', array('name' => 'field')))) . '
      '; + $output .= '
      ' . t('After defining responsive image styles, you can use them in the display settings for your Image fields, so that the site displays responsive images using the HTML5 picture tag. Open the Manage display page for the entity type (content type, taxonomy vocabulary, etc.) that the Image field is attached to. Choose the format Responsive image, click the Edit icon, and select one of the responsive image styles that you have created. For general information on how to manage fields and their display see the Field UI module help page. For background information about entities and fields see the Field module help page.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#', ':field_help' => Url::fromRoute('help.page', array('name' => 'field'))->toString())) . '
      '; $output .= '
      '; return $output; diff --git a/core/modules/responsive_image/src/ResponsiveImageStyleForm.php b/core/modules/responsive_image/src/ResponsiveImageStyleForm.php index 3e5b051..4aa4832 100644 --- a/core/modules/responsive_image/src/ResponsiveImageStyleForm.php +++ b/core/modules/responsive_image/src/ResponsiveImageStyleForm.php @@ -6,6 +6,7 @@ use Drupal\Core\Entity\EntityForm; use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; +use Drupal\Core\Url; /** * Form controller for the responsive image edit/add forms. @@ -125,7 +126,7 @@ public function form(array $form, FormStateInterface $form_state) { ); $image_style_mapping = $responsive_image_style->getImageStyleMapping($breakpoint_id, $multiplier); if (\Drupal::moduleHandler()->moduleExists('help')) { - $description = $this->t('See the Responsive Image help page for information on the sizes attribute.', array(':responsive_image_help' => \Drupal::url('help.page', array('name' => 'responsive_image')))); + $description = $this->t('See the Responsive Image help page for information on the sizes attribute.', array(':responsive_image_help' => Url::fromRoute('help.page', array('name' => 'responsive_image'))->toString())); } else { $description = $this->t('Enable the Help module for more information on the sizes attribute.'); diff --git a/core/modules/rest/rest.module b/core/modules/rest/rest.module index 24e1c5f..2de7116 100644 --- a/core/modules/rest/rest.module +++ b/core/modules/rest/rest.module @@ -6,6 +6,7 @@ */ use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -15,11 +16,11 @@ function rest_help($route_name, RouteMatchInterface $route_match) { case 'help.page.rest': $output = ''; $output .= '

      ' . t('About') . '

      '; - $output .= '

      ' . t('The RESTful Web Services module provides a framework for exposing REST resources on your site. It provides support for content entities (see the Field module help page for more information about entities) such as content, users, taxonomy terms, etc.; REST support for content items of the Node module is enabled by default, and support for other types of content entities can be enabled. Other modules may add support for other types of REST resources. For more information, see the online documentation for the RESTful Web Services module.', array(':rest' => 'https://www.drupal.org/documentation/modules/rest', ':field' => (\Drupal::moduleHandler()->moduleExists('field')) ? \Drupal::url('help.page', array('name' => 'field')) : '#')) . '

      '; + $output .= '

      ' . t('The RESTful Web Services module provides a framework for exposing REST resources on your site. It provides support for content entities (see the Field module help page for more information about entities) such as content, users, taxonomy terms, etc.; REST support for content items of the Node module is enabled by default, and support for other types of content entities can be enabled. Other modules may add support for other types of REST resources. For more information, see the online documentation for the RESTful Web Services module.', array(':rest' => 'https://www.drupal.org/documentation/modules/rest', ':field' => (\Drupal::moduleHandler()->moduleExists('field')) ? Url::fromRoute('help.page', array('name' => 'field'))->toString() : '#')) . '

      '; $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Installing supporting modules') . '
      '; - $output .= '
      ' . t('In order to use REST on a web site, you need to install modules that provide serialization and authentication services. You can use the Core module HAL for serialization and HTTP Basic Authentication for authentication, or install a contributed or custom module.', array(':hal' => (\Drupal::moduleHandler()->moduleExists('hal')) ? \Drupal::url('help.page', array('name' => 'hal')) : '#', ':basic_auth' => (\Drupal::moduleHandler()->moduleExists('basic_auth')) ? \Drupal::url('help.page', array('name' => 'basic_auth')) : '#')) . '
      '; + $output .= '
      ' . t('In order to use REST on a web site, you need to install modules that provide serialization and authentication services. You can use the Core module HAL for serialization and HTTP Basic Authentication for authentication, or install a contributed or custom module.', array(':hal' => (\Drupal::moduleHandler()->moduleExists('hal')) ? Url::fromRoute('help.page', array('name' => 'hal'))->toString() : '#', ':basic_auth' => (\Drupal::moduleHandler()->moduleExists('basic_auth')) ? Url::fromRoute('help.page', array('name' => 'basic_auth'))->toString() : '#')) . '
      '; $output .= '
      ' . t('Enabling REST support for an entity type') . '
      '; $output .= '
      ' . t('REST support for content items of the Node module is enabled by default, and support for other types of content entities can be enabled. To enable support, you can use a process based on configuration editing or the contributed Rest UI module.', array(':config' => 'https://www.drupal.org/documentation/modules/rest', ':restui' => 'https://www.drupal.org/project/restui')) . '
      '; $output .= '
      ' . t('You will also need to grant anonymous users permission to perform each of the REST operations you want to be available, and set up authentication properly to authorize web requests.') . '
      '; diff --git a/core/modules/search/search.module b/core/modules/search/search.module index c36aa44..cdbba31 100644 --- a/core/modules/search/search.module +++ b/core/modules/search/search.module @@ -10,6 +10,7 @@ use Drupal\Core\Cache\Cache; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Matches all 'N' Unicode character classes (numbers) @@ -78,14 +79,14 @@ function search_help($route_name, RouteMatchInterface $route_match) { $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Configuring search pages') . '
      '; - $output .= '
      ' . t('To configure search pages, visit the Search pages page. In the Search pages section, you can add a new search page, edit the configuration of existing search pages, enable and disable search pages, and choose the default search page. Each enabled search page has a URL path starting with search, and each will appear as a tab or local task link on the search page; you can configure the text that is shown in the tab. In addition, some search page plugins have additional settings that you can configure for each search page.', array(':search-settings' => \Drupal::url('entity.search_page.collection'), ':search-url' => \Drupal::url('search.view'))) . '
      '; + $output .= '
      ' . t('To configure search pages, visit the Search pages page. In the Search pages section, you can add a new search page, edit the configuration of existing search pages, enable and disable search pages, and choose the default search page. Each enabled search page has a URL path starting with search, and each will appear as a tab or local task link on the search page; you can configure the text that is shown in the tab. In addition, some search page plugins have additional settings that you can configure for each search page.', array(':search-settings' => Url::fromRoute('entity.search_page.collection')->toString(), ':search-url' => Url::fromRoute('search.view')->toString())) . '
      '; $output .= '
      ' . t('Managing the search index') . '
      '; - $output .= '
      ' . t('Some search page plugins, such as the core Content search page, index searchable text using the Drupal core search index, and will not work unless content is indexed. Indexing is done during cron runs, so it requires a cron maintenance task to be set up. There are also several settings affecting indexing that can be configured on the Search pages page: the number of items to index per cron run, the minimum word length to index, and how to handle Chinese, Japanese, and Korean characters.', array(':cron' => \Drupal::url('system.cron_settings'), ':search-settings' => \Drupal::url('entity.search_page.collection'))) . '
      '; - $output .= '
      ' . t('Modules providing search page plugins generally ensure that content-related actions on your site (creating, editing, or deleting content and comments) automatically cause affected content items to be marked for indexing or reindexing at the next cron run. When content is marked for reindexing, the previous content remains in the index until cron runs, at which time it is replaced by the new content. However, there are some actions related to the structure of your site that do not cause affected content to be marked for reindexing. Examples of structure-related actions that affect content include deleting or editing taxonomy terms, enabling or disabling modules that add text to content (such as Taxonomy, Comment, and field-providing modules), and modifying the fields or display parameters of your content types. If you take one of these actions and you want to ensure that the search index is updated to reflect your changed site structure, you can mark all content for reindexing by clicking the "Re-index site" button on the Search pages page. If you have a lot of content on your site, it may take several cron runs for the content to be reindexed.', array(':search-settings' => \Drupal::url('entity.search_page.collection'))) . '
      '; + $output .= '
      ' . t('Some search page plugins, such as the core Content search page, index searchable text using the Drupal core search index, and will not work unless content is indexed. Indexing is done during cron runs, so it requires a cron maintenance task to be set up. There are also several settings affecting indexing that can be configured on the Search pages page: the number of items to index per cron run, the minimum word length to index, and how to handle Chinese, Japanese, and Korean characters.', array(':cron' => Url::fromRoute('system.cron_settings')->toString(), ':search-settings' => Url::fromRoute('entity.search_page.collection')->toString())) . '
      '; + $output .= '
      ' . t('Modules providing search page plugins generally ensure that content-related actions on your site (creating, editing, or deleting content and comments) automatically cause affected content items to be marked for indexing or reindexing at the next cron run. When content is marked for reindexing, the previous content remains in the index until cron runs, at which time it is replaced by the new content. However, there are some actions related to the structure of your site that do not cause affected content to be marked for reindexing. Examples of structure-related actions that affect content include deleting or editing taxonomy terms, enabling or disabling modules that add text to content (such as Taxonomy, Comment, and field-providing modules), and modifying the fields or display parameters of your content types. If you take one of these actions and you want to ensure that the search index is updated to reflect your changed site structure, you can mark all content for reindexing by clicking the "Re-index site" button on the Search pages page. If you have a lot of content on your site, it may take several cron runs for the content to be reindexed.', array(':search-settings' => Url::fromRoute('entity.search_page.collection')->toString())) . '
      '; $output .= '
      ' . t('Displaying the Search block') . '
      '; - $output .= '
      ' . t('The Search module includes a block, which can be enabled and configured on the Block layout page, if you have the Block module enabled; the default block title is Search, and it is the Search form block in the Forms category, if you wish to add another instance. The block is available to users with the Use search permission, and it performs a search using the configured default search page.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#', ':search_permission' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-search')))) . '
      '; + $output .= '
      ' . t('The Search module includes a block, which can be enabled and configured on the Block layout page, if you have the Block module enabled; the default block title is Search, and it is the Search form block in the Forms category, if you wish to add another instance. The block is available to users with the Use search permission, and it performs a search using the configured default search page.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? Url::fromRoute('block.admin_display')->toString() : '#', ':search_permission' => Url::fromRoute('user.admin_permissions', array(), array('fragment' => 'module-search'))->toString())) . '
      '; $output .= '
      ' . t('Searching your site') . '
      '; - $output .= '
      ' . t('Users with Use search permission can use the Search block and Search page. Users with the View published content permission can use configured search pages of type Content to search for content containing exact keywords; in addition, users with Use advanced search permission can use more complex search filtering. Users with the View user information permission can use configured search pages of type Users to search for active users containing the keyword anywhere in the username, and users with the Administer users permission can search for active and blocked users, by email address or username keyword.', array(':search' => \Drupal::url('search.view'), ':search_permission' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-search')), ':node_permission' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-node')), ':user_permission' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-user')))) . '
      '; + $output .= '
      ' . t('Users with Use search permission can use the Search block and Search page. Users with the View published content permission can use configured search pages of type Content to search for content containing exact keywords; in addition, users with Use advanced search permission can use more complex search filtering. Users with the View user information permission can use configured search pages of type Users to search for active users containing the keyword anywhere in the username, and users with the Administer users permission can search for active and blocked users, by email address or username keyword.', array(':search' => Url::fromRoute('search.view')->toString(), ':search_permission' => Url::fromRoute('user.admin_permissions', array(), array('fragment' => 'module-search'))->toString(), ':node_permission' => Url::fromRoute('user.admin_permissions', array(), array('fragment' => 'module-node'))->toString(), ':user_permission' => Url::fromRoute('user.admin_permissions', array(), array('fragment' => 'module-user'))->toString())) . '
      '; $output .= '
      ' . t('Extending the Search module') . '
      '; $output .= '
      ' . t('By default, the Search module only supports exact keyword matching in content searches. You can modify this behavior by installing a language-specific stemming module for your language (such as Porter Stemmer for American English), which allows words such as walk, walking, and walked to be matched in the Search module. Another approach is to use a third-party search technology with stemming or partial word matching features built in, such as Apache Solr or Sphinx. There are also contributed modules that provide additional search pages. These and other search-related contributed modules can be downloaded by visiting Drupal.org.', array(':contrib-search' => 'https://www.drupal.org/project/project_module?f[2]=im_vid_3%3A105', ':porterstemmer_url' => 'https://www.drupal.org/project/porterstemmer', ':solr_url' => 'https://www.drupal.org/project/apachesolr', ':sphinx_url' => 'https://www.drupal.org/project/sphinx')) . '
      '; $output .= '
      '; diff --git a/core/modules/search/src/SearchPageListBuilder.php b/core/modules/search/src/SearchPageListBuilder.php index afbf54c..89a2a20 100644 --- a/core/modules/search/src/SearchPageListBuilder.php +++ b/core/modules/search/src/SearchPageListBuilder.php @@ -183,7 +183,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#type' => 'details', '#title' => $this->t('Indexing progress'), '#open' => TRUE, - '#description' => $this->t('Only items in the index will appear in search results. To build and maintain the index, a correctly configured cron maintenance task is required.', array(':cron' => \Drupal::url('system.cron_settings'))), + '#description' => $this->t('Only items in the index will appear in search results. To build and maintain the index, a correctly configured cron maintenance task is required.', array(':cron' => Url::fromRoute('system.cron_settings')->toString())), ); $form['status']['status'] = array('#markup' => $status); $form['status']['wipe'] = array( @@ -206,7 +206,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#title' => $this->t('Number of items to index per cron run'), '#default_value' => $search_settings->get('index.cron_limit'), '#options' => $items, - '#description' => $this->t('The maximum number of items indexed in each run of the cron maintenance task. If necessary, reduce the number of items to prevent timeouts and memory errors while indexing. Some search page types may have their own setting for this.', array(':cron' => \Drupal::url('system.cron_settings'))), + '#description' => $this->t('The maximum number of items indexed in each run of the cron maintenance task. If necessary, reduce the number of items to prevent timeouts and memory errors while indexing. Some search page types may have their own setting for this.', array(':cron' => Url::fromRoute('system.cron_settings')->toString())), ); // Indexing settings: $form['indexing_settings'] = array( diff --git a/core/modules/search/src/Tests/SearchBlockTest.php b/core/modules/search/src/Tests/SearchBlockTest.php index 7d42a85..da1108d 100644 --- a/core/modules/search/src/Tests/SearchBlockTest.php +++ b/core/modules/search/src/Tests/SearchBlockTest.php @@ -2,6 +2,8 @@ namespace Drupal\search\Tests; +use Drupal\Core\Url; + /** * Tests if the search form block is available. * @@ -72,7 +74,7 @@ public function testSearchFormBlock() { $entity_id = $search_page_repository->getDefaultSearchPage(); $this->assertEqual( $this->getUrl(), - \Drupal::url('search.view_' . $entity_id, array(), array('query' => array('keys' => $terms['keys']), 'absolute' => TRUE)), + Url::fromRoute('search.view_' . $entity_id, array(), array('query' => array('keys' => $terms['keys']), 'absolute' => TRUE))->toString(), 'Submitted to correct URL.' ); @@ -86,7 +88,7 @@ public function testSearchFormBlock() { // submitted empty. $this->assertEqual( $this->getUrl(), - \Drupal::url('search.view_' . $entity_id, array(), array('query' => array('keys' => ''), 'absolute' => TRUE)), + Url::fromRoute('search.view_' . $entity_id, array(), array('query' => array('keys' => ''), 'absolute' => TRUE))->toString(), 'Redirected to correct URL.' ); diff --git a/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php b/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php index c458b16..3b5450f 100644 --- a/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php +++ b/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php @@ -177,7 +177,7 @@ function testSearchModuleDisabling() { $terms = array('keys' => $info['keys']); $this->submitGetForm('node', $terms, t('Search')); $current = $this->getURL(); - $expected = \Drupal::url('search.view_' . $entity->id(), array(), array('query' => array('keys' => $info['keys']), 'absolute' => TRUE)); + $expected = Url::fromRoute('search.view_' . $entity->id(), array(), array('query' => array('keys' => $info['keys']), 'absolute' => TRUE))->toString(); $this->assertEqual( $current, $expected, 'Block redirected to right search page'); // Try an invalid search path, which should 404. @@ -215,9 +215,9 @@ function testSearchModuleDisabling() { public function testDefaultSearchPageOrdering() { $this->drupalGet('search'); $elements = $this->xpath('//*[contains(@class, :class)]//a', array(':class' => 'tabs primary')); - $this->assertIdentical((string) $elements[0]['href'], \Drupal::url('search.view_node_search')); - $this->assertIdentical((string) $elements[1]['href'], \Drupal::url('search.view_dummy_search_type')); - $this->assertIdentical((string) $elements[2]['href'], \Drupal::url('search.view_user_search')); + $this->assertIdentical((string) $elements[0]['href'], Url::fromRoute('search.view_node_search')->toString()); + $this->assertIdentical((string) $elements[1]['href'], Url::fromRoute('search.view_dummy_search_type')->toString()); + $this->assertIdentical((string) $elements[2]['href'], Url::fromRoute('search.view_user_search')->toString()); } /** diff --git a/core/modules/search/src/Tests/SearchLanguageTest.php b/core/modules/search/src/Tests/SearchLanguageTest.php index cdd0bd4..d959337 100644 --- a/core/modules/search/src/Tests/SearchLanguageTest.php +++ b/core/modules/search/src/Tests/SearchLanguageTest.php @@ -4,6 +4,7 @@ use Drupal\field\Entity\FieldStorageConfig; use Drupal\language\Entity\ConfigurableLanguage; +use Drupal\Core\Url; /** * Tests advanced search with different languages added. @@ -100,7 +101,7 @@ function testLanguages() { // Ensure selecting no language does not make the query different. $this->drupalPostForm('search/node', array(), t('Advanced search')); - $this->assertUrl(\Drupal::url('search.view_node_search', [], ['query' => ['keys' => ''], 'absolute' => TRUE]), [], 'Correct page redirection, no language filtering.'); + $this->assertUrl(Url::fromRoute('search.view_node_search', [], ['query' => ['keys' => ''], 'absolute' => TRUE])->toString(), [], 'Correct page redirection, no language filtering.'); // Pick French and ensure it is selected. $edit = array('language[fr]' => TRUE); diff --git a/core/modules/serialization/serialization.module b/core/modules/serialization/serialization.module index 39c5fbf..f4d49b2 100644 --- a/core/modules/serialization/serialization.module +++ b/core/modules/serialization/serialization.module @@ -6,6 +6,7 @@ */ use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -18,7 +19,7 @@ function serialization_help($route_name, RouteMatchInterface $route_match) { $output .= '

      ' . t('The Serialization module provides a service for serializing and deserializing data to and from formats such as JSON and XML.') . '

      '; $output .= '

      ' . t('Serialization is the process of converting data structures like arrays and objects into a string. This allows the data to be represented in a way that is easy to exchange and store (for example, for transmission over the Internet or for storage in a local file system). These representations can then be deserialized to get back to the original data structures.') . '

      '; $output .= '

      ' . t('The serializer splits this process into two parts. Normalization converts an object to a normalized array structure. Encoding takes that array and converts it to a string.') . '

      '; - $output .= '

      ' . t('This module does not have a user interface. It is used by other modules which need to serialize data, such as REST.', array(':rest' => (\Drupal::moduleHandler()->moduleExists('rest')) ? \Drupal::url('help.page', array('name' => 'rest')) : '#')) . '

      '; + $output .= '

      ' . t('This module does not have a user interface. It is used by other modules which need to serialize data, such as REST.', array(':rest' => (\Drupal::moduleHandler()->moduleExists('rest')) ? Url::fromRoute('help.page', array('name' => 'rest'))->toString() : '#')) . '

      '; $output .= '

      ' . t('For more information, see the online documentation for the Serialization module.', array(':doc_url' => 'https://www.drupal.org/documentation/modules/serialization')) . '

      '; return $output; } diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module index 066afcc..579de10 100644 --- a/core/modules/shortcut/shortcut.module +++ b/core/modules/shortcut/shortcut.module @@ -23,13 +23,13 @@ function shortcut_help($route_name, RouteMatchInterface $route_match) { $output .= '

      ' . t('The Shortcut module allows users to create sets of shortcut links to commonly-visited pages of the site. Shortcuts are contained within sets. Each user with Select any shortcut set permission can select a shortcut set created by anyone at the site. For more information, see the online documentation for the Shortcut module.', array(':shortcut' => 'https://www.drupal.org/documentation/modules/shortcut')) . '

      '; $output .= '

      ' . t('Uses') . '

      '; $output .= '
      ' . t('Administering shortcuts') . '
      '; - $output .= '
      ' . t('Users with the Administer shortcuts permission can manage shortcut sets and edit the shortcuts within sets from the Shortcuts administration page.', array(':shortcuts' => \Drupal::url('entity.shortcut_set.collection'))) . '
      '; + $output .= '
      ' . t('Users with the Administer shortcuts permission can manage shortcut sets and edit the shortcuts within sets from the Shortcuts administration page.', array(':shortcuts' => url::fromRoute('entity.shortcut_set.collection')->toString())) . '
      '; $output .= '
      ' . t('Choosing shortcut sets') . '
      '; $output .= '
      ' . t('Users with permission to switch shortcut sets can choose a shortcut set to use from the Shortcuts tab of their user account page.') . '
      '; $output .= '
      ' . t('Adding and removing shortcuts') . '
      '; $output .= '
      ' . t('The Shortcut module creates an add/remove link for each page on your site; the link lets you add or remove the current page from the currently-enabled set of shortcuts (if your theme displays it and you have permission to edit your shortcut set). The core Seven administration theme displays this link next to the page title, as a grey or yellow star. If you click on the grey star, you will add that page to your preferred set of shortcuts. If the page is already part of your shortcut set, the link will be a yellow star, and will allow you to remove the current page from your shortcut set.') . '
      '; $output .= '
      ' . t('Displaying shortcuts') . '
      '; - $output .= '
      ' . t('You can display your shortcuts by enabling the Shortcuts block on the Blocks administration page. Certain administrative modules also display your shortcuts; for example, the core Toolbar module provides a corresponding menu item.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#', ':toolbar-help' => (\Drupal::moduleHandler()->moduleExists('toolbar')) ? \Drupal::url('help.page', array('name' => 'toolbar')) : '#')) . '
      '; + $output .= '
      ' . t('You can display your shortcuts by enabling the Shortcuts block on the Blocks administration page. Certain administrative modules also display your shortcuts; for example, the core Toolbar module provides a corresponding menu item.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? Url::fromRoute('block.admin_display')->toString() : '#', ':toolbar-help' => (\Drupal::moduleHandler()->moduleExists('toolbar')) ? Url::fromRoute('help.page', array('name' => 'toolbar'))->toString() : '#')) . '
      '; $output .= '
      '; return $output; @@ -38,7 +38,7 @@ function shortcut_help($route_name, RouteMatchInterface $route_match) { case 'entity.shortcut_set.edit_form': $user = \Drupal::currentUser(); if ($user->hasPermission('access shortcuts') && $user->hasPermission('switch shortcut sets')) { - $output = '

      ' . t('Define which shortcut set you are using on the Shortcuts tab of your account page.', array(':shortcut-link' => \Drupal::url('shortcut.set_switch', array('user' => $user->id())))) . '

      '; + $output = '

      ' . t('Define which shortcut set you are using on the Shortcuts tab of your account page.', array(':shortcut-link' => Url::fromRoute('shortcut.set_switch', array('user' => $user->id()))->toString())) . '

      '; return $output; } } diff --git a/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php b/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php index 5458217..c98bbf8 100644 --- a/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php +++ b/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php @@ -5,6 +5,7 @@ use Drupal\content_translation\Tests\ContentTranslationUITestBase; use Drupal\Core\Entity\EntityChangedInterface; use Drupal\Core\Language\Language; +use Drupal\Core\Url; /** * Tests the shortcut translation UI. diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module index d8b653e..3c756d2 100644 --- a/core/modules/simpletest/simpletest.module +++ b/core/modules/simpletest/simpletest.module @@ -13,6 +13,7 @@ use Drupal\Core\Test\TestDatabase; use Drupal\simpletest\TestDiscovery; use Symfony\Component\Process\PhpExecutableFinder; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -26,7 +27,7 @@ function simpletest_help($route_name, RouteMatchInterface $route_match) { $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Running tests') . '
      '; - $output .= '

      ' . t('Visit the Testing page to display a list of available tests. For comprehensive testing, select all tests, or individually select tests for more targeted testing. Note that it might take several minutes for all tests to complete.', array(':admin-simpletest' => \Drupal::url('simpletest.test_form'))) . '

      '; + $output .= '

      ' . t('Visit the Testing page to display a list of available tests. For comprehensive testing, select all tests, or individually select tests for more targeted testing. Note that it might take several minutes for all tests to complete.', array(':admin-simpletest' => Url::fromRoute('simpletest.test_form')->toString())) . '

      '; $output .= '

      ' . t('After the tests run, a message will be displayed next to each test group indicating whether tests within it passed, failed, or had exceptions. A pass means that the test returned the expected results, while fail means that it did not. An exception normally indicates an error outside of the test, such as a PHP warning or notice. If there were failures or exceptions, the results will be expanded to show details, and the tests that had failures or exceptions will be indicated in red or pink rows. You can then use these results to refine your code and tests, until all tests pass.') . '

      '; $output .= '
      '; return $output; diff --git a/core/modules/simpletest/src/Tests/BrowserTest.php b/core/modules/simpletest/src/Tests/BrowserTest.php index f98fe48..2d8a932 100644 --- a/core/modules/simpletest/src/Tests/BrowserTest.php +++ b/core/modules/simpletest/src/Tests/BrowserTest.php @@ -3,6 +3,7 @@ namespace Drupal\simpletest\Tests; use Drupal\simpletest\WebTestBase; +use Drupal\Core\Url; /** * Tests the internal browser of the testing framework. @@ -41,7 +42,7 @@ function testGetAbsoluteUrl() { $url = 'user/login'; $this->drupalGet($url); - $absolute = \Drupal::url('user.login', array(), array('absolute' => TRUE)); + $absolute = Url::fromRoute('user.login', array(), array('absolute' => TRUE))->toString(); $this->assertEqual($absolute, $this->url, 'Passed and requested URL are equal.'); $this->assertEqual($this->url, $this->getAbsoluteUrl($this->url), 'Requested and returned absolute URL are equal.'); @@ -50,7 +51,7 @@ function testGetAbsoluteUrl() { $this->assertEqual($this->url, $this->getAbsoluteUrl($this->url), 'Requested and returned absolute URL are equal.'); $this->clickLink('Create new account'); - $absolute = \Drupal::url('user.register', array(), array('absolute' => TRUE)); + $absolute = Url::fromRoute('user.register', array(), array('absolute' => TRUE))->toString(); $this->assertEqual($absolute, $this->url, 'Passed and requested URL are equal.'); $this->assertEqual($this->url, $this->getAbsoluteUrl($this->url), 'Requested and returned absolute URL are equal.'); } diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module index 5079e43..7f68025 100644 --- a/core/modules/statistics/statistics.module +++ b/core/modules/statistics/statistics.module @@ -23,9 +23,9 @@ function statistics_help($route_name, RouteMatchInterface $route_match) { $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Displaying popular content') . '
      '; - $output .= '
      ' . t('The module includes a Popular content block that displays the most viewed pages today and for all time, and the last content viewed. To use the block, enable Count content views on the Statistics page, and then you can enable and configure the block on the Block layout page.', array(':statistics-settings' => \Drupal::url('statistics.settings'), ':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '
      '; + $output .= '
      ' . t('The module includes a Popular content block that displays the most viewed pages today and for all time, and the last content viewed. To use the block, enable Count content views on the Statistics page, and then you can enable and configure the block on the Block layout page.', array(':statistics-settings' => Url::fromRoute('statistics.settings')->toString(), ':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? Url::fromRoute('block.admin_display')->toString() : '#')) . '
      '; $output .= '
      ' . t('Page view counter') . '
      '; - $output .= '
      ' . t('The Statistics module includes a counter for each page that increases whenever the page is viewed. To use the counter, enable Count content views on the Statistics page, and set the necessary permissions (View content hits) so that the counter is visible to the users.', array(':statistics-settings' => \Drupal::url('statistics.settings'), ':permissions' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-statistics')))) . '
      '; + $output .= '
      ' . t('The Statistics module includes a counter for each page that increases whenever the page is viewed. To use the counter, enable Count content views on the Statistics page, and set the necessary permissions (View content hits) so that the counter is visible to the users.', array(':statistics-settings' => Url::fromRoute('statistics.settings')->toString(), ':permissions' => Url::fromRoute('user.admin_permissions', array(), array('fragment' => 'module-statistics'))->toString())) . '
      '; $output .= '
      '; return $output; diff --git a/core/modules/system/src/Tests/Form/RedirectTest.php b/core/modules/system/src/Tests/Form/RedirectTest.php index 6b6d360..8440e58 100644 --- a/core/modules/system/src/Tests/Form/RedirectTest.php +++ b/core/modules/system/src/Tests/Form/RedirectTest.php @@ -3,6 +3,7 @@ namespace Drupal\system\Tests\Form; use Drupal\simpletest\WebTestBase; +use Drupal\Core\Url; /** * Tests form redirection functionality. @@ -87,7 +88,7 @@ public function testRedirectFromErrorPages() { // Visit page 'foo' (404 page) and submit the form. Verify it ends up // at the right URL. - $expected = \Drupal::url('form_test.route1', array(), array('query' => array('test1' => 'test2'), 'absolute' => TRUE)); + $expected = Url::fromRoute('form_test.route1', array(), array('query' => array('test1' => 'test2'), 'absolute' => TRUE))->toString(); $this->drupalGet('foo'); $this->assertResponse(404); $this->drupalPostForm(NULL, array(), t('Submit')); diff --git a/core/modules/system/src/Tests/System/DateTimeTest.php b/core/modules/system/src/Tests/System/DateTimeTest.php index 9ca050f..c6f8a61 100644 --- a/core/modules/system/src/Tests/System/DateTimeTest.php +++ b/core/modules/system/src/Tests/System/DateTimeTest.php @@ -91,7 +91,7 @@ function testDateFormatConfiguration() { 'date_format_pattern' => $date_format, ); $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format')); - $this->assertUrl(\Drupal::url('entity.date_format.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.'); + $this->assertUrl(Url::fromRoute('entity.date_format.collection', [], ['absolute' => TRUE])->toString(), [], 'Correct page redirection.'); $this->assertText(t('Custom date format added.'), 'Date format added confirmation message appears.'); $this->assertText($name, 'Custom date format appears in the date format list.'); $this->assertText(t('Delete'), 'Delete link for custom date format appears.'); @@ -110,13 +110,13 @@ function testDateFormatConfiguration() { 'date_format_pattern' => 'Y m', ); $this->drupalPostForm($this->getUrl(), $edit, t('Save format')); - $this->assertUrl(\Drupal::url('entity.date_format.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.'); + $this->assertUrl(Url::fromRoute('entity.date_format.collection', [], ['absolute' => TRUE])->toString(), [], 'Correct page redirection.'); $this->assertText(t('Custom date format updated.'), 'Custom date format successfully updated.'); // Delete custom date format. $this->clickLink(t('Delete')); $this->drupalPostForm('admin/config/regional/date-time/formats/manage/' . $date_format_id . '/delete', array(), t('Delete')); - $this->assertUrl(\Drupal::url('entity.date_format.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.'); + $this->assertUrl(Url::fromRoute('entity.date_format.collection', [], ['absolute' => TRUE])->toString(), [], 'Correct page redirection.'); $this->assertRaw(t('The date format %format has been deleted.', array('%format' => $name)), 'Custom date format removed.'); // Make sure the date does not exist in config. @@ -133,7 +133,7 @@ function testDateFormatConfiguration() { 'date_format_pattern' => $date_format, ); $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format')); - $this->assertUrl(\Drupal::url('entity.date_format.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.'); + $this->assertUrl(Url::fromRoute('entity.date_format.collection', [], ['absolute' => TRUE])->toString(), [], 'Correct page redirection.'); $this->assertText(t('Custom date format added.'), 'Date format added confirmation message appears.'); $this->assertText($name, 'Custom date format appears in the date format list.'); $this->assertText(t('Delete'), 'Delete link for custom date format appears.'); @@ -158,7 +158,7 @@ function testDateFormatConfiguration() { 'date_format_pattern' => $date_format, ); $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format')); - $this->assertUrl(\Drupal::url('entity.date_format.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.'); + $this->assertUrl(Url::fromRoute('entity.date_format.collection', [], ['absolute' => TRUE])->toString(), [], 'Correct page redirection.'); $this->assertText(t('Custom date format added.'), 'Date format added confirmation message appears.'); $this->assertText($name, 'Custom date format appears in the date format list.'); $this->assertEscaped('' . date("Y") . ''); diff --git a/core/modules/system/src/Tests/System/SiteMaintenanceTest.php b/core/modules/system/src/Tests/System/SiteMaintenanceTest.php index 6a86083..1153348 100644 --- a/core/modules/system/src/Tests/System/SiteMaintenanceTest.php +++ b/core/modules/system/src/Tests/System/SiteMaintenanceTest.php @@ -49,7 +49,7 @@ protected function testSiteMaintenance() { ); $this->drupalPostForm('admin/config/development/maintenance', $edit, t('Save configuration')); - $admin_message = t('Operating in maintenance mode. Go online.', array(':url' => \Drupal::url('system.site_maintenance_mode'))); + $admin_message = t('Operating in maintenance mode. Go online.', array(':url' => Url::fromRoute('system.site_maintenance_mode')->toString())); $user_message = t('Operating in maintenance mode.'); $offline_message = t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => $this->config('system.site')->get('name'))); diff --git a/core/modules/system/system.install b/core/modules/system/system.install index cdaeba6..4db47d9 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -496,10 +496,10 @@ function system_requirements($phase) { ], ]; } - $cron_url = \Drupal::url('system.cron', ['key' => \Drupal::state()->get('system.cron_key'), ['absolute' => TRUE]]); + $cron_url = Url::fromRoute('system.cron', ['key' => \Drupal::state()->get('system.cron_key'), ['absolute' => TRUE]])->toString(); $requirements['cron']['description'][] = [ [ - '#markup' => t('You can run cron manually.', [':cron' => \Drupal::url('system.run_cron')]), + '#markup' => t('You can run cron manually.', [':cron' => Url::fromRoute('system.run_cron')->toString()]), ], [ '#prefix' => '
      ', @@ -588,7 +588,7 @@ function system_requirements($phase) { } // The files directory requirement check is done only during install and runtime. if ($phase == 'runtime') { - $description = t('You may need to set the correct directory at the file system settings page or change the current directory\'s permissions so that it is writable.', array(':admin-file-system' => \Drupal::url('system.file_system_settings'))); + $description = t('You may need to set the correct directory at the file system settings page or change the current directory\'s permissions so that it is writable.', array(':admin-file-system' => Url::fromRoute('system.file_system_settings')->toString())); } elseif ($phase == 'install') { // For the installer UI, we need different wording. 'value' will @@ -652,7 +652,7 @@ function system_requirements($phase) { if ($has_pending_updates) { $requirements['update']['severity'] = REQUIREMENT_ERROR; $requirements['update']['value'] = t('Out of date'); - $requirements['update']['description'] = t('Some modules have database schema updates to install. You should run the database update script immediately.', array(':update' => \Drupal::url('system.db_update'))); + $requirements['update']['description'] = t('Some modules have database schema updates to install. You should run the database update script immediately.', array(':update' => Url::fromRoute('system.db_update')->toString())); } $requirements['entity_update'] = [ @@ -755,7 +755,7 @@ function system_requirements($phase) { 'severity' => REQUIREMENT_WARNING, 'description' => t('Update notifications are not enabled. It is highly recommended that you enable the Update Manager module from the module administration page in order to stay up-to-date on new releases. For more information, Update status handbook page.', array( ':update' => 'https://www.drupal.org/documentation/modules/update', - ':module' => \Drupal::url('system.modules_list'), + ':module' => Url::fromRoute('system.modules_list')->toString(), )), ); } diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 738b52e..d80d7b2 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -84,25 +84,25 @@ function system_help($route_name, RouteMatchInterface $route_match) { $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Managing modules') . '
      '; - $output .= '
      ' . t('Users with appropriate permission can install and uninstall modules from the Extend page. Depending on which distribution or installation profile you choose when you install your site, several modules are installed and others are provided but not installed. Each module provides a discrete set of features; modules may be installed or uninstalled depending on the needs of the site. Many additional modules contributed by members of the Drupal community are available for download from the Drupal.org module page. Note that uninstalling a module is a destructive action: when you uninstall a module, you will permanently lose all data connected to the module.', array(':modules' => \Drupal::url('system.modules_list'), ':drupal-modules' => 'https://www.drupal.org/project/modules')) . '
      '; + $output .= '
      ' . t('Users with appropriate permission can install and uninstall modules from the Extend page. Depending on which distribution or installation profile you choose when you install your site, several modules are installed and others are provided but not installed. Each module provides a discrete set of features; modules may be installed or uninstalled depending on the needs of the site. Many additional modules contributed by members of the Drupal community are available for download from the Drupal.org module page. Note that uninstalling a module is a destructive action: when you uninstall a module, you will permanently lose all data connected to the module.', array(':modules' => Url::fromRoute('system.modules_list')->toString(), ':drupal-modules' => 'https://www.drupal.org/project/modules')) . '
      '; $output .= '
      ' . t('Managing themes') . '
      '; - $output .= '
      ' . t('Users with appropriate permission can install and uninstall themes on the Appearance page. Themes determine the design and presentation of your site. Depending on which distribution or installation profile you choose when you install your site, a default theme is installed, and possibly a different theme for administration pages. Other themes are provided but not installed, and additional contributed themes are available at the Drupal.org theme page.', array(':themes' => \Drupal::url('system.themes_page'), ':drupal-themes' => 'https://www.drupal.org/project/themes')) . '
      '; + $output .= '
      ' . t('Users with appropriate permission can install and uninstall themes on the Appearance page. Themes determine the design and presentation of your site. Depending on which distribution or installation profile you choose when you install your site, a default theme is installed, and possibly a different theme for administration pages. Other themes are provided but not installed, and additional contributed themes are available at the Drupal.org theme page.', array(':themes' => Url::fromRoute('system.themes_page')->toString(), ':drupal-themes' => 'https://www.drupal.org/project/themes')) . '
      '; $output .= '
      ' . t('Disabling drag-and-drop functionality') . '
      '; $output .= '
      ' . t('The default drag-and-drop user interface for ordering tables in the administrative interface presents a challenge for some users, including users of screen readers and other assistive technology. The drag-and-drop interface can be disabled in a table by clicking a link labeled "Show row weights" above the table. The replacement interface allows users to order the table by choosing numerical weights instead of dragging table rows.') . '
      '; $output .= '
      ' . t('Configuring basic site settings') . '
      '; - $output .= '
      ' . t('The System module provides pages for managing basic site configuration, including Date and time formats and Basic site settings (site name, email address to send mail from, home page, and error pages). Additional configuration pages are listed on the main Configuration page.', array(':date-time-settings' => \Drupal::url('entity.date_format.collection'), ':site-info' => \Drupal::url('system.site_information_settings'), ':config' => \Drupal::url('system.admin_config'))) . '
      '; + $output .= '
      ' . t('The System module provides pages for managing basic site configuration, including Date and time formats and Basic site settings (site name, email address to send mail from, home page, and error pages). Additional configuration pages are listed on the main Configuration page.', array(':date-time-settings' => Url::fromRoute('entity.date_format.collection')->toString(), ':site-info' => Url::fromRoute('system.site_information_settings')->toString(), ':config' => Url::fromRoute('system.admin_config')->toString())) . '
      '; $output .= '
      ' . t('Checking site status') . '
      '; - $output .= '
      ' . t('The Status report provides an overview of the configuration, status, and health of your site. Review this report to make sure there are not any problems to address, and to find information about the software your site and web server are using.', array(':status' => \Drupal::url('system.status'))) . '
      '; + $output .= '
      ' . t('The Status report provides an overview of the configuration, status, and health of your site. Review this report to make sure there are not any problems to address, and to find information about the software your site and web server are using.', array(':status' => Url::fromRoute('system.status')->toString())) . '
      '; $output .= '
      ' . t('Using maintenance mode') . '
      '; - $output .= '
      ' . t('When you are performing site maintenance, you can prevent non-administrative users (including anonymous visitors) from viewing your site by putting it in Maintenance mode. This will prevent unauthorized users from making changes to the site while you are performing maintenance, or from seeing a broken site while updates are in progress.', array(':maintenance-mode' => \Drupal::url('system.site_maintenance_mode'))) . '
      '; + $output .= '
      ' . t('When you are performing site maintenance, you can prevent non-administrative users (including anonymous visitors) from viewing your site by putting it in Maintenance mode. This will prevent unauthorized users from making changes to the site while you are performing maintenance, or from seeing a broken site while updates are in progress.', array(':maintenance-mode' => Url::fromRoute('system.site_maintenance_mode')->toString())) . '
      '; $output .= '
      ' . t('Configuring for performance') . '
      '; - $output .= '
      ' . t('On the Performance page, the site can be configured to aggregate CSS and JavaScript files, making the total request size smaller. Note that, for small- to medium-sized websites, the Internal Page Cache module should be installed so that pages are efficiently cached and reused for anonymous users. Finally, for websites of all sizes, the Dynamic Page Cache module should also be installed so that the non-personalized parts of pages are efficiently cached (for all users).', array(':performance-page' => \Drupal::url('system.performance_settings'), ':page-cache' => (\Drupal::moduleHandler()->moduleExists('page_cache')) ? \Drupal::url('help.page', array('name' => 'page_cache')) : '#', ':dynamic-page-cache' => (\Drupal::moduleHandler()->moduleExists('dynamic_page_cache')) ? \Drupal::url('help.page', array('name' => 'dynamic_page_cache')) : '#')) . '
      '; + $output .= '
      ' . t('On the Performance page, the site can be configured to aggregate CSS and JavaScript files, making the total request size smaller. Note that, for small- to medium-sized websites, the Internal Page Cache module should be installed so that pages are efficiently cached and reused for anonymous users. Finally, for websites of all sizes, the Dynamic Page Cache module should also be installed so that the non-personalized parts of pages are efficiently cached (for all users).', array(':performance-page' => Url::fromRoute('system.performance_settings')->toString(), ':page-cache' => (\Drupal::moduleHandler()->moduleExists('page_cache')) ? Url::fromRoute('help.page', array('name' => 'page_cache'))->toString() : '#', ':dynamic-page-cache' => (\Drupal::moduleHandler()->moduleExists('dynamic_page_cache')) ? Url::fromRoute('help.page', array('name' => 'dynamic_page_cache'))->toString() : '#')) . '
      '; $output .= '
      ' . t('Configuring cron') . '
      '; - $output .= '
      ' . t('In order for the site and its modules to continue to operate well, a set of routine administrative operations must run on a regular basis; these operations are known as cron tasks. On the Cron page, you can configure cron to run periodically as part of server responses by installing the Automated Cron module, or you can turn this off and trigger cron from an outside process on your web server. You can verify the status of cron tasks by visiting the Status report page. For more information, see the online documentation for configuring cron jobs.', array(':status' => \Drupal::url('system.status'), ':handbook' => 'https://www.drupal.org/cron', ':cron' => \Drupal::url('system.cron_settings'))) . '
      '; + $output .= '
      ' . t('In order for the site and its modules to continue to operate well, a set of routine administrative operations must run on a regular basis; these operations are known as cron tasks. On the Cron page, you can configure cron to run periodically as part of server responses by installing the Automated Cron module, or you can turn this off and trigger cron from an outside process on your web server. You can verify the status of cron tasks by visiting the Status report page. For more information, see the online documentation for configuring cron jobs.', array(':status' => url::fromRoute('system.status')->toString(), ':handbook' => 'https://www.drupal.org/cron', ':cron' => Url::fromRoute('system.cron_settings')->toString())) . '
      '; $output .= '
      ' . t('Configuring the file system') . '
      '; - $output .= '
      ' . t('Your site has several file directories, which are used to store and process uploaded and generated files. The public file directory, which is configured in your settings.php file, is the default place for storing uploaded files. Links to files in this directory contain the direct file URL, so when the files are requested, the web server will send them directly without invoking your site code. This means that the files can be downloaded by anyone with the file URL, so requests are not access-controlled but they are efficient. The private file directory, also configured in your settings.php file and ideally located outside the site web root, is access controlled. Links to files in this directory are not direct, so requests to these files are mediated by your site code. This means that your site can check file access permission for each file before deciding to fulfill the request, so the requests are more secure, but less efficient. You should only use the private storage for files that need access control, not for files like your site logo and background images used on every page. The temporary file directory is used internally by your site code for various operations, and is configured on the File system settings page. You can also see the configured public and private file directories on this page, and choose whether public or private should be the default for uploaded files.', array(':file-system' => \Drupal::url('system.file_system_settings'))) . '
      '; + $output .= '
      ' . t('Your site has several file directories, which are used to store and process uploaded and generated files. The public file directory, which is configured in your settings.php file, is the default place for storing uploaded files. Links to files in this directory contain the direct file URL, so when the files are requested, the web server will send them directly without invoking your site code. This means that the files can be downloaded by anyone with the file URL, so requests are not access-controlled but they are efficient. The private file directory, also configured in your settings.php file and ideally located outside the site web root, is access controlled. Links to files in this directory are not direct, so requests to these files are mediated by your site code. This means that your site can check file access permission for each file before deciding to fulfill the request, so the requests are more secure, but less efficient. You should only use the private storage for files that need access control, not for files like your site logo and background images used on every page. The temporary file directory is used internally by your site code for various operations, and is configured on the File system settings page. You can also see the configured public and private file directories on this page, and choose whether public or private should be the default for uploaded files.', array(':file-system' => Url::fromRoute('system.file_system_settings')->toString())) . '
      '; $output .= '
      ' . t('Configuring the image toolkit') . '
      '; - $output .= '
      ' . t('On the Image toolkit page, you can select and configure the PHP toolkit used to manipulate images. Depending on which distribution or installation profile you choose when you install your site, the GD2 toolkit and possibly others are included; other toolkits may be provided by contributed modules.', array(':toolkit' => \Drupal::url('system.image_toolkit_settings'))) . '
      '; + $output .= '
      ' . t('On the Image toolkit page, you can select and configure the PHP toolkit used to manipulate images. Depending on which distribution or installation profile you choose when you install your site, the GD2 toolkit and possibly others are included; other toolkits may be provided by contributed modules.', array(':toolkit' => Url::fromRoute('system.image_toolkit_settings')->toString())) . '
      '; $output .= '
      '; return $output; @@ -112,7 +112,7 @@ function system_help($route_name, RouteMatchInterface $route_match) { case 'system.themes_page': $output = '

      ' . t('Set and configure the default theme for your website. Alternative themes are available.', array(':themes' => 'https://www.drupal.org/project/themes')) . '

      '; if (\Drupal::moduleHandler()->moduleExists('block')) { - $output .= '

      ' . t('You can place blocks for each theme on the block layout page.', array(':blocks' => \Drupal::url('block.admin_display'))) . '

      '; + $output .= '

      ' . t('You can place blocks for each theme on the block layout page.', array(':blocks' => Url::fromRoute('block.admin_display')->toString())) . '

      '; } return $output; @@ -127,7 +127,7 @@ function system_help($route_name, RouteMatchInterface $route_match) { case 'system.modules_list': $output = '

      ' . t('Download additional contributed modules to extend your site\'s functionality.', array(':modules' => 'https://www.drupal.org/project/modules')) . '

      '; if (!\Drupal::moduleHandler()->moduleExists('update')) { - $output .= '

      ' . t('Regularly review available updates to maintain a secure and current site. Always run the update script each time a module is updated. Enable the Update Manager module to update and install modules and themes.', array(':update-php' => \Drupal::url('system.db_update'), ':update-manager' => \Drupal::url('system.modules_list', [], ['fragment' => 'module-update']))) . '

      '; + $output .= '

      ' . t('Regularly review available updates to maintain a secure and current site. Always run the update script each time a module is updated. Enable the Update Manager module to update and install modules and themes.', array(':update-php' => Url::fromRoute('system.db_update')->toString(), ':update-manager' => Url::fromRoute('system.modules_list', [], ['fragment' => 'module-update'])->toString())) . '

      '; } return $output; diff --git a/core/modules/system/system.tokens.inc b/core/modules/system/system.tokens.inc index 66b5c7f..da5bab6 100644 --- a/core/modules/system/system.tokens.inc +++ b/core/modules/system/system.tokens.inc @@ -9,6 +9,7 @@ use Drupal\Core\Datetime\Entity\DateFormat; use Drupal\Core\Render\BubbleableMetadata; +use Drupal\Core\Url; /** * Implements hook_token_info(). @@ -129,21 +130,21 @@ function system_tokens($type, $tokens, array $data, array $options, BubbleableMe case 'url': /** @var \Drupal\Core\GeneratedUrl $result */ - $result = \Drupal::url('', array(), $url_options, TRUE); + $result = Url::fromRoute('', array(), $url_options, TRUE)->toString(); $bubbleable_metadata->addCacheableDependency($result); $replacements[$original] = $result->getGeneratedUrl(); break; case 'url-brief': /** @var \Drupal\Core\GeneratedUrl $result */ - $result = \Drupal::url('', array(), $url_options, TRUE); + $result = Url::fromRoute('', array(), $url_options, TRUE)->toString(); $bubbleable_metadata->addCacheableDependency($result); $replacements[$original] = preg_replace(array('!^https?://!', '!/$!'), '', $result->getGeneratedUrl()); break; case 'login-url': /** @var \Drupal\Core\GeneratedUrl $result */ - $result = \Drupal::url('user.page', [], $url_options, TRUE); + $result = Url::fromRoute('user.page', [], $url_options, TRUE)->toString(); $bubbleable_metadata->addCacheableDependency($result); $replacements[$original] = $result->getGeneratedUrl(); break; diff --git a/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php b/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php index 6048769..b0a946c 100644 --- a/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php +++ b/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php @@ -4,6 +4,7 @@ use Drupal\Core\Form\FormBase; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Url; /** * Dummy form for testing DialogRenderer with _form routes. @@ -22,7 +23,7 @@ public function getFormId() { */ public function buildForm(array $form, FormStateInterface $form_state) { - $form['#action'] = \Drupal::url('ajax_test.dialog'); + $form['#action'] = Url::fromRoute('ajax_test.dialog')->toString(); $form['description'] = array( '#markup' => '

      ' . $this->t("Ajax Form contents description.") . '

      ', diff --git a/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php b/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php index 040cf1a..9406da5 100644 --- a/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php +++ b/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php @@ -6,6 +6,7 @@ use Drupal\Component\Utility\Html; use Drupal\Component\Utility\Xss; use Drupal\Core\Render\BubbleableMetadata; +use Drupal\Core\Url; /** * Generates text using placeholders for dummy content to check token @@ -102,9 +103,9 @@ public function testSystemSiteTokenReplacement() { $tests['[site:name]'] = Html::escape($config->get('name')); $tests['[site:slogan]'] = $safe_slogan; $tests['[site:mail]'] = $config->get('mail'); - $tests['[site:url]'] = \Drupal::url('', [], $url_options); - $tests['[site:url-brief]'] = preg_replace(array('!^https?://!', '!/$!'), '', \Drupal::url('', [], $url_options)); - $tests['[site:login-url]'] = \Drupal::url('user.page', [], $url_options); + $tests['[site:url]'] = Url::fromRoute('', [], $url_options)->toString(); + $tests['[site:url-brief]'] = preg_replace(array('!^https?://!', '!/$!'), '', Url::fromRoute('', [], $url_options)->toString()); + $tests['[site:login-url]'] = Url::fromRoute('user.page', [], $url_options)->toString(); $base_bubbleable_metadata = new BubbleableMetadata(); diff --git a/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php b/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php index 11e8325..6228aed 100644 --- a/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php +++ b/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php @@ -5,6 +5,7 @@ use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\Plugin\Field\FieldFormatter\EntityReferenceFormatterBase; +use Drupal\Core\Url; /** * Plugin implementation of the 'entity reference taxonomy term RSS' formatter. @@ -32,7 +33,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) { 'key' => 'category', 'value' => $entity->label(), 'attributes' => array( - 'domain' => $entity->id() ? \Drupal::url('entity.taxonomy_term.canonical', ['taxonomy_term' => $entity->id()], array('absolute' => TRUE)) : '', + 'domain' => $entity->id() ? Url::fromRoute('entity.taxonomy_term.canonical', ['taxonomy_term' => $entity->id()], array('absolute' => TRUE))->toString() : '', ), ); } diff --git a/core/modules/taxonomy/src/VocabularyListBuilder.php b/core/modules/taxonomy/src/VocabularyListBuilder.php index b5597bb..b5256b8 100644 --- a/core/modules/taxonomy/src/VocabularyListBuilder.php +++ b/core/modules/taxonomy/src/VocabularyListBuilder.php @@ -78,7 +78,7 @@ public function render() { unset($this->weightKey); } $build = parent::render(); - $build['table']['#empty'] = t('No vocabularies available. Add vocabulary.', array(':link' => \Drupal::url('entity.taxonomy_vocabulary.add_form'))); + $build['table']['#empty'] = t('No vocabularies available. Add vocabulary.', array(':link' => Url::fromRoute('entity.taxonomy_vocabulary.add_form')->toString())); return $build; } diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index 30a9ca2..854b060 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -38,23 +38,23 @@ function taxonomy_help($route_name, RouteMatchInterface $route_match) { switch ($route_name) { case 'help.page.taxonomy': - $field_ui_url = \Drupal::moduleHandler()->moduleExists('field_ui') ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#'; + $field_ui_url = \Drupal::moduleHandler()->moduleExists('field_ui') ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#'; $output = ''; $output .= '

      ' . t('About') . '

      '; - $output .= '

      ' . t('The Taxonomy module allows users who have permission to create and edit content to categorize (tag) content of that type. Users who have the Administer vocabularies and terms permission can add vocabularies that contain a set of related terms. The terms in a vocabulary can either be pre-set by an administrator or built gradually as content is added and edited. Terms may be organized hierarchically if desired.', array(':permissions' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-taxonomy')))) . '

      '; + $output .= '

      ' . t('The Taxonomy module allows users who have permission to create and edit content to categorize (tag) content of that type. Users who have the Administer vocabularies and terms permission can add vocabularies that contain a set of related terms. The terms in a vocabulary can either be pre-set by an administrator or built gradually as content is added and edited. Terms may be organized hierarchically if desired.', array(':permissions' => Url::fromRoute('user.admin_permissions', array(), array('fragment' => 'module-taxonomy'))->toString())) . '

      '; $output .= '

      ' . t('For more information, see the online documentation for the Taxonomy module.', array(':taxonomy' => 'https://www.drupal.org/documentation/modules/taxonomy/')) . '

      '; $output .= '

      ' . t('Uses') . '

      '; $output .= '
      '; $output .= '
      ' . t('Managing vocabularies') . '
      '; - $output .= '
      ' . t('Users who have the Administer vocabularies and terms permission can add and edit vocabularies from the Taxonomy administration page. Vocabularies can be deleted from their Edit vocabulary page. Users with the Taxonomy term: Administer fields permission may add additional fields for terms in that vocabulary using the Field UI module.', array(':taxonomy_admin' => \Drupal::url('entity.taxonomy_vocabulary.collection'), ':field_ui' => $field_ui_url)) . '
      '; + $output .= '
      ' . t('Users who have the Administer vocabularies and terms permission can add and edit vocabularies from the Taxonomy administration page. Vocabularies can be deleted from their Edit vocabulary page. Users with the Taxonomy term: Administer fields permission may add additional fields for terms in that vocabulary using the Field UI module.', array(':taxonomy_admin' => Url::fromRoute('entity.taxonomy_vocabulary.collection')->toString(), ':field_ui' => $field_ui_url)) . '
      '; $output .= '
      ' . t('Managing terms') . '
      '; - $output .= '
      ' . t('Users who have the Administer vocabularies and terms permission or the Edit terms permission for a particular vocabulary can add, edit, and organize the terms in a vocabulary from a vocabulary\'s term listing page, which can be accessed by going to the Taxonomy administration page and clicking List terms in the Operations column. Users must have the Administer vocabularies and terms permission or the Delete terms permission for a particular vocabulary to delete terms.', array(':taxonomy_admin' => \Drupal::url('entity.taxonomy_vocabulary.collection'))) . '
      '; + $output .= '
      ' . t('Users who have the Administer vocabularies and terms permission or the Edit terms permission for a particular vocabulary can add, edit, and organize the terms in a vocabulary from a vocabulary\'s term listing page, which can be accessed by going to the Taxonomy administration page and clicking List terms in the Operations column. Users must have the Administer vocabularies and terms permission or the Delete terms permission for a particular vocabulary to delete terms.', array(':taxonomy_admin' => Url::fromRoute('entity.taxonomy_vocabulary.collection')->toString())) . '
      '; $output .= '
      ' . t('Classifying entity content') . '
      '; - $output .= '
      ' . t('A user with the Administer fields permission for a certain entity type may add Taxonomy term reference fields to the entity type, which will allow entities to be classified using taxonomy terms. See the Entity Reference help for more information about reference fields. See the Field module help and the Field UI help pages for general information on fields and how to create and manage them.', array(':field_ui' => $field_ui_url, ':field' => \Drupal::url('help.page', array('name' => 'field')), ':entity_reference' => \Drupal::url('help.page', array('name' => 'entity_reference')))) . '
      '; + $output .= '
      ' . t('A user with the Administer fields permission for a certain entity type may add Taxonomy term reference fields to the entity type, which will allow entities to be classified using taxonomy terms. See the Entity Reference help for more information about reference fields. See the Field module help and the Field UI help pages for general information on fields and how to create and manage them.', array(':field_ui' => $field_ui_url, ':field' => Url::fromRoute('help.page', array('name' => 'field'))->toString(), ':entity_reference' => Url::fromRoute('help.page', array('name' => 'entity_reference'))->toString())) . '
      '; $output .= '
      ' . t('Adding new terms during content creation') . '
      '; $output .= '
      ' . t('Allowing users to add new terms gradually builds a vocabulary as content is added and edited. Users can add new terms if either of the two Autocomplete widgets is chosen for the Taxonomy term reference field in the Manage form display page for the field. You will also need to enable the Create referenced entities if they don\'t already exist option, and restrict the field to one vocabulary.') . '
      '; $output .= '
      ' . t('Configuring displays and form displays') . '
      '; - $output .= '
      ' . t('See the Entity Reference help page for the field widgets and formatters that can be configured for any reference field on the Manage display and Manage form display pages. Taxonomy additionally provides an RSS category formatter that displays nothing when the entity item is displayed as HTML, but displays an RSS category instead of a list when the entity item is displayed in an RSS feed.', array(':entity_reference' => \Drupal::url('help.page', array('name' => 'entity_reference')))) . ''; + $output .= '
      ' . t('See the Entity Reference help page for the field widgets and formatters that can be configured for any reference field on the Manage display and Manage form display pages. Taxonomy additionally provides an RSS category formatter that displays nothing when the entity item is displayed as HTML, but displays an RSS category instead of a list when the entity item is displayed in an RSS feed.', array(':entity_reference' => Url::fromRoute('help.page', array('name' => 'entity_reference'))->toString())) . ''; $output .= '
    '; $output .= ''; $output .= '
    '; diff --git a/core/modules/telephone/telephone.module b/core/modules/telephone/telephone.module index e088958..c365eb2 100644 --- a/core/modules/telephone/telephone.module +++ b/core/modules/telephone/telephone.module @@ -6,6 +6,7 @@ */ use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -15,11 +16,11 @@ function telephone_help($route_name, RouteMatchInterface $route_match) { case 'help.page.telephone': $output = ''; $output .= '

    ' . t('About') . '

    '; - $output .= '

    ' . t('The Telephone module allows you to create fields that contain telephone numbers. See the Field module help and the Field UI help pages for general information on fields and how to create and manage them. For more information, see the online documentation for the Telephone module.', array(':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#', ':telephone_documentation' => 'https://www.drupal.org/documentation/modules/telephone')) . '

    '; + $output .= '

    ' . t('The Telephone module allows you to create fields that contain telephone numbers. See the Field module help and the Field UI help pages for general information on fields and how to create and manage them. For more information, see the online documentation for the Telephone module.', array(':field' => Url::fromRoute('help.page', array('name' => 'field'))->toString(), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#', ':telephone_documentation' => 'https://www.drupal.org/documentation/modules/telephone')) . '

    '; $output .= '

    ' . t('Uses') . '

    '; $output .= '
    '; $output .= '
    ' . t('Managing and displaying telephone fields') . '
    '; - $output .= '
    ' . t('The settings and the display of the telephone field can be configured separately. See the Field UI help for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '
    '; + $output .= '
    ' . t('The settings and the display of the telephone field can be configured separately. See the Field UI help for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#')) . '
    '; $output .= '
    ' . t('Displaying telephone numbers as links') . '
    '; $output .= '
    ' . t('Telephone numbers can be displayed as links with the scheme name tel: by choosing the Telephone display format on the Manage display page. Any spaces will be stripped out of the link text. This semantic markup improves the user experience on mobile and assistive technology devices.') . '
    '; $output .= '
    '; diff --git a/core/modules/text/text.module b/core/modules/text/text.module index 906b461..8d3eb23 100644 --- a/core/modules/text/text.module +++ b/core/modules/text/text.module @@ -9,6 +9,7 @@ use Drupal\Component\Utility\Unicode; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\filter\Entity\FilterFormat; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -18,11 +19,11 @@ function text_help($route_name, RouteMatchInterface $route_match) { case 'help.page.text': $output = ''; $output .= '

    ' . t('About') . '

    '; - $output .= '

    ' . t('The Text module allows you to create short and long text fields with optional summaries. See the Field module help and the Field UI help pages for general information on fields and how to create and manage them. For more information, see the online documentation for the Text module.', array(':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#', ':text_documentation' => 'https://www.drupal.org/documentation/modules/text')) . '

    '; + $output .= '

    ' . t('The Text module allows you to create short and long text fields with optional summaries. See the Field module help and the Field UI help pages for general information on fields and how to create and manage them. For more information, see the online documentation for the Text module.', array(':field' => Url::fromRoute('help.page', array('name' => 'field'))->toString(), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#', ':text_documentation' => 'https://www.drupal.org/documentation/modules/text')) . '

    '; $output .= '

    ' . t('Uses') . '

    '; $output .= '
    '; $output .= '
    ' . t('Managing and displaying text fields') . '
    '; - $output .= '
    ' . t('The settings and display of the text field can be configured separately. See the Field UI help for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '
    '; + $output .= '
    ' . t('The settings and display of the text field can be configured separately. See the Field UI help for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? Url::fromRoute('help.page', array('name' => 'field_ui'))->toString() : '#')) . '
    '; $output .= '
    ' . t('Creating short text fields') . '
    '; $output .= '
    ' . t('If you choose Text (plain) or Text (formatted) as the field type on the Manage fields page, then a field with a single row is displayed. You can change the maximum text length in the Field settings when you set up the field.') . '
    '; $output .= '
    ' . t('Creating long text fields') . '
    '; @@ -32,7 +33,7 @@ function text_help($route_name, RouteMatchInterface $route_match) { $output .= '
    ' . t('Displaying summaries instead of trimmed text') . '
    '; $output .= '
    ' . t('As an alternative to using a trimmed version of the text, you can enter a separate summary by choosing the Text (formatted, long, with summary) field type on the Manage fields page. Even when Summary input is enabled, and summaries are provided, you can display trimmed text nonetheless by choosing the appropriate format on the Manage display page.') . '
    '; $output .= '
    ' . t('Using text formats and editors') . '
    '; - $output .= '
    ' . t('If you choose Text (plain) or Text (plain, long) you restrict the input to Plain text only. If you choose Text (formatted), Text (formatted, long), or Text (formatted, long with summary) you allow users to write formatted text. Which options are available to individual users depends on the settings on the Text formats and editors page.', array(':formats' => \Drupal::url('filter.admin_overview'))) . '
    '; + $output .= '
    ' . t('If you choose Text (plain) or Text (plain, long) you restrict the input to Plain text only. If you choose Text (formatted), Text (formatted, long), or Text (formatted, long with summary) you allow users to write formatted text. Which options are available to individual users depends on the settings on the Text formats and editors page.', array(':formats' => Url::fromRoute('filter.admin_overview')->toString())) . '
    '; $output .= '
    '; return $output; } diff --git a/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php b/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php index 56b9d69..3d33a89 100644 --- a/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php +++ b/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php @@ -303,7 +303,7 @@ function testLocaleTranslationSubtreesHashCacheClear() { ); $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations')); $this->assertText(t('The strings have been saved.'), 'The strings have been saved.'); - $this->assertUrl(\Drupal::url('locale.translate_page', [], ['absolute' => TRUE]), [], 'Correct page redirection.'); + $this->assertUrl(Url::fromRoute('locale.translate_page', [], ['absolute' => TRUE])->toString(), [], 'Correct page redirection.'); $this->drupalLogout(); // Log in the adminUser. Check the admin menu subtrees hash now that one diff --git a/core/modules/tour/src/Tests/TourTest.php b/core/modules/tour/src/Tests/TourTest.php index 78304c6..4e88370 100644 --- a/core/modules/tour/src/Tests/TourTest.php +++ b/core/modules/tour/src/Tests/TourTest.php @@ -4,6 +4,7 @@ use Drupal\language\Entity\ConfigurableLanguage; use Drupal\tour\Entity\Tour; +use Drupal\Core\Url; /** * Tests the functionality of tour tips. @@ -66,7 +67,7 @@ public function testTourFunctionality() { $elements = $this->xpath('//li[@data-id=:data_id and @class=:classes and ./p//a[@href=:href and contains(., :text)]]', array( ':classes' => 'tip-module-tour-test tip-type-text tip-tour-test-1', ':data_id' => 'tour-test-1', - ':href' => \Drupal::url('', [], ['absolute' => TRUE]), + ':href' => Url::fromRoute('', [], ['absolute' => TRUE])->toString(), ':text' => 'Drupal', )); $this->assertEqual(count($elements), 1, 'Found Token replacement.'); diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module index 54d490d..e50af0e 100644 --- a/core/modules/tracker/tracker.module +++ b/core/modules/tracker/tracker.module @@ -11,6 +11,7 @@ use Drupal\node\Entity\Node; use Drupal\node\NodeInterface; use Drupal\Core\Session\AccountInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -23,7 +24,7 @@ function tracker_help($route_name, RouteMatchInterface $route_match) { $output .= '

    ' . t('Uses') . '

    '; $output .= '
    '; $output .= '
    ' . t('Tracking new and updated site content') . '
    '; - $output .= '
    ' . t('The Recent content page shows new and updated content in reverse chronological order, listing the content type, title, author\'s name, number of comments, and time of last update. Content is considered updated when changes occur in the text, or when new comments are added. The My recent content tab limits the list to the currently logged-in user.', array(':recent' => \Drupal::url('tracker.page'))) . '
    '; + $output .= '
    ' . t('The Recent content page shows new and updated content in reverse chronological order, listing the content type, title, author\'s name, number of comments, and time of last update. Content is considered updated when changes occur in the text, or when new comments are added. The My recent content tab limits the list to the currently logged-in user.', array(':recent' => Url::fromRoute('tracker.page')->toString())) . '
    '; $output .= '
    ' . t('Tracking user-specific content') . '
    '; $output .= '
    ' . t("To follow a specific user's new and updated content, select the Activity tab from the user's profile page.") . '
    '; $output .= '
    '; diff --git a/core/modules/update/update.install b/core/modules/update/update.install index e810129..1bc287f 100644 --- a/core/modules/update/update.install +++ b/core/modules/update/update.install @@ -113,10 +113,10 @@ function _update_requirement_check($project, $type) { // a single paragraph. $requirement['description'][] = ['#markup' => _update_message_text($type, $status)]; if (_update_manager_access()) { - $requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the available updates page for more information and to install your missing updates.', [':available_updates' => \Drupal::url('update.report_update')])]; + $requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the available updates page for more information and to install your missing updates.', [':available_updates' => Url::fromRoute('update.report_update')->toString()])]; } else { - $requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the available updates page for more information.', [':available_updates' => \Drupal::url('update.status')])]; + $requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the available updates page for more information.', [':available_updates' => Url::fromRoute('update.status')->toString()])]; } } switch ($status) { diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc index f9c7c5f..3c68f76 100644 --- a/core/modules/update/update.manager.inc +++ b/core/modules/update/update.manager.inc @@ -37,6 +37,7 @@ */ use Symfony\Component\HttpFoundation\RedirectResponse; +use Drupal\Core\Url; /** * Batch callback: Performs actions when the download batch is completed. @@ -58,7 +59,7 @@ function update_manager_download_batch_finished($success, $results) { elseif ($success) { drupal_set_message(t('Updates downloaded successfully.')); $_SESSION['update_manager_update_projects'] = $results['projects']; - return new RedirectResponse(\Drupal::url('update.confirmation_page', [], ['absolute' => TRUE])); + return new RedirectResponse(Url::fromRoute('update.confirmation_page', [], ['absolute' => TRUE])->toString()); } else { // Ideally we're catching all Exceptions, so they should never see this, diff --git a/core/modules/update/update.module b/core/modules/update/update.module index 349f694..cb51c08 100644 --- a/core/modules/update/update.module +++ b/core/modules/update/update.module @@ -71,7 +71,7 @@ function update_help($route_name, RouteMatchInterface $route_match) { case 'help.page.update': $output = ''; $output .= '

    ' . t('About') . '

    '; - $output .= '

    ' . t('The Update Manager module periodically checks for new versions of your site\'s software (including contributed modules and themes), and alerts administrators to available updates. The Update Manager system is also used by some other modules to manage updates and downloads; for example, the Interface Translation module uses the Update Manager to download translations from the localization server. Note that whenever the Update Manager system is used, anonymous usage statistics are sent to Drupal.org. If desired, you may disable the Update Manager module from the Extend page; if you do so, functionality that depends on the Update Manager system will not work. For more information, see the online documentation for the Update Manager module.', array(':update' => 'https://www.drupal.org/documentation/modules/update', ':modules' => \Drupal::url('system.modules_list'))) . '

    '; + $output .= '

    ' . t('The Update Manager module periodically checks for new versions of your site\'s software (including contributed modules and themes), and alerts administrators to available updates. The Update Manager system is also used by some other modules to manage updates and downloads; for example, the Interface Translation module uses the Update Manager to download translations from the localization server. Note that whenever the Update Manager system is used, anonymous usage statistics are sent to Drupal.org. If desired, you may disable the Update Manager module from the Extend page; if you do so, functionality that depends on the Update Manager system will not work. For more information, see the online documentation for the Update Manager module.', array(':update' => 'https://www.drupal.org/documentation/modules/update', ':modules' => Url::fromRoute('system.modules_list')->toString())) . '

    '; // Only explain the Update manager if it has not been disabled. if (_update_manager_access()) { $output .= '

    ' . t('The Update Manager also allows administrators to update and install modules and themes through the administration interface.') . '

    '; @@ -79,13 +79,13 @@ function update_help($route_name, RouteMatchInterface $route_match) { $output .= '

    ' . t('Uses') . '

    '; $output .= '
    '; $output .= '
    ' . t('Checking for available updates') . '
    '; - $output .= '
    ' . t('The Available updates report displays core, contributed modules, and themes for which there are new releases available for download. On the report page, you can also check manually for updates. You can configure the frequency of update checks, which are performed during cron runs, and whether notifications are sent on the Update Manager settings page.', array(':update-report' => \Drupal::url('update.status'), ':update-settings' => \Drupal::url('update.settings'))) . '
    '; + $output .= '
    ' . t('The Available updates report displays core, contributed modules, and themes for which there are new releases available for download. On the report page, you can also check manually for updates. You can configure the frequency of update checks, which are performed during cron runs, and whether notifications are sent on the Update Manager settings page.', array(':update-report' => Url::fromRoute('update.status')->toString(), ':update-settings' => Url::fromRoute('update.settings')->toString())) . '
    '; // Only explain the Update manager if it has not been disabled. if (_update_manager_access()) { $output .= '
    ' . t('Performing updates through the Update page') . '
    '; - $output .= '
    ' . t('The Update Manager module allows administrators to perform updates directly from the Update page. It lists all available updates, and you can confirm whether you want to download them. If you don\'t have sufficient access rights to your web server, you could be prompted for your FTP/SSH password. Afterwards the files are transferred into your site installation, overwriting your old files. Direct links to the Update page are also displayed on the Extend page and the Appearance page.', array(':modules_page' => \Drupal::url('system.modules_list'), ':themes_page' => \Drupal::url('system.themes_page'), ':update-page' => \Drupal::url('update.report_update'))) . '
    '; + $output .= '
    ' . t('The Update Manager module allows administrators to perform updates directly from the Update page. It lists all available updates, and you can confirm whether you want to download them. If you don\'t have sufficient access rights to your web server, you could be prompted for your FTP/SSH password. Afterwards the files are transferred into your site installation, overwriting your old files. Direct links to the Update page are also displayed on the Extend page and the Appearance page.', array(':modules_page' => Url::fromRoute('system.modules_list')->toString(), ':themes_page' => Url::fromRoute('system.themes_page')->toString(), ':update-page' => Url::fromRoute('update.report_update')->toString())) . '
    '; $output .= '
    ' . t('Installing new modules and themes through the Install page') . '
    '; - $output .= '
    ' . t('You can also install new modules and themes in the same fashion, through the Install page, or by clicking the Install new module/theme links at the top of the Extend page and the Appearance page. In this case, you are prompted to provide either the URL to the download, or to upload a packaged release file from your local computer.', array(':modules_page' => \Drupal::url('system.modules_list'), ':themes_page' => \Drupal::url('system.themes_page'), ':install' => \Drupal::url('update.report_install'))) . '
    '; + $output .= '
    ' . t('You can also install new modules and themes in the same fashion, through the Install page, or by clicking the Install new module/theme links at the top of the Extend page and the Appearance page. In this case, you are prompted to provide either the URL to the download, or to upload a packaged release file from your local computer.', array(':modules_page' => Url::fromRoute('system.modules_list')->toString(), ':themes_page' => Url::fromRoute('system.themes_page')->toString(), ':install' => Url::fromRoute('update.report_install')->toString())) . '
    '; } $output .= '
    '; return $output; @@ -95,10 +95,10 @@ function update_help($route_name, RouteMatchInterface $route_match) { case 'system.modules_list': if (_update_manager_access()) { - $output = '

    ' . t('Regularly review and install available updates to maintain a secure and current site. Always run the update script each time a module is updated.', array(':update-php' => \Drupal::url('system.db_update'), ':updates' => \Drupal::url('update.status'))) . '

    '; + $output = '

    ' . t('Regularly review and install available updates to maintain a secure and current site. Always run the update script each time a module is updated.', array(':update-php' => Url::fromRoute('system.db_update')->toString(), ':updates' => Url::fromRoute('update.status')->toString())) . '

    '; } else { - $output = '

    ' . t('Regularly review available updates to maintain a secure and current site. Always run the update script each time a module is updated.', array(':update-php' => \Drupal::url('system.db_update'), ':updates' => \Drupal::url('update.status'))) . '

    '; + $output = '

    ' . t('Regularly review available updates to maintain a secure and current site. Always run the update script each time a module is updated.', array(':update-php' => Url::fromRoute('system.db_update')->toString(), ':updates' => Url::fromRoute('update.status')->toString())) . '

    '; } return $output; } @@ -286,8 +286,8 @@ function update_storage_clear_submit($form, FormStateInterface $form_state) { function _update_no_data() { $destination = \Drupal::destination()->getAsArray(); return t('No update information available. Run cron or check manually.', array( - ':run_cron' => \Drupal::url('system.run_cron', [], ['query' => $destination]), - ':check_manually' => \Drupal::url('update.manual_status', [], ['query' => $destination]), + ':run_cron' => Url::fromRoute('system.run_cron', [], ['query' => $destination])->toString(), + ':check_manually' => Url::fromRoute('update.manual_status', [], ['query' => $destination])->toString(), )); } @@ -448,11 +448,11 @@ function update_mail($key, &$message, $params) { foreach ($params as $msg_type => $msg_reason) { $message['body'][] = _update_message_text($msg_type, $msg_reason, $langcode); } - $message['body'][] = t('See the available updates page for more information:', array(), array('langcode' => $langcode)) . "\n" . \Drupal::url('update.status', [], ['absolute' => TRUE, 'language' => $language]); + $message['body'][] = t('See the available updates page for more information:', array(), array('langcode' => $langcode)) . "\n" . Url::fromRoute('update.status', [], ['absolute' => TRUE, 'language' => $language])->toString(); if (_update_manager_access()) { - $message['body'][] = t('You can automatically install your missing updates using the Update manager:', array(), array('langcode' => $langcode)) . "\n" . \Drupal::url('update.report_update', [], ['absolute' => TRUE, 'language' => $language]); + $message['body'][] = t('You can automatically install your missing updates using the Update manager:', array(), array('langcode' => $langcode)) . "\n" . Url::fromRoute('update.report_update', [], ['absolute' => TRUE, 'language' => $language])->toString(); } - $settings_url = \Drupal::url('update.settings', [], ['absolute' => TRUE]); + $settings_url = Url::fromRoute('update.settings', [], ['absolute' => TRUE])->toString(); if (\Drupal::config('update.settings')->get('notification.threshold') == 'all') { $message['body'][] = t('Your site is currently configured to send these emails when any updates are available. To get notified only for security updates, @url.', array('@url' => $settings_url)); } @@ -523,10 +523,10 @@ function _update_message_text($msg_type, $msg_reason, $langcode = NULL) { case UPDATE_NOT_FETCHED: case UPDATE_FETCH_PENDING: if ($msg_type == 'core') { - $text = t('There was a problem checking available updates for Drupal.', array(':update-report' => \Drupal::url('update.status')), array('langcode' => $langcode)); + $text = t('There was a problem checking available updates for Drupal.', array(':update-report' => Url::fromRoute('update.status')->toString()), array('langcode' => $langcode)); } else { - $text = t('There was a problem checking available updates for your modules or themes.', array(':update-report' => \Drupal::url('update.status')), array('langcode' => $langcode)); + $text = t('There was a problem checking available updates for your modules or themes.', array(':update-report' => Url::fromRoute('update.status')->toString()), array('langcode' => $langcode)); } break; } diff --git a/core/modules/user/src/Tests/UserAccountLinksTest.php b/core/modules/user/src/Tests/UserAccountLinksTest.php index 6d7d723..4843737 100644 --- a/core/modules/user/src/Tests/UserAccountLinksTest.php +++ b/core/modules/user/src/Tests/UserAccountLinksTest.php @@ -3,6 +3,7 @@ namespace Drupal\user\Tests; use Drupal\simpletest\WebTestBase; +use Drupal\Core\Url; /** * Tests user-account links. diff --git a/core/modules/user/src/Tests/UserBlocksTest.php b/core/modules/user/src/Tests/UserBlocksTest.php index 40e63d8..be6e824 100644 --- a/core/modules/user/src/Tests/UserBlocksTest.php +++ b/core/modules/user/src/Tests/UserBlocksTest.php @@ -3,6 +3,7 @@ namespace Drupal\user\Tests; use Drupal\simpletest\WebTestBase; +use Drupal\Core\Url; /** * Tests user blocks. @@ -73,7 +74,7 @@ function testUserLoginBlock() { $this->assertNoText(t('User login'), 'Logged in.'); // Check that we are still on the same page. - $this->assertUrl(\Drupal::url('user.admin_permissions', [], ['absolute' => TRUE]), [], 'Still on the same page after login for access denied page'); + $this->assertUrl(Url::fromRoute('user.admin_permissions', [], ['absolute' => TRUE])->toString(), [], 'Still on the same page after login for access denied page'); // Now, log out and repeat with a non-403 page. $this->drupalLogout(); diff --git a/core/modules/user/src/Tests/UserLoginTest.php b/core/modules/user/src/Tests/UserLoginTest.php index af00c74..e5ab932 100644 --- a/core/modules/user/src/Tests/UserLoginTest.php +++ b/core/modules/user/src/Tests/UserLoginTest.php @@ -4,6 +4,7 @@ use Drupal\simpletest\WebTestBase; use Drupal\user\Entity\User; +use Drupal\Core\Url; /** * Ensure that login works as expected. @@ -163,11 +164,11 @@ function assertFailedLogin($account, $flood_trigger = NULL) { $this->assertNoFieldByXPath("//input[@name='pass' and @value!='']", NULL, 'Password value attribute is blank.'); if (isset($flood_trigger)) { if ($flood_trigger == 'user') { - $this->assertRaw(\Drupal::translation()->formatPlural($this->config('user.flood')->get('user_limit'), 'There has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or request a new password.', 'There have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or request a new password.', array(':url' => \Drupal::url('user.pass')))); + $this->assertRaw(\Drupal::translation()->formatPlural($this->config('user.flood')->get('user_limit'), 'There has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or request a new password.', 'There have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or request a new password.', array(':url' => Url::fromRoute('user.pass')->toString()))); } else { // No uid, so the limit is IP-based. - $this->assertRaw(t('Too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or request a new password.', array(':url' => \Drupal::url('user.pass')))); + $this->assertRaw(t('Too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or request a new password.', array(':url' => Url::fromRoute('user.pass')->toString()))); } } else { diff --git a/core/modules/user/src/Tests/UserPasswordResetTest.php b/core/modules/user/src/Tests/UserPasswordResetTest.php index 0fa89e5..532f637 100644 --- a/core/modules/user/src/Tests/UserPasswordResetTest.php +++ b/core/modules/user/src/Tests/UserPasswordResetTest.php @@ -4,6 +4,7 @@ use Drupal\system\Tests\Cache\PageCacheTagsTestBase; use Drupal\user\Entity\User; +use Drupal\Core\Url; /** * Ensure that password reset methods work as expected. @@ -225,7 +226,7 @@ public function testUserResetPasswordTextboxFilled() { ); $this->drupalPostForm('user/login', $edit, t('Log in')); $this->assertRaw(t('Unrecognized username or password. Forgot your password?', - array(':password' => \Drupal::url('user.pass', [], array('query' => array('name' => $edit['name'])))))); + array(':password' => Url::fromRoute('user.pass', [], array('query' => array('name' => $edit['name'])))->toString()))); unset($edit['pass']); $this->drupalGet('user/password', array('query' => array('name' => $edit['name']))); $this->assertFieldByName('name', $edit['name'], 'User name found.'); diff --git a/core/modules/user/src/Tests/UserTokenReplaceTest.php b/core/modules/user/src/Tests/UserTokenReplaceTest.php index b8cfde0..cc37986 100644 --- a/core/modules/user/src/Tests/UserTokenReplaceTest.php +++ b/core/modules/user/src/Tests/UserTokenReplaceTest.php @@ -7,6 +7,7 @@ use Drupal\language\Entity\ConfigurableLanguage; use Drupal\simpletest\WebTestBase; use Drupal\user\Entity\User; +use Drupal\Core\Url; /** * Generates text using placeholders for dummy content to check user token @@ -132,7 +133,7 @@ function testUserTokenReplacement() { $tests['[user:cancel-url]'] = user_cancel_url($account); // Generate tokens with interface language. - $link = \Drupal::url('user.page', [], array('absolute' => TRUE)); + $link = Url::fromRoute('user.page', [], array('absolute' => TRUE))->toString(); foreach ($tests as $input => $expected) { $output = $token_service->replace($input, ['user' => $account], ['langcode' => $language_interface->getId(), 'callback' => 'user_mail_tokens', 'clear' => TRUE]); $this->assertTrue(strpos($output, $link) === 0, 'Generated URL is in interface language.'); @@ -141,14 +142,14 @@ function testUserTokenReplacement() { // Generate tokens with the user's preferred language. $account->preferred_langcode = 'de'; $account->save(); - $link = \Drupal::url('user.page', [], array('language' => \Drupal::languageManager()->getLanguage($account->getPreferredLangcode()), 'absolute' => TRUE)); + $link = Url::fromRoute('user.page', [], array('language' => \Drupal::languageManager()->getLanguage($account->getPreferredLangcode()), 'absolute' => TRUE))->toString(); foreach ($tests as $input => $expected) { $output = $token_service->replace($input, ['user' => $account], ['callback' => 'user_mail_tokens', 'clear' => TRUE]); $this->assertTrue(strpos($output, $link) === 0, "Generated URL is in the user's preferred language."); } // Generate tokens with one specific language. - $link = \Drupal::url('user.page', [], array('language' => \Drupal::languageManager()->getLanguage('de'), 'absolute' => TRUE)); + $link = Url::fromRoute('user.page', [], array('language' => \Drupal::languageManager()->getLanguage('de'), 'absolute' => TRUE))->toString(); foreach ($tests as $input => $expected) { foreach (array($user1, $user2) as $account) { $output = $token_service->replace($input, ['user' => $account], ['langcode' => 'de', 'callback' => 'user_mail_tokens', 'clear' => TRUE]); diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 1394b23..427f241 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -59,15 +59,15 @@ function user_help($route_name, RouteMatchInterface $route_match) { $output .= '

    ' . t('Uses') . '

    '; $output .= '
    '; $output .= '
    ' . t('Creating and managing users') . '
    '; - $output .= '
    ' . t('Through the People administration page you can add and cancel user accounts and assign users to roles. By editing one particular user you can change their username, email address, password, and information in other fields.', array(':people' => \Drupal::url('entity.user.collection'))) . '
    '; + $output .= '
    ' . t('Through the People administration page you can add and cancel user accounts and assign users to roles. By editing one particular user you can change their username, email address, password, and information in other fields.', array(':people' => Url::fromRoute('entity.user.collection')->toString())) . '
    '; $output .= '
    ' . t('Configuring user roles') . '
    '; - $output .= '
    ' . t('Roles are used to group and classify users; each user can be assigned one or more roles. Typically there are two pre-defined roles: Anonymous user (users that are not logged in), and Authenticated user (users that are registered and logged in). Depending on how your site was set up, an Administrator role may also be available: users with this role will automatically be assigned any new permissions whenever a module is enabled. You can create additional roles on the Roles administration page.', array(':roles' => \Drupal::url('entity.user_role.collection'))) . '
    '; + $output .= '
    ' . t('Roles are used to group and classify users; each user can be assigned one or more roles. Typically there are two pre-defined roles: Anonymous user (users that are not logged in), and Authenticated user (users that are registered and logged in). Depending on how your site was set up, an Administrator role may also be available: users with this role will automatically be assigned any new permissions whenever a module is enabled. You can create additional roles on the Roles administration page.', array(':roles' => Url::fromRoute('entity.user_role.collection')->toString())) . '
    '; $output .= '
    ' . t('Setting permissions') . '
    '; - $output .= '
    ' . t('After creating roles, you can set permissions for each role on the Permissions page. Granting a permission allows users who have been assigned a particular role to perform an action on the site, such as viewing content, editing or creating a particular type of content, administering settings for a particular module, or using a particular function of the site (such as search).', array(':permissions_user' => \Drupal::url('user.admin_permissions'))) . '
    '; + $output .= '
    ' . t('After creating roles, you can set permissions for each role on the Permissions page. Granting a permission allows users who have been assigned a particular role to perform an action on the site, such as viewing content, editing or creating a particular type of content, administering settings for a particular module, or using a particular function of the site (such as search).', array(':permissions_user' => Url::fromRoute('user.admin_permissions')->toString())) . '
    '; $output .= '
    ' . t('Managing account settings') . '
    '; - $output .= '
    ' . t('The Account settings page allows you to manage settings for the displayed name of the Anonymous user role, personal contact forms, user registration settings, and account cancellation settings. On this page you can also manage settings for account personalization, and adapt the text for the email messages that users receive when they register or request a password recovery. You may also set which role is automatically assigned new permissions whenever a module is enabled (the Administrator role).', array(':accounts' => \Drupal::url('entity.user.admin_form'))) . '
    '; + $output .= '
    ' . t('The Account settings page allows you to manage settings for the displayed name of the Anonymous user role, personal contact forms, user registration settings, and account cancellation settings. On this page you can also manage settings for account personalization, and adapt the text for the email messages that users receive when they register or request a password recovery. You may also set which role is automatically assigned new permissions whenever a module is enabled (the Administrator role).', array(':accounts' => Url::fromRoute('entity.user.admin_form')->toString())) . '
    '; $output .= '
    ' . t('Managing user account fields') . '
    '; - $output .= '
    ' . t('Because User accounts are an entity type, you can extend them by adding fields through the Manage fields tab on the Account settings page. By adding fields for e.g., a picture, a biography, or address, you can a create a custom profile for the users of the website. For background information on entities and fields, see the Field module help page.', array(':field_help' => (\Drupal::moduleHandler()->moduleExists('field')) ? \Drupal::url('help.page', array('name' => 'field')) : '#', ':accounts' => \Drupal::url('entity.user.admin_form'))) . '
    '; + $output .= '
    ' . t('Because User accounts are an entity type, you can extend them by adding fields through the Manage fields tab on the Account settings page. By adding fields for e.g., a picture, a biography, or address, you can a create a custom profile for the users of the website. For background information on entities and fields, see the Field module help page.', array(':field_help' => (\Drupal::moduleHandler()->moduleExists('field')) ? Url::fromRoute('help.page', array('name' => 'field'))->toString() : '#', ':accounts' => Url::fromRoute('entity.user.admin_form')->toString())) . '
    '; $output .= '
    '; return $output; @@ -75,10 +75,10 @@ function user_help($route_name, RouteMatchInterface $route_match) { return '

    ' . t("This web page allows administrators to register new users. Users' email addresses and usernames must be unique.") . '

    '; case 'user.admin_permissions': - return '

    ' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the Roles page to create a role.) Any permissions granted to the Authenticated user role will be given to any user who is logged in to your site. From the Account settings page, you can make any role into an Administrator role for the site, meaning that role will be granted all new permissions automatically. You should be careful to ensure that only trusted users are given this access and level of control of your site.', array(':role' => \Drupal::url('entity.user_role.collection'), ':settings' => \Drupal::url('entity.user.admin_form'))) . '

    '; + return '

    ' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the Roles page to create a role.) Any permissions granted to the Authenticated user role will be given to any user who is logged in to your site. From the Account settings page, you can make any role into an Administrator role for the site, meaning that role will be granted all new permissions automatically. You should be careful to ensure that only trusted users are given this access and level of control of your site.', array(':role' => Url::fromRoute('entity.user_role.collection')->toString(), ':settings' => Url::fromRoute('entity.user.admin_form')->toString())) . '

    '; case 'entity.user_role.collection': - return '

    ' . t('A role defines a group of users that have certain privileges. These privileges are defined on the Permissions page. Here, you can define the names and the display sort order of the roles on your site. It is recommended to order roles from least permissive (for example, Anonymous user) to most permissive (for example, Administrator user). Users who are not logged in have the Anonymous user role. Users who are logged in have the Authenticated user role, plus any other roles granted to their user account.', array(':permissions' => \Drupal::url('user.admin_permissions'))) . '

    '; + return '

    ' . t('A role defines a group of users that have certain privileges. These privileges are defined on the Permissions page. Here, you can define the names and the display sort order of the roles on your site. It is recommended to order roles from least permissive (for example, Anonymous user) to most permissive (for example, Administrator user). Users who are not logged in have the Anonymous user role. Users who are logged in have the Authenticated user role, plus any other roles granted to their user account.', array(':permissions' => Url::fromRoute('user.admin_permissions')->toString())) . '

    '; case 'entity.user.field_ui_fields': return '

    ' . t('This form lets administrators add and edit fields for storing user data.') . '

    '; @@ -581,7 +581,7 @@ function user_user_logout($account) { function user_pass_reset_url($account, $options = array()) { $timestamp = REQUEST_TIME; $langcode = isset($options['langcode']) ? $options['langcode'] : $account->getPreferredLangcode(); - return \Drupal::url('user.reset', + return Url::fromRoute('user.reset', array( 'uid' => $account->id(), 'timestamp' => $timestamp, @@ -591,7 +591,7 @@ function user_pass_reset_url($account, $options = array()) { 'absolute' => TRUE, 'language' => \Drupal::languageManager()->getLanguage($langcode) ) - ); + )->toString(); } /** @@ -615,11 +615,11 @@ function user_cancel_url(UserInterface $account, $options = array()) { $timestamp = REQUEST_TIME; $langcode = isset($options['langcode']) ? $options['langcode'] : $account->getPreferredLangcode(); $url_options = array('absolute' => TRUE, 'language' => \Drupal::languageManager()->getLanguage($langcode)); - return \Drupal::url('user.cancel_confirm', [ + return Url::fromRoute('user.cancel_confirm', [ 'user' => $account->id(), 'timestamp' => $timestamp, 'hashed_pass' => user_pass_rehash($account, $timestamp) - ], $url_options); + ], $url_options)->toString(); } /** diff --git a/core/modules/views/src/Plugin/Block/ViewsBlockBase.php b/core/modules/views/src/Plugin/Block/ViewsBlockBase.php index 4a814d7..e26b3e2 100644 --- a/core/modules/views/src/Plugin/Block/ViewsBlockBase.php +++ b/core/modules/views/src/Plugin/Block/ViewsBlockBase.php @@ -10,6 +10,7 @@ use Drupal\Core\Entity\EntityStorageInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\Core\Session\AccountInterface; +use Drupal\Core\Url; /** * Base class for Views block plugins. @@ -154,7 +155,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta ); if ($this->view->storage->access('edit') && \Drupal::moduleHandler()->moduleExists('views_ui')) { - $form['views_label']['#description'] = $this->t('Changing the title here means it cannot be dynamically altered anymore. (Try changing it directly in @name.)', array(':url' => \Drupal::url('entity.view.edit_display_form', array('view' => $this->view->storage->id(), 'display_id' => $this->displayID)), '@name' => $this->view->storage->label())); + $form['views_label']['#description'] = $this->t('Changing the title here means it cannot be dynamically altered anymore. (Try changing it directly in @name.)', array(':url' => Url::fromRoute('entity.view.edit_display_form', array('view' => $this->view->storage->id(), 'display_id' => $this->displayID))->toString(), '@name' => $this->view->storage->label())); } else { $form['views_label']['#description'] = $this->t('Changing the title here means it cannot be dynamically altered anymore.'); diff --git a/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php b/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php index d330cdf..f9151bf 100644 --- a/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php +++ b/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php @@ -4,6 +4,7 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Menu\Form\MenuLinkDefaultForm; +use Drupal\Core\Url; /** * Provides a form to edit Views menu links. @@ -56,7 +57,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta $id = $view->storage->id(); $label = $view->storage->label(); if ($this->moduleHandler->moduleExists('views_ui')) { - $message = $this->t('This link is provided by the Views module. The path can be changed by editing the view @label', array(':url' => \Drupal::url('entity.view.edit_form', array('view' => $id)), '@label' => $label)); + $message = $this->t('This link is provided by the Views module. The path can be changed by editing the view @label', array(':url' => Url::fromRoute('entity.view.edit_form', array('view' => $id))->toString(), '@label' => $label)); } else { $message = $this->t('This link is provided by the Views module from view %label.', array('%label' => $label)); diff --git a/core/modules/views/src/Plugin/views/display/Block.php b/core/modules/views/src/Plugin/views/display/Block.php index fe37d91..1c21738 100644 --- a/core/modules/views/src/Plugin/views/display/Block.php +++ b/core/modules/views/src/Plugin/views/display/Block.php @@ -6,6 +6,7 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\Block\ViewsBlock; use Symfony\Component\DependencyInjection\ContainerInterface; +use Drupal\Core\Url; /** * The plugin that handles a block. @@ -191,7 +192,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['block_category'] = array( '#type' => 'textfield', '#autocomplete_route_name' => 'block.category_autocomplete', - '#description' => $this->t('The category this block will appear under on the blocks placement page.', array(':href' => \Drupal::url('block.admin_display'))), + '#description' => $this->t('The category this block will appear under on the blocks placement page.', array(':href' => Url::fromRoute('block.admin_display')->toString())), '#default_value' => $this->getOption('block_category'), ); break; diff --git a/core/modules/views/src/Tests/Handler/FieldWebTest.php b/core/modules/views/src/Tests/Handler/FieldWebTest.php index a6ff1b4..5e2206c 100644 --- a/core/modules/views/src/Tests/Handler/FieldWebTest.php +++ b/core/modules/views/src/Tests/Handler/FieldWebTest.php @@ -64,9 +64,9 @@ public function testClickSorting() { $this->assertResponse(200); // Only the id and name should be click sortable, but not the name. - $this->assertLinkByHref(\Drupal::url('', [], ['query' => ['order' => 'id', 'sort' => 'asc']])); - $this->assertLinkByHref(\Drupal::url('', [], ['query' => ['order' => 'name', 'sort' => 'desc']])); - $this->assertNoLinkByHref(\Drupal::url('', [], ['query' => ['order' => 'created']])); + $this->assertLinkByHref(Url::fromRoute('', [], ['query' => ['order' => 'id', 'sort' => 'asc']])->toString()); + $this->assertLinkByHref(Url::fromRoute('', [], ['query' => ['order' => 'name', 'sort' => 'desc']])->toString()); + $this->assertNoLinkByHref(Url::fromRoute('', [], ['query' => ['order' => 'created']])->toString()); // Check that the view returns the click sorting cache contexts. $expected_contexts = [ @@ -78,7 +78,7 @@ public function testClickSorting() { // Clicking a click sort should change the order. $this->clickLink(t('ID')); - $this->assertLinkByHref(\Drupal::url('', [], ['query' => ['order' => 'id', 'sort' => 'desc']])); + $this->assertLinkByHref(Url::fromRoute('', [], ['query' => ['order' => 'id', 'sort' => 'desc']])->toString()); // Check that the output has the expected order (asc). $ids = $this->clickSortLoadIdsFromOutput(); $this->assertEqual($ids, range(1, 5)); @@ -228,28 +228,28 @@ public function testAlterUrl() { $alter = &$id_field->options['alter']; $alter['path'] = 'node/123'; - $expected_result = \Drupal::url('entity.node.canonical', ['node' => '123'], ['absolute' => $absolute]); + $expected_result = Url::fromRoute('entity.node.canonical', ['node' => '123'], ['absolute' => $absolute])->toString(); $alter['absolute'] = $absolute; $result = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) { return $id_field->theme($row); }); $this->assertSubString($result, $expected_result); - $expected_result = \Drupal::url('entity.node.canonical', ['node' => '123'], ['fragment' => 'foo', 'absolute' => $absolute]); + $expected_result = Url::fromRoute('entity.node.canonical', ['node' => '123'], ['fragment' => 'foo', 'absolute' => $absolute])->toString(); $alter['path'] = 'node/123#foo'; $result = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) { return $id_field->theme($row); }); $this->assertSubString($result, $expected_result); - $expected_result = \Drupal::url('entity.node.canonical', ['node' => '123'], ['query' => ['foo' => NULL], 'absolute' => $absolute]); + $expected_result = Url::fromRoute('entity.node.canonical', ['node' => '123'], ['query' => ['foo' => NULL], 'absolute' => $absolute])->toString(); $alter['path'] = 'node/123?foo'; $result = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) { return $id_field->theme($row); }); $this->assertSubString($result, $expected_result); - $expected_result = \Drupal::url('entity.node.canonical', ['node' => '123'], ['query' => ['foo' => 'bar', 'bar' => 'baz'], 'absolute' => $absolute]); + $expected_result = Url::fromRoute('entity.node.canonical', ['node' => '123'], ['query' => ['foo' => 'bar', 'bar' => 'baz'], 'absolute' => $absolute])->toString(); $alter['path'] = 'node/123?foo=bar&bar=baz'; $result = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) { return $id_field->theme($row); @@ -257,7 +257,7 @@ public function testAlterUrl() { $this->assertSubString(Html::decodeEntities($result), Html::decodeEntities($expected_result)); // @todo The route-based URL generator strips out NULL attributes. - // $expected_result = \Drupal::url('entity.node.canonical', ['node' => '123'], ['query' => ['foo' => NULL], 'fragment' => 'bar', 'absolute' => $absolute]); + // $expected_result = Url::fromRoute('entity.node.canonical', ['node' => '123'], ['query' => ['foo' => NULL], 'fragment' => 'bar', 'absolute' => $absolute])->toString(); $expected_result = Url::fromUserInput('/node/123', array('query' => array('foo' => NULL), 'fragment' => 'bar', 'absolute' => $absolute))->toString(); $alter['path'] = 'node/123?foo#bar'; $result = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) { @@ -265,7 +265,7 @@ public function testAlterUrl() { }); $this->assertSubString(Html::decodeEntities($result), Html::decodeEntities($expected_result)); - $expected_result = \Drupal::url('', [], ['absolute' => $absolute]); + $expected_result = Url::fromRoute('', [], ['absolute' => $absolute])->toString(); $alter['path'] = ''; $result = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) { return $id_field->theme($row); diff --git a/core/modules/views/src/Tests/Plugin/DisplayTest.php b/core/modules/views/src/Tests/Plugin/DisplayTest.php index 3bbfd66..acc6f16 100644 --- a/core/modules/views/src/Tests/Plugin/DisplayTest.php +++ b/core/modules/views/src/Tests/Plugin/DisplayTest.php @@ -6,6 +6,7 @@ use Drupal\views\Entity\View; use Drupal\views\Views; use Drupal\views_test_data\Plugin\views\display\DisplayTest as DisplayTestPlugin; +use Drupal\Core\Url; /** * Tests the basic display plugin. @@ -180,7 +181,7 @@ public function testReadMore() { $this->setRawContent($output); $result = $this->xpath('//a[@class=:class]', array(':class' => 'more-link')); - $this->assertEqual($result[0]->attributes()->href, \Drupal::url('view.test_display_more.page_1'), 'The right more link is shown.'); + $this->assertEqual($result[0]->attributes()->href, Url::fromRoute('view.test_display_more.page_1')->toString(), 'The right more link is shown.'); $this->assertEqual(trim($result[0][0]), $expected_more_text, 'The right link text is shown.'); // Test the renderMoreLink method directly. This could be directly unit @@ -189,7 +190,7 @@ public function testReadMore() { $more_link = $renderer->renderRoot($more_link); $this->setRawContent($more_link); $result = $this->xpath('//a[@class=:class]', array(':class' => 'more-link')); - $this->assertEqual($result[0]->attributes()->href, \Drupal::url('view.test_display_more.page_1'), 'The right more link is shown.'); + $this->assertEqual($result[0]->attributes()->href, Url::fromRoute('view.test_display_more.page_1')->toString(), 'The right more link is shown.'); $this->assertEqual(trim($result[0][0]), $expected_more_text, 'The right link text is shown.'); // Test the useMoreText method directly. This could be directly unit diff --git a/core/modules/views/src/Tests/Wizard/BasicTest.php b/core/modules/views/src/Tests/Wizard/BasicTest.php index aa4fc34..10d13cc 100644 --- a/core/modules/views/src/Tests/Wizard/BasicTest.php +++ b/core/modules/views/src/Tests/Wizard/BasicTest.php @@ -39,9 +39,9 @@ function testViewsWizardAndListing() { $this->drupalGet('admin/structure/views'); $this->assertText($view1['label']); $this->assertText($view1['description']); - $this->assertLinkByHref(\Drupal::url('entity.view.edit_form', ['view' => $view1['id']])); - $this->assertLinkByHref(\Drupal::url('entity.view.delete_form', ['view' => $view1['id']])); - $this->assertLinkByHref(\Drupal::url('entity.view.duplicate_form', ['view' => $view1['id']])); + $this->assertLinkByHref(Url::fromRoute('entity.view.edit_form', ['view' => $view1['id']])->toString()); + $this->assertLinkByHref(Url::fromRoute('entity.view.delete_form', ['view' => $view1['id']])->toString()); + $this->assertLinkByHref(Url::fromRoute('entity.view.duplicate_form', ['view' => $view1['id']])->toString()); // The view should not have a REST export display. $this->assertNoText('REST export', 'When no options are enabled in the wizard, the resulting view does not have a REST export display.'); diff --git a/core/modules/views/views.module b/core/modules/views/views.module index e1a4d8c..e941ec5 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -29,7 +29,7 @@ function views_help($route_name, RouteMatchInterface $route_match) { $output .= '

    ' . t('About') . '

    '; $output .= '

    ' . t('The Views module provides a back end to fetch information from content, user accounts, taxonomy terms, and other entities from the database and present it to the user as a grid, HTML list, table, unformatted list, etc. The resulting displays are known generally as views.') . '

    '; $output .= '

    ' . t('For more information, see the online documentation for the Views module.', array(':views' => 'https://www.drupal.org/documentation/modules/views')) . '

    '; - $output .= '

    ' . t('In order to create and modify your own views using the administration and configuration user interface, you will need to enable either the Views UI module in core or a contributed module that provides a user interface for Views. See the Views UI module help page for more information.', array(':views-ui' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? \Drupal::url('help.page', array('name' => 'views_ui')) : '#')) . '

    '; + $output .= '

    ' . t('In order to create and modify your own views using the administration and configuration user interface, you will need to enable either the Views UI module in core or a contributed module that provides a user interface for Views. See the Views UI module help page for more information.', array(':views-ui' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? Url::fromRoute('help.page', array('name' => 'views_ui'))->toString() : '#')) . '

    '; $output .= '

    ' . t('Uses') . '

    '; $output .= '
    '; $output .= '
    ' . t('Adding functionality to administrative pages') . '
    '; @@ -54,7 +54,7 @@ function views_views_pre_render($view) { // If using AJAX, send identifying data about this view. if ($view->ajaxEnabled() && empty($view->is_attachment) && empty($view->live_preview)) { $view->element['#attached']['drupalSettings']['views'] = array( - 'ajax_path' => \Drupal::url('views.ajax'), + 'ajax_path' => Url::fromRoute('views.ajax')->toString(), 'ajaxViews' => array( 'views_dom_id:' . $view->dom_id => array( 'view_name' => $view->storage->id(), diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc index 94c519e..f787273 100644 --- a/core/modules/views/views.theme.inc +++ b/core/modules/views/views.theme.inc @@ -249,11 +249,11 @@ function template_preprocess_views_view_summary(&$variables) { $active_urls = array( // Force system path. - \Drupal::url('', [], ['alias' => TRUE]), + Url::fromRoute('', [], ['alias' => TRUE])->toString(), // Force system path. Url::fromRouteMatch(\Drupal::routeMatch())->setOption('alias', TRUE)->toString(), // Could be an alias. - \Drupal::url(''), + Url::fromRoute('')->toString(), // Could be an alias. Url::fromRouteMatch(\Drupal::routeMatch())->toString(), ); @@ -338,9 +338,9 @@ function template_preprocess_views_view_summary_unformatted(&$variables) { $count = 0; $active_urls = array( // Force system path. - \Drupal::url('', [], ['alias' => TRUE]), + Url::fromRoute('', [], ['alias' => TRUE])->toString(), // Could be an alias. - \Drupal::url(''), + Url::fromRoute('')->toString(), ); $active_urls = array_combine($active_urls, $active_urls); @@ -1025,7 +1025,7 @@ function template_preprocess_views_mini_pager(&$variables) { $options = array( 'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] - 1), ); - $variables['items']['previous']['href'] = \Drupal::url('', [], $options); + $variables['items']['previous']['href'] = Url::fromRoute('', [], $options)->toString(); if (isset($tags[1])) { $variables['items']['previous']['text'] = $tags[1]; } @@ -1036,7 +1036,7 @@ function template_preprocess_views_mini_pager(&$variables) { $options = array( 'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] + 1), ); - $variables['items']['next']['href'] = \Drupal::url('', [], $options); + $variables['items']['next']['href'] = Url::fromRoute('', [], $options)->toString(); if (isset($tags[3])) { $variables['items']['next']['text'] = $tags[3]; } diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module index 5240aa7..33a9a74 100644 --- a/core/modules/views_ui/views_ui.module +++ b/core/modules/views_ui/views_ui.module @@ -19,15 +19,15 @@ function views_ui_help($route_name, RouteMatchInterface $route_match) { case 'help.page.views_ui': $output = ''; $output .= '

    ' . t('About') . '

    '; - $output .= '

    ' . t('The Views UI module provides an interface for managing views for the Views module. For more information, see the online documentation for the Views UI module.', array(':views' => \Drupal::url('help.page', array('name' => 'views')), ':handbook' => 'https://www.drupal.org/documentation/modules/views_ui')) . '

    '; + $output .= '

    ' . t('The Views UI module provides an interface for managing views for the Views module. For more information, see the online documentation for the Views UI module.', array(':views' => Url::fromRoute('help.page', array('name' => 'views'))->toString(), ':handbook' => 'https://www.drupal.org/documentation/modules/views_ui')) . '

    '; $output .= '

    ' . t('Uses') . '

    '; $output .= '
    '; $output .= '
    ' . t('Creating and managing views') . '
    '; - $output .= '
    ' . t('Views can be created from the Views list page by using the "Add new view" action. Existing views can be managed from the Views list page by locating the view in the "Enabled" or "Disabled" list and selecting the desired operation action, for example "Edit".', array(':list' => \Drupal::url('entity.view.collection', array('name' => 'views_ui')))) . '
    '; + $output .= '
    ' . t('Views can be created from the Views list page by using the "Add new view" action. Existing views can be managed from the Views list page by locating the view in the "Enabled" or "Disabled" list and selecting the desired operation action, for example "Edit".', array(':list' => Url::fromRoute('entity.view.collection', array('name' => 'views_ui'))->toString())) . '
    '; $output .= '
    ' . t('Enabling and disabling views') . '
    '; - $output .= '
    ' . t('Views can be enabled or disabled from the Views list page. To enable a view, find the view within the "Disabled" list and select the "Enable" operation. To disable a view find the view within the "Enabled" list and select the "Disable" operation.', array(':list' => \Drupal::url('entity.view.collection', array('name' => 'views_ui')))) . '
    '; + $output .= '
    ' . t('Views can be enabled or disabled from the Views list page. To enable a view, find the view within the "Disabled" list and select the "Enable" operation. To disable a view find the view within the "Enabled" list and select the "Disable" operation.', array(':list' => Url::fromRoute('entity.view.collection', array('name' => 'views_ui'))->toString())) . '
    '; $output .= '
    ' . t('Exporting and importing views') . '
    '; - $output .= '
    ' . t('Views can be exported and imported as configuration files by using the Configuration Manager module.', array(':config' => (\Drupal::moduleHandler()->moduleExists('config')) ? \Drupal::url('help.page', array('name' => 'config')) : '#')) . '
    '; + $output .= '
    ' . t('Views can be exported and imported as configuration files by using the Configuration Manager module.', array(':config' => (\Drupal::moduleHandler()->moduleExists('config')) ? Url::fromRoute('help.page', array('name' => 'config'))->toString() : '#')) . '
    '; $output .= '
    '; return $output; } diff --git a/core/tests/Drupal/Tests/Core/DrupalTest.php b/core/tests/Drupal/Tests/Core/DrupalTest.php index d4e3565..827a636 100644 --- a/core/tests/Drupal/Tests/Core/DrupalTest.php +++ b/core/tests/Drupal/Tests/Core/DrupalTest.php @@ -326,7 +326,7 @@ public function testUrl() { ->will($this->returnValue('path_string')); $this->setMockContainerService('url_generator', $generator); - $this->assertInternalType('string', \Drupal::url('test_route', $route_parameters, $options)); + $this->assertInternalType('string', Url::fromRoute('test_route', $route_parameters, $options)->toString()); } /** diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme index 5ace6b8..e23d2a5 100644 --- a/core/themes/seven/seven.theme +++ b/core/themes/seven/seven.theme @@ -6,6 +6,7 @@ */ use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Url; /** * Implements hook_preprocess_HOOK() for HTML document templates. @@ -61,7 +62,7 @@ function seven_preprocess_node_add_list(&$variables) { /** @var \Drupal\node\NodeTypeInterface $type */ foreach ($variables['content'] as $type) { $variables['types'][$type->id()]['label'] = $type->label(); - $variables['types'][$type->id()]['url'] = \Drupal::url('node.add', array('node_type' => $type->id())); + $variables['types'][$type->id()]['url'] = Url::fromRoute('node.add', array('node_type' => $type->id()))->toString(); } } } @@ -77,7 +78,7 @@ function seven_preprocess_block_content_add_list(&$variables) { foreach ($variables['content'] as $type) { $variables['types'][$type->id()]['label'] = $type->label(); $options = array('query' => \Drupal::request()->query->all()); - $variables['types'][$type->id()]['url'] = \Drupal::url('block_content.add_form', array('block_content_type' => $type->id()), $options); + $variables['types'][$type->id()]['url'] = Url::fromRoute('block_content.add_form', array('block_content_type' => $type->id()), $options)->toString(); } } }