From c0cc344fb63c888ed8b1c7903eac8bd88aa722cf Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Wed, 12 Apr 2023 15:28:50 +0100
Subject: [PATCH] Issue #3336780 by diegors, schlaukopf, xjm, fabiansierra5191:
Correctly capitalize "url" in documentation only, part 2
---
core/includes/theme.inc | 2 +-
core/lib/Drupal/Core/Asset/JsOptimizer.php | 2 +-
core/lib/Drupal/Core/Command/DbCommandBase.php | 2 +-
.../Core/Entity/Controller/EntityController.php | 2 +-
.../EventSubscriber/MaintenanceModeSubscriber.php | 2 +-
.../EntityReferenceEntityFormatter.php | 2 +-
core/lib/Drupal/Core/Form/ConfirmFormHelper.php | 2 +-
.../Core/Installer/Form/SelectLanguageForm.php | 2 +-
core/lib/Drupal/Core/Mail/MailFormatHelper.php | 2 +-
core/lib/Drupal/Core/Routing/RouteProvider.php | 4 ++--
.../Drupal/Core/Routing/RouteProviderInterface.php | 2 +-
core/lib/Drupal/Core/Routing/UrlGenerator.php | 4 ++--
core/lib/Drupal/Core/Utility/LinkGenerator.php | 4 ++--
core/modules/ckeditor5/ckeditor5.module | 4 ++--
.../src/Controller/CKEditor5ImageController.php | 2 +-
.../tests/src/Functional/ImageUploadTest.php | 4 ++--
.../comment/src/Controller/CommentController.php | 2 +-
.../modules/dblog/tests/src/Functional/DbLogTest.php | 2 +-
.../dblog/tests/src/Functional/FakeLogEntries.php | 2 +-
.../file/tests/src/Functional/DownloadTest.php | 2 +-
core/modules/file/tests/src/Kernel/FileUrlTest.php | 2 +-
core/modules/filter/filter.module | 2 +-
.../modules/forum/src/Controller/ForumController.php | 2 +-
.../JsonApiDocumentTopLevelNormalizerTest.php | 2 +-
.../LanguageNegotiationContentEntity.php | 2 +-
.../LanguageBrowserDetectionAcceptLanguageTest.php | 2 +-
.../tests/src/Kernel/EntityUrlLanguageTest.php | 2 +-
.../Unit/Plugin/migrate/process/FieldLinkTest.php | 2 +-
core/modules/media/src/OEmbed/UrlResolver.php | 2 +-
.../src/MenuLinkContentInterface.php | 2 +-
.../tests/src/Functional/NodeTranslationUITest.php | 2 +-
.../src/Kernel/Migrate/d6/MigrateUrlAliasTest.php | 2 +-
core/modules/system/src/Routing/AssetRoutes.php | 2 +-
core/modules/system/templates/menu.html.twig | 2 +-
.../modules/mail_html_test/mail_html_test.module | 2 +-
.../Functional/Menu/LinksetControllerTestBase.php | 2 +-
.../system/tests/src/Functional/System/AdminTest.php | 2 +-
.../system/tests/src/Kernel/Mail/MailTest.php | 6 +++---
.../tests/src/Kernel/Scripts/DbCommandBaseTest.php | 2 +-
.../tests/src/Functional/TermAutocompleteTest.php | 2 +-
.../src/Functional/Views/TaxonomyIndexTidUiTest.php | 2 +-
.../src/Kernel/Views/TaxonomyDefaultArgumentTest.php | 4 ++--
.../toolbar/templates/menu--toolbar.html.twig | 2 +-
.../tests/src/Nightwatch/Tests/toolbarApiTest.js | 2 +-
.../tests/src/Nightwatch/Tests/toolbarTest.js | 2 +-
.../src/Plugin/tour/tip/TipPluginImageLegacy.php | 4 ++--
.../update/templates/update-project-status.html.twig | 2 +-
.../src/Plugin/views/argument_validator/UserName.php | 2 +-
.../tests/src/Functional/UserAccountLinksTest.php | 2 +-
.../tests/src/Functional/UserPasswordResetTest.php | 2 +-
core/modules/views/js/ajax_view.js | 2 +-
core/modules/views/js/base.js | 4 ++--
core/modules/views/src/Form/ViewsForm.php | 2 +-
.../src/Plugin/views/display/DisplayPluginBase.php | 4 ++--
.../Plugin/views/display/DisplayPluginInterface.php | 2 +-
core/modules/views/src/ViewExecutable.php | 2 +-
.../tests/src/Functional/Plugin/DisplayTest.php | 6 +++---
core/modules/views_ui/src/ViewEditForm.php | 2 +-
.../tests/src/Functional/DisplayPathTest.php | 2 +-
.../components/navigation/menu--main.html.twig | 2 +-
.../templates/components/navigation/menu.html.twig | 2 +-
.../FunctionalTests/Update/UpdatePathTestBase.php | 2 +-
core/tests/Drupal/Tests/BrowserTestBase.php | 2 +-
.../Drupal/Tests/Component/Utility/UrlHelperTest.php | 12 ++++++------
.../claro/templates/classy/navigation/menu.html.twig | 2 +-
.../templates/navigation/menu--toolbar.html.twig | 2 +-
.../navigation/menu--primary-menu.html.twig | 2 +-
.../navigation/menu--secondary-menu.html.twig | 2 +-
.../olivero/templates/navigation/menu.html.twig | 2 +-
.../templates/admin/update-project-status.html.twig | 2 +-
.../templates/navigation/menu--toolbar.html.twig | 2 +-
.../stable9/templates/navigation/menu.html.twig | 2 +-
.../templates/navigation/menu.html.twig | 2 +-
73 files changed, 91 insertions(+), 91 deletions(-)
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 0becb4ef6863..c8ecdecbee4f 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -619,7 +619,7 @@ function template_preprocess_datetime_wrapper(&$variables) {
* - attributes: A keyed array of attributes for the <ul> containing the list
* of links.
* - set_active_class: (optional) Whether each link should compare the
- * route_name + route_parameters or url (path), language, and query options
+ * route_name + route_parameters or URL (path), language, and query options
* to the current URL, to determine whether the link is "active". If so,
* attributes will be added to the HTML elements for both the link and the
* list item that contains it, which will result in an "is-active" class
diff --git a/core/lib/Drupal/Core/Asset/JsOptimizer.php b/core/lib/Drupal/Core/Asset/JsOptimizer.php
index 10e3df7d7fcb..497add679794 100644
--- a/core/lib/Drupal/Core/Asset/JsOptimizer.php
+++ b/core/lib/Drupal/Core/Asset/JsOptimizer.php
@@ -50,7 +50,7 @@ public function optimize(array $js_asset) {
* Contents of the javascript asset.
*/
public function clean($contents) {
- // Remove JS source and source mapping urls or these may cause 404 errors.
+ // Remove JS source and source mapping URLs or these may cause 404 errors.
$contents = preg_replace('/\/\/(#|@)\s(sourceURL|sourceMappingURL)=\s*(\S*?)\s*$/m', '', $contents);
return $contents;
diff --git a/core/lib/Drupal/Core/Command/DbCommandBase.php b/core/lib/Drupal/Core/Command/DbCommandBase.php
index 6845b9607556..ff620e4d9b2f 100644
--- a/core/lib/Drupal/Core/Command/DbCommandBase.php
+++ b/core/lib/Drupal/Core/Command/DbCommandBase.php
@@ -30,7 +30,7 @@ protected function configure() {
* @return \Drupal\Core\Database\Connection
*/
protected function getDatabaseConnection(InputInterface $input) {
- // Load connection from a url.
+ // Load connection from a URL.
if ($input->getOption('database-url')) {
// @todo this could probably be refactored to not use a global connection.
// Ensure database connection isn't set.
diff --git a/core/lib/Drupal/Core/Entity/Controller/EntityController.php b/core/lib/Drupal/Core/Entity/Controller/EntityController.php
index 041fdc8480c3..c3743c3e0680 100644
--- a/core/lib/Drupal/Core/Entity/Controller/EntityController.php
+++ b/core/lib/Drupal/Core/Entity/Controller/EntityController.php
@@ -63,7 +63,7 @@ class EntityController implements ContainerInjectionInterface {
protected $renderer;
/**
- * The url generator.
+ * The URL generator.
*/
protected UrlGeneratorInterface $urlGenerator;
diff --git a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
index e47c0b35bd0c..23a2daa9a2be 100644
--- a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
@@ -84,7 +84,7 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface {
* @param \Drupal\Core\StringTranslation\TranslationInterface $translation
* The string translation.
* @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
- * The url generator.
+ * The URL generator.
* @param \Drupal\Core\Session\AccountInterface $account
* The current user.
* @param \Drupal\Core\Render\BareHtmlPageRendererInterface $bare_html_page_renderer
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
index 5dbff76dd886..83994942a135 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
@@ -197,7 +197,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
$elements[$delta] = $view_builder->view($entity, $view_mode, $entity->language()->getId());
// Add a resource attribute to set the mapping property's value to the
- // entity's url. Since we don't know what the markup of the entity will
+ // entity's URL. Since we don't know what the markup of the entity will
// be, we shouldn't rely on it for structured data.
if (!empty($items[$delta]->_attributes) && !$entity->isNew() && $entity->hasLinkTemplate('canonical')) {
$items[$delta]->_attributes += ['resource' => $entity->toUrl()->toString()];
diff --git a/core/lib/Drupal/Core/Form/ConfirmFormHelper.php b/core/lib/Drupal/Core/Form/ConfirmFormHelper.php
index fc92ff97dbb3..ca662aca190c 100644
--- a/core/lib/Drupal/Core/Form/ConfirmFormHelper.php
+++ b/core/lib/Drupal/Core/Form/ConfirmFormHelper.php
@@ -34,7 +34,7 @@ public static function buildCancelLink(ConfirmFormInterface $form, Request $requ
$url = Url::fromUserInput('/' . ltrim($options['path'], '/'), $options);
}
catch (\InvalidArgumentException $e) {
- // Suppress the exception and fall back to the form's cancel url.
+ // Suppress the exception and fall back to the form's cancel URL.
}
}
// Check for a route-based cancel link.
diff --git a/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php b/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php
index bd61dab1dc7e..77b9399e23d5 100644
--- a/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php
+++ b/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php
@@ -71,7 +71,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $install_
$form['help'] = [
'#type' => 'item',
// #markup is XSS admin filtered which ensures unsafe protocols will be
- // removed from the url.
+ // removed from the URL.
'#markup' => '<p>Translations will be downloaded from the <a href="https://localize.drupal.org/download">Drupal Translation website</a>. If you do not want this, select <a href="' . $link_to_english . '">English</a>.</p>',
'#states' => [
'invisible' => [
diff --git a/core/lib/Drupal/Core/Mail/MailFormatHelper.php b/core/lib/Drupal/Core/Mail/MailFormatHelper.php
index 97cbbc0fe242..7626736ad81f 100644
--- a/core/lib/Drupal/Core/Mail/MailFormatHelper.php
+++ b/core/lib/Drupal/Core/Mail/MailFormatHelper.php
@@ -12,7 +12,7 @@
class MailFormatHelper {
/**
- * Internal array of urls replaced with tokens.
+ * Internal array of URLs replaced with tokens.
*
* @var array
*/
diff --git a/core/lib/Drupal/Core/Routing/RouteProvider.php b/core/lib/Drupal/Core/Routing/RouteProvider.php
index 87f19e453a2c..8f11bb00a2dd 100644
--- a/core/lib/Drupal/Core/Routing/RouteProvider.php
+++ b/core/lib/Drupal/Core/Routing/RouteProvider.php
@@ -142,7 +142,7 @@ public function __construct(Connection $connection, StateInterface $state, Curre
* RouteObjectInterface to link to a content document.
*
* This method may not throw an exception based on implementation specific
- * restrictions on the url. That case is considered a not found - returning
+ * restrictions on the URL. That case is considered a not found - returning
* an empty array. Exceptions are only used to abort the whole request in
* case something is seriously broken, like the storage backend being down.
*
@@ -155,7 +155,7 @@ public function __construct(Connection $connection, StateInterface $state, Curre
* A request against which to match.
*
* @return \Symfony\Component\Routing\RouteCollection
- * RouteCollection with all urls that could potentially match $request.
+ * RouteCollection with all URLs that could potentially match $request.
* Empty collection if nothing can match. The collection will be sorted from
* highest to lowest fit (match of path parts) and then in ascending order
* by route name for routes with the same fit.
diff --git a/core/lib/Drupal/Core/Routing/RouteProviderInterface.php b/core/lib/Drupal/Core/Routing/RouteProviderInterface.php
index 0c06c8c72d54..b00fb773ae75 100644
--- a/core/lib/Drupal/Core/Routing/RouteProviderInterface.php
+++ b/core/lib/Drupal/Core/Routing/RouteProviderInterface.php
@@ -17,7 +17,7 @@ interface RouteProviderInterface {
* RouteObjectInterface to link to a content document.
*
* This method may not throw an exception based on implementation specific
- * restrictions on the url. That case is considered a not found - returning
+ * restrictions on the URL. That case is considered a not found - returning
* an empty array. Exceptions are only used to abort the whole request in
* case something is seriously broken, like the storage backend being down.
*
diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index 99dfcc4a2e48..bb8d8df4db7a 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -38,7 +38,7 @@ class UrlGenerator implements UrlGeneratorInterface {
protected $requestStack;
/**
- * The path processor to convert the system path to one suitable for urls.
+ * The path processor to convert the system path to one suitable for URLs.
*
* @var \Drupal\Core\PathProcessor\OutboundPathProcessorInterface
*/
@@ -76,7 +76,7 @@ class UrlGenerator implements UrlGeneratorInterface {
* @param \Drupal\Core\Routing\RouteProviderInterface $provider
* The route provider to be searched for routes.
* @param \Drupal\Core\PathProcessor\OutboundPathProcessorInterface $path_processor
- * The path processor to convert the system path to one suitable for urls.
+ * The path processor to convert the system path to one suitable for URLs.
* @param \Drupal\Core\RouteProcessor\OutboundRouteProcessorInterface $route_processor
* The route processor.
* @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
diff --git a/core/lib/Drupal/Core/Utility/LinkGenerator.php b/core/lib/Drupal/Core/Utility/LinkGenerator.php
index c30b233b0610..0c100573e254 100644
--- a/core/lib/Drupal/Core/Utility/LinkGenerator.php
+++ b/core/lib/Drupal/Core/Utility/LinkGenerator.php
@@ -45,7 +45,7 @@ class LinkGenerator implements LinkGeneratorInterface {
* Constructs a LinkGenerator instance.
*
* @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
- * The url generator.
+ * The URL generator.
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler.
* @param \Drupal\Core\Render\RendererInterface $renderer
@@ -196,7 +196,7 @@ public function generate($text, Url $url) {
* @param array $attributes
* The attributes of the generated link.
* @param array $variables
- * The link text, url, and other options.
+ * The link text, URL, and other options.
*
* @return \Drupal\Core\GeneratedLink
* The generated link, along with its associated cacheability metadata.
diff --git a/core/modules/ckeditor5/ckeditor5.module b/core/modules/ckeditor5/ckeditor5.module
index af80c687fbc6..cf7efbda2174 100644
--- a/core/modules/ckeditor5/ckeditor5.module
+++ b/core/modules/ckeditor5/ckeditor5.module
@@ -632,11 +632,11 @@ function _ckeditor5_theme_css($theme = NULL): array {
if (isset($info['ckeditor5-stylesheets']) && $info['ckeditor5-stylesheets'] !== FALSE) {
$css = $info['ckeditor5-stylesheets'];
foreach ($css as $key => $url) {
- // CSS url is external or relative to Drupal root.
+ // CSS URL is external or relative to Drupal root.
if (UrlHelper::isExternal($url) || $url[0] === '/') {
$css[$key] = $url;
}
- // CSS url is relative to theme.
+ // CSS URL is relative to theme.
else {
$css[$key] = '/' . $theme_path . '/' . $url;
}
diff --git a/core/modules/ckeditor5/src/Controller/CKEditor5ImageController.php b/core/modules/ckeditor5/src/Controller/CKEditor5ImageController.php
index 715183ac1fe1..47f8e1e3db0f 100644
--- a/core/modules/ckeditor5/src/Controller/CKEditor5ImageController.php
+++ b/core/modules/ckeditor5/src/Controller/CKEditor5ImageController.php
@@ -113,7 +113,7 @@ public static function create(ContainerInterface $container) {
* The current request object.
*
* @return \Symfony\Component\HttpFoundation\JsonResponse
- * A JSON object including the file url.
+ * A JSON object including the file URL.
*
* @throws \Symfony\Component\HttpKernel\Exception\HttpException
* Thrown when file system errors occur.
diff --git a/core/modules/ckeditor5/tests/src/Functional/ImageUploadTest.php b/core/modules/ckeditor5/tests/src/Functional/ImageUploadTest.php
index 038e4a6afa2f..fdd7235e44af 100644
--- a/core/modules/ckeditor5/tests/src/Functional/ImageUploadTest.php
+++ b/core/modules/ckeditor5/tests/src/Functional/ImageUploadTest.php
@@ -175,10 +175,10 @@ protected function uploadRequest(Url $url, string $file_contents, string $file_n
}
/**
- * Provides the image upload url.
+ * Provides the image upload URL.
*
* @return \Drupal\Core\Url
- * The upload image url for the basic_html format.
+ * The upload image URL for the basic_html format.
*/
protected function getUploadUrl() {
$token = $this->container->get('csrf_token')->get('ckeditor5/upload-image/basic_html');
diff --git a/core/modules/comment/src/Controller/CommentController.php b/core/modules/comment/src/Controller/CommentController.php
index 8c3a9c74b09c..f5b9bfac529a 100644
--- a/core/modules/comment/src/Controller/CommentController.php
+++ b/core/modules/comment/src/Controller/CommentController.php
@@ -183,7 +183,7 @@ public function commentPermalinkTitle(CommentInterface $comment) {
* The node object identified by the legacy URL.
*
* @return \Symfony\Component\HttpFoundation\RedirectResponse
- * Redirects user to new url.
+ * Redirects user to new URL.
*
* @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
*/
diff --git a/core/modules/dblog/tests/src/Functional/DbLogTest.php b/core/modules/dblog/tests/src/Functional/DbLogTest.php
index 173c17795aea..e44fa0aad131 100644
--- a/core/modules/dblog/tests/src/Functional/DbLogTest.php
+++ b/core/modules/dblog/tests/src/Functional/DbLogTest.php
@@ -199,7 +199,7 @@ public function testLogEventNotFoundPage() {
* Tests individual log event page with missing log attributes.
*
* In some cases few log attributes are missing. For example:
- * - Missing referer: When request is made to a specific url directly and
+ * - Missing referer: When request is made to a specific URL directly and
* error occurred. In this case there is no referer.
* - Incorrect location: When location attribute is incorrect uri which can
* not be used to generate a valid link.
diff --git a/core/modules/dblog/tests/src/Functional/FakeLogEntries.php b/core/modules/dblog/tests/src/Functional/FakeLogEntries.php
index 588510eebceb..fa44d5593923 100644
--- a/core/modules/dblog/tests/src/Functional/FakeLogEntries.php
+++ b/core/modules/dblog/tests/src/Functional/FakeLogEntries.php
@@ -29,7 +29,7 @@ trait FakeLogEntries {
* - 'link': String linking to view the result of the event.
* - 'uid': Int identifying the user id for the user.
* - 'request_uri': String identifying the location of the request.
- * - 'referer': String identifying the referring url.
+ * - 'referer': String identifying the referring URL.
* - 'ip': String The ip address of the client machine triggering the log
* entry.
* - 'timestamp': Int unix timestamp.
diff --git a/core/modules/file/tests/src/Functional/DownloadTest.php b/core/modules/file/tests/src/Functional/DownloadTest.php
index 3bf34c1c545d..1208bcb22cc8 100644
--- a/core/modules/file/tests/src/Functional/DownloadTest.php
+++ b/core/modules/file/tests/src/Functional/DownloadTest.php
@@ -135,7 +135,7 @@ protected function doPrivateFileTransferTest() {
$response = $http_client->head($url, ['http_errors' => FALSE]);
$this->assertSame(403, $response->getStatusCode(), 'Correctly denied access to a file when file_test sets the header to -1.');
- // Try requesting the private file url without a file specified.
+ // Try requesting the private file URL without a file specified.
file_test_reset();
$this->drupalGet('/system/files');
$this->assertSession()->statusCodeEquals(404);
diff --git a/core/modules/file/tests/src/Kernel/FileUrlTest.php b/core/modules/file/tests/src/Kernel/FileUrlTest.php
index a7ca1ef36681..9b4df303859d 100644
--- a/core/modules/file/tests/src/Kernel/FileUrlTest.php
+++ b/core/modules/file/tests/src/Kernel/FileUrlTest.php
@@ -5,7 +5,7 @@
use Drupal\Core\File\FileSystemInterface;
/**
- * Tests the file url.
+ * Tests the file URL.
*
* @group file
*/
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index ea616be9f9a6..c7a1a14aeb0e 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -488,7 +488,7 @@ function _filter_url($text, $filter) {
$valid_url_query_ending_chars = '[a-zA-Z0-9_&=#\/]';
// full path
- // and allow @ in a url, but only in the middle. Catch things like http://example.com/@user/
+ // and allow @ in a URL, but only in the middle. Catch things like http://example.com/@user/
$valid_url_path = '(?:(?:' . $valid_url_path_characters . '*(?:' . $valid_url_balanced_parens . $valid_url_path_characters . '*)*' . $valid_url_ending_characters . ')|(?:@' . $valid_url_path_characters . '+\/))';
// Prepare domain name pattern.
diff --git a/core/modules/forum/src/Controller/ForumController.php b/core/modules/forum/src/Controller/ForumController.php
index a7799e85dba7..de4df1410088 100644
--- a/core/modules/forum/src/Controller/ForumController.php
+++ b/core/modules/forum/src/Controller/ForumController.php
@@ -307,7 +307,7 @@ protected function buildActionLinks($vid, TermInterface $forum_term = NULL) {
];
if ($forum_term && $forum_term->bundle() == $vid) {
// We are viewing a forum term (specific forum), append the tid to
- // the url.
+ // the URL.
$links[$type]['#link']['localized_options']['query']['forum_id'] = $forum_term->id();
}
}
diff --git a/core/modules/jsonapi/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php b/core/modules/jsonapi/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
index 6134c0871ff2..3d04433e3c06 100644
--- a/core/modules/jsonapi/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
+++ b/core/modules/jsonapi/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
@@ -476,7 +476,7 @@ public function testAliasFieldRouteException() {
$this->assertNotEmpty($jsonapi_doc_object['meta']['omitted']);
foreach ($jsonapi_doc_object['meta']['omitted']['links'] as $key => $link) {
if (str_starts_with($key, 'item--')) {
- // Ensure that resource link contains url with the alias field.
+ // Ensure that resource link contains URL with the alias field.
$resource_link = Url::fromUri('internal:/jsonapi/user/user/' . $user->uuid() . '/user_roles')->setAbsolute()->toString(TRUE);
$this->assertEquals($resource_link->getGeneratedUrl(), $link['href']);
$this->assertEquals("The current user is not allowed to view this relationship. The user only has authorization for the 'view label' operation.", $link['meta']['detail']);
diff --git a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
index b210bbe0e642..12f349a461ea 100644
--- a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
+++ b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
@@ -209,7 +209,7 @@ protected function hasLowerLanguageNegotiationWeight() {
* outbound URL pointing to the same content entity.
*
* @param \Symfony\Component\Routing\Route $outbound_route
- * The route object for the current outbound url being processed.
+ * The route object for the current outbound URL being processed.
* @param \Symfony\Component\HttpFoundation\Request $request
* The HttpRequest object representing the current request.
*
diff --git a/core/modules/language/tests/src/Functional/LanguageBrowserDetectionAcceptLanguageTest.php b/core/modules/language/tests/src/Functional/LanguageBrowserDetectionAcceptLanguageTest.php
index c86ddeac300f..160f417bf31c 100644
--- a/core/modules/language/tests/src/Functional/LanguageBrowserDetectionAcceptLanguageTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageBrowserDetectionAcceptLanguageTest.php
@@ -40,7 +40,7 @@ protected function setUp(): void {
// Create FR.
ConfigurableLanguage::createFromLangcode('fr')->save();
- // Set language detection to url and browser detection.
+ // Set language detection to URL and browser detection.
$this->drupalGet('/admin/config/regional/language/detection');
$this->submitForm([
'language_interface[enabled][language-url]' => TRUE,
diff --git a/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php b/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php
index 85f88f0d4652..55e3f796ae85 100644
--- a/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php
+++ b/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php
@@ -90,7 +90,7 @@ public function testEntityUrlLanguageWithLanguageContentEnabled() {
// The method language-content-entity should run before language-url and
// append query parameter for the content language and prevent language-url
- // from overwriting the url.
+ // from overwriting the URL.
$this->assertStringContainsString('/en/entity_test/' . $this->entity->id() . '?' . LanguageNegotiationContentEntity::QUERY_PARAMETER . '=en', $this->entity->toUrl('canonical')->toString());
$this->assertStringContainsString('/en/entity_test/' . $this->entity->id() . '?' . LanguageNegotiationContentEntity::QUERY_PARAMETER . '=es', $this->entity->getTranslation('es')->toUrl('canonical')->toString());
$this->assertStringContainsString('/en/entity_test/' . $this->entity->id() . '?' . LanguageNegotiationContentEntity::QUERY_PARAMETER . '=fr', $this->entity->getTranslation('fr')->toUrl('canonical')->toString());
diff --git a/core/modules/link/tests/src/Unit/Plugin/migrate/process/FieldLinkTest.php b/core/modules/link/tests/src/Unit/Plugin/migrate/process/FieldLinkTest.php
index 1142ec0c2005..bcbda9e238f4 100644
--- a/core/modules/link/tests/src/Unit/Plugin/migrate/process/FieldLinkTest.php
+++ b/core/modules/link/tests/src/Unit/Plugin/migrate/process/FieldLinkTest.php
@@ -14,7 +14,7 @@
class FieldLinkTest extends UnitTestCase {
/**
- * Tests the url transformations in the FieldLink process plugin.
+ * Tests the URL transformations in the FieldLink process plugin.
*
* @dataProvider canonicalizeUriDataProvider
*/
diff --git a/core/modules/media/src/OEmbed/UrlResolver.php b/core/modules/media/src/OEmbed/UrlResolver.php
index 4f4e4d729a0a..c7d0e603259f 100644
--- a/core/modules/media/src/OEmbed/UrlResolver.php
+++ b/core/modules/media/src/OEmbed/UrlResolver.php
@@ -191,7 +191,7 @@ public function getResourceUrl($url, $max_width = NULL, $max_height = NULL) {
* The oEmbed provider for the asset.
*
* @return string
- * The resource url.
+ * The resource URL.
*/
protected function getEndpointMatchingUrl($url, Provider $provider) {
$endpoints = $provider->getEndpoints();
diff --git a/core/modules/menu_link_content/src/MenuLinkContentInterface.php b/core/modules/menu_link_content/src/MenuLinkContentInterface.php
index 583d16209731..7141efa69d7c 100644
--- a/core/modules/menu_link_content/src/MenuLinkContentInterface.php
+++ b/core/modules/menu_link_content/src/MenuLinkContentInterface.php
@@ -26,7 +26,7 @@ public function setInsidePlugin();
public function getTitle();
/**
- * Gets the url object pointing to the URL of the menu link content entity.
+ * Gets the URL object pointing to the URL of the menu link content entity.
*
* @return \Drupal\Core\Url
* A Url object instance.
diff --git a/core/modules/node/tests/src/Functional/NodeTranslationUITest.php b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
index b8b7d42486c0..efbef09f13f4 100644
--- a/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
+++ b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
@@ -338,7 +338,7 @@ public function testTranslationRendering() {
$display['display_options']['rendering_language'] = '***LANGUAGE_entity_translation***';
$view->save();
- // Need to check from the beginning, including the base_path, in the url
+ // Need to check from the beginning, including the base_path, in the URL
// since the pattern for the default language might be a substring of
// the strings for other languages.
$base_path = base_path();
diff --git a/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php b/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php
index 065d229f1fba..d79eaf26c94b 100644
--- a/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php
+++ b/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php
@@ -69,7 +69,7 @@ private function assertPath(int $pid, array $conditions, PathAliasInterface $pat
}
/**
- * Tests the url alias migration.
+ * Tests the URL alias migration.
*/
public function testUrlAlias() {
$id_map = $this->getMigration('d6_url_alias')->getIdMap();
diff --git a/core/modules/system/src/Routing/AssetRoutes.php b/core/modules/system/src/Routing/AssetRoutes.php
index 8b3d31aa73f1..ac0424b6fefc 100644
--- a/core/modules/system/src/Routing/AssetRoutes.php
+++ b/core/modules/system/src/Routing/AssetRoutes.php
@@ -8,7 +8,7 @@
use Symfony\Component\Routing\Route;
/**
- * Defines a routes' callback to register an url for serving assets.
+ * Defines a routes' callback to register a URL for serving assets.
*/
class AssetRoutes implements ContainerInjectionInterface {
diff --git a/core/modules/system/templates/menu.html.twig b/core/modules/system/templates/menu.html.twig
index b8a9aab2b56c..5348cd316569 100644
--- a/core/modules/system/templates/menu.html.twig
+++ b/core/modules/system/templates/menu.html.twig
@@ -9,7 +9,7 @@
* - attributes: HTML attributes for the menu item.
* - below: The menu item child items.
* - title: The menu link title.
- * - url: The menu link url, instance of \Drupal\Core\Url
+ * - url: The menu link URL, instance of \Drupal\Core\Url
* - localized_options: Menu link localized options.
* - is_expanded: TRUE if the link has visible children within the current
* menu tree.
diff --git a/core/modules/system/tests/modules/mail_html_test/mail_html_test.module b/core/modules/system/tests/modules/mail_html_test/mail_html_test.module
index f873c89b50aa..0803fb8ad313 100644
--- a/core/modules/system/tests/modules/mail_html_test/mail_html_test.module
+++ b/core/modules/system/tests/modules/mail_html_test/mail_html_test.module
@@ -2,7 +2,7 @@
/**
* @file
- * Helper module for the html mail and url conversion tests.
+ * Helper module for the html mail and URL conversion tests.
*/
/**
diff --git a/core/modules/system/tests/src/Functional/Menu/LinksetControllerTestBase.php b/core/modules/system/tests/src/Functional/Menu/LinksetControllerTestBase.php
index d01aff26108d..1899690ac546 100644
--- a/core/modules/system/tests/src/Functional/Menu/LinksetControllerTestBase.php
+++ b/core/modules/system/tests/src/Functional/Menu/LinksetControllerTestBase.php
@@ -151,7 +151,7 @@ protected function enableEndpoint(bool $enabled) {
}
/**
- * Retrieve reference linkset controller output adjusted for proper base url.
+ * Retrieve reference linkset controller output adjusted for proper base URL.
*
* @param string $filename
* Name of the file to read.
diff --git a/core/modules/system/tests/src/Functional/System/AdminTest.php b/core/modules/system/tests/src/Functional/System/AdminTest.php
index 0d4b798cd94d..ab08c866d8cc 100644
--- a/core/modules/system/tests/src/Functional/System/AdminTest.php
+++ b/core/modules/system/tests/src/Functional/System/AdminTest.php
@@ -156,7 +156,7 @@ public function testCompactMode() {
// The front page defaults to 'user/login', which redirects to 'user/{user}'
// for authenticated users. We cannot use '<front>', since this does not
- // match the redirected url.
+ // match the redirected URL.
$frontpage_url = 'user/' . $this->adminUser->id();
$this->drupalGet('admin/compact/on');
diff --git a/core/modules/system/tests/src/Kernel/Mail/MailTest.php b/core/modules/system/tests/src/Kernel/Mail/MailTest.php
index 76167feaa394..8398fd24ebd6 100644
--- a/core/modules/system/tests/src/Kernel/Mail/MailTest.php
+++ b/core/modules/system/tests/src/Kernel/Mail/MailTest.php
@@ -209,7 +209,7 @@ public function testConvertRelativeUrlsIntoAbsolute() {
// One random tag name.
$tag_name = strtolower($random->name(8, TRUE));
- // Test root relative urls.
+ // Test root relative URLs.
foreach (['href', 'src'] as $attribute) {
// Reset the state variable that holds sent messages.
\Drupal::state()->set('system.test_mail_collector', []);
@@ -231,7 +231,7 @@ public function testConvertRelativeUrlsIntoAbsolute() {
$this->assertSame($expected_html, $sent_message['body'], "Asserting that {$attribute} is properly converted for mails.");
}
- // Test protocol relative urls.
+ // Test protocol relative URLs.
foreach (['href', 'src'] as $attribute) {
// Reset the state variable that holds sent messages.
\Drupal::state()->set('system.test_mail_collector', []);
@@ -253,7 +253,7 @@ public function testConvertRelativeUrlsIntoAbsolute() {
$this->assertSame($expected_html, $sent_message['body'], "Asserting that {$attribute} is properly converted for mails.");
}
- // Test absolute urls.
+ // Test absolute URLs.
foreach (['href', 'src'] as $attribute) {
// Reset the state variable that holds sent messages.
\Drupal::state()->set('system.test_mail_collector', []);
diff --git a/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php b/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php
index 9f9d08e82f95..8f08d88dd0df 100644
--- a/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php
+++ b/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php
@@ -55,7 +55,7 @@ public function testSpecifyDatabaseDoesNotExist() {
}
/**
- * Tests supplying database connection as a url.
+ * Tests supplying database connection as a URL.
*/
public function testSpecifyDbUrl() {
$command = new DbCommandBaseTester();
diff --git a/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php b/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php
index 5e4b9784b71d..ba3c1aca2920 100644
--- a/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php
@@ -137,7 +137,7 @@ protected function setUp(): void {
$this->adminUser = $this->drupalCreateUser(['create article content']);
$this->drupalLogin($this->adminUser);
- // Retrieve the autocomplete url.
+ // Retrieve the autocomplete URL.
$this->drupalGet('node/add/article');
$field = $this->assertSession()->fieldExists("{$this->fieldName}[0][target_id]");
$this->autocompleteUrl = $this->getAbsoluteUrl($field->getAttribute('data-autocomplete-path'));
diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
index 89c93a465a97..173460d4b2fb 100644
--- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
@@ -301,7 +301,7 @@ public function testExposedGroupedFilter() {
$this->submitForm($edit, 'Apply');
$this->submitForm([], 'Save');
- // Visit the view's page url and validate the results.
+ // Visit the view's page URL and validate the results.
$this->drupalGet('/test-taxonomy-exposed-grouped-filter');
$this->submitForm(['field_views_testing_tags_target_id' => 1], 'Apply');
$this->assertSession()->pageTextContains($nodes[0]->getTitle());
diff --git a/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyDefaultArgumentTest.php b/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyDefaultArgumentTest.php
index c7499fb5a2e9..85c0282605c6 100644
--- a/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyDefaultArgumentTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyDefaultArgumentTest.php
@@ -22,10 +22,10 @@ class TaxonomyDefaultArgumentTest extends TaxonomyTestBase {
public static $testViews = ['taxonomy_default_argument_test'];
/**
- * Init view with a request by provided url.
+ * Init view with a request by provided URL.
*
* @param string $request_url
- * The requested url.
+ * The requested URL.
* @param string $view_name
* The name of the view.
*
diff --git a/core/modules/toolbar/templates/menu--toolbar.html.twig b/core/modules/toolbar/templates/menu--toolbar.html.twig
index 7ba45dba011f..d7a24a754e19 100644
--- a/core/modules/toolbar/templates/menu--toolbar.html.twig
+++ b/core/modules/toolbar/templates/menu--toolbar.html.twig
@@ -9,7 +9,7 @@
* - attributes: HTML attributes for the menu item.
* - below: The menu item child items.
* - title: The menu link title.
- * - url: The menu link url, instance of \Drupal\Core\Url
+ * - url: The menu link URL, instance of \Drupal\Core\Url
* - localized_options: Menu link localized options.
* - is_expanded: TRUE if the link has visible children within the current
* menu tree.
diff --git a/core/modules/toolbar/tests/src/Nightwatch/Tests/toolbarApiTest.js b/core/modules/toolbar/tests/src/Nightwatch/Tests/toolbarApiTest.js
index 13cf4c31918a..55f145bac969 100644
--- a/core/modules/toolbar/tests/src/Nightwatch/Tests/toolbarApiTest.js
+++ b/core/modules/toolbar/tests/src/Nightwatch/Tests/toolbarApiTest.js
@@ -36,7 +36,7 @@ module.exports = {
// To clear active tab/tray from previous tests
.execute(function () {
localStorage.clear();
- // Clear escapeAdmin url values.
+ // Clear escapeAdmin URL values.
sessionStorage.clear();
})
.drupalRelativeURL('/')
diff --git a/core/modules/toolbar/tests/src/Nightwatch/Tests/toolbarTest.js b/core/modules/toolbar/tests/src/Nightwatch/Tests/toolbarTest.js
index adab3f0212d3..e23488c900a8 100644
--- a/core/modules/toolbar/tests/src/Nightwatch/Tests/toolbarTest.js
+++ b/core/modules/toolbar/tests/src/Nightwatch/Tests/toolbarTest.js
@@ -44,7 +44,7 @@ module.exports = {
// To clear active tab/tray from previous tests
.execute(function () {
localStorage.clear();
- // Clear escapeAdmin url values.
+ // Clear escapeAdmin URL values.
sessionStorage.clear();
})
.drupalRelativeURL('/')
diff --git a/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImageLegacy.php b/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImageLegacy.php
index ff793c099b48..580063eb6a2e 100644
--- a/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImageLegacy.php
+++ b/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImageLegacy.php
@@ -19,10 +19,10 @@
class TipPluginImageLegacy extends TipPluginBase implements ContainerFactoryPluginInterface {
/**
- * The url which is used for the image in this Tip.
+ * The URL which is used for the image in this Tip.
*
* @var string
- * A url used for the image.
+ * A URL used for the image.
*/
protected $url;
diff --git a/core/modules/update/templates/update-project-status.html.twig b/core/modules/update/templates/update-project-status.html.twig
index e195ec2921a8..dceb552054d8 100644
--- a/core/modules/update/templates/update-project-status.html.twig
+++ b/core/modules/update/templates/update-project-status.html.twig
@@ -5,7 +5,7 @@
*
* Available variables:
* - title: The project title.
- * - url: The project url.
+ * - url: The project URL.
* - status: The project status.
* - label: The project status label.
* - attributes: HTML attributes for the project status.
diff --git a/core/modules/user/src/Plugin/views/argument_validator/UserName.php b/core/modules/user/src/Plugin/views/argument_validator/UserName.php
index 19ddc7c57709..8b047fc035e2 100644
--- a/core/modules/user/src/Plugin/views/argument_validator/UserName.php
+++ b/core/modules/user/src/Plugin/views/argument_validator/UserName.php
@@ -69,7 +69,7 @@ public function validateArgument($argument) {
*/
public function processSummaryArguments(&$args) {
// If the validation says the input is a username, we should reverse the
- // argument so it works for example for generation summary urls.
+ // argument so it works for example for generation summary URLs.
$uids_arg_keys = array_flip($args);
foreach ($this->userStorage->loadMultiple($args) as $uid => $account) {
diff --git a/core/modules/user/tests/src/Functional/UserAccountLinksTest.php b/core/modules/user/tests/src/Functional/UserAccountLinksTest.php
index 144c4d1f1c66..4c1fa0512406 100644
--- a/core/modules/user/tests/src/Functional/UserAccountLinksTest.php
+++ b/core/modules/user/tests/src/Functional/UserAccountLinksTest.php
@@ -117,7 +117,7 @@ public function testAccountPageTitles() {
}
/**
- * Ensures that logout url redirects an anonymous user to the front page.
+ * Ensures that logout URL redirects an anonymous user to the front page.
*/
public function testAnonymousLogout() {
$this->drupalGet('user/logout');
diff --git a/core/modules/user/tests/src/Functional/UserPasswordResetTest.php b/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
index 5bb8f3fe9b89..0afa8df352ef 100644
--- a/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
+++ b/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
@@ -119,7 +119,7 @@ public function testUserPasswordReset() {
$resetURL = $this->getResetURL();
$this->drupalGet($resetURL);
- // Ensure that the current url does not contain the hash and timestamp.
+ // Ensure that the current URL does not contain the hash and timestamp.
$this->assertSession()->addressEquals(Url::fromRoute('user.reset.form', ['uid' => $this->account->id()]));
$this->assertSession()->responseHeaderDoesNotExist('X-Drupal-Cache');
diff --git a/core/modules/views/js/ajax_view.js b/core/modules/views/js/ajax_view.js
index 6e30c173680c..34f0c54559a9 100644
--- a/core/modules/views/js/ajax_view.js
+++ b/core/modules/views/js/ajax_view.js
@@ -81,7 +81,7 @@
.slice(1)
.replace(/q=[^&]+&?|&?render=[^&]+/, '');
if (queryString !== '') {
- // If there is a '?' in ajaxPath, clean url are on and & should be
+ // If there is a '?' in ajaxPath, clean URL are on and & should be
// used to add parameters.
queryString = (/\?/.test(ajaxPath) ? '&' : '?') + queryString;
}
diff --git a/core/modules/views/js/base.js b/core/modules/views/js/base.js
index 5838e64b3fe0..378d43fa216d 100644
--- a/core/modules/views/js/base.js
+++ b/core/modules/views/js/base.js
@@ -51,7 +51,7 @@
Drupal.Views.parseViewArgs = function (href, viewPath) {
const returnObj = {};
const path = Drupal.Views.getPath(href);
- // Get viewPath url without baseUrl portion.
+ // Get viewPath URL without baseUrl portion.
const viewHref = Drupal.url(viewPath).substring(
drupalSettings.path.baseUrl.length,
);
@@ -96,7 +96,7 @@
Drupal.Views.getPath = function (href) {
href = Drupal.Views.pathPortion(href);
href = href.substring(drupalSettings.path.baseUrl.length, href.length);
- // 3 is the length of the '?q=' added to the url without clean urls.
+ // 3 is the length of the '?q=' added to the URL without clean URLs.
if (href.substring(0, 3) === '?q=') {
href = href.substring(3, href.length);
}
diff --git a/core/modules/views/src/Form/ViewsForm.php b/core/modules/views/src/Form/ViewsForm.php
index 8b274fe2c058..06e4d08d9d4b 100644
--- a/core/modules/views/src/Form/ViewsForm.php
+++ b/core/modules/views/src/Form/ViewsForm.php
@@ -73,7 +73,7 @@ class ViewsForm implements FormInterface, ContainerInjectionInterface {
* @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
* The class resolver to get the subform form objects.
* @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
- * The url generator to generate the form action.
+ * The URL generator to generate the form action.
* @param \Symfony\Component\HttpFoundation\RequestStack $requestStack
* The request stack.
* @param string $view_id
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index 167a9f8c2c54..7b764e476899 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -2137,7 +2137,7 @@ public function renderMoreLink() {
protected function getMoreUrl() {
$path = $this->getOption('link_url');
- // Return the display URL if there is no custom url.
+ // Return the display URL if there is no custom URL.
if ($this->getOption('link_display') !== 'custom_url' || empty($path)) {
return $this->view->getUrl(NULL, $this->display['id']);
}
@@ -2162,7 +2162,7 @@ protected function getMoreUrl() {
$path = $options['path'];
unset($options['path']);
- // Create url.
+ // Create URL.
// @todo Views should expect and store a leading /. See:
// https://www.drupal.org/node/2423913
$url = UrlHelper::isExternal($path) ? Url::fromUri($path, $options) : Url::fromUserInput('/' . ltrim($path, '/'), $options);
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php b/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
index 689b93712b39..bb75dde12b1f 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
@@ -588,7 +588,7 @@ public function viewExposedFormBlocks();
* where you can configure what should be done if the argument does not
* exist.
* - description: A description about how arguments are passed
- * to the display. For example blocks can't get arguments from url.
+ * to the display. For example blocks can't get arguments from URL.
*/
public function getArgumentText();
diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index 2be19b8ad92e..af976a24569c 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -254,7 +254,7 @@ class ViewExecutable {
public $override_url;
/**
- * Allow to override the path used for generated urls.
+ * Allow to override the path used for generated URLs.
*
* @var string
*/
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
index 2e99e8f5652f..b136be632565 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
@@ -229,7 +229,7 @@ public function testReadMoreCustomURL() {
$output = $renderer->renderRoot($output);
$this->assertStringContainsString('/node', $output, 'The read more link with href "/node" was found.');
- // Test more link with absolute url.
+ // Test more link with absolute URL.
$view->display_handler->setOption('link_display', 'custom_url');
$view->display_handler->setOption('link_url', 'http://drupal.org');
$this->executeView($view);
@@ -237,7 +237,7 @@ public function testReadMoreCustomURL() {
$output = $renderer->renderRoot($output);
$this->assertStringContainsString('http://drupal.org', $output, 'The read more link with href "http://drupal.org" was found.');
- // Test more link with query parameters in the url.
+ // Test more link with query parameters in the URL.
$view->display_handler->setOption('link_display', 'custom_url');
$view->display_handler->setOption('link_url', 'node?page=1&foo=bar');
$this->executeView($view);
@@ -245,7 +245,7 @@ public function testReadMoreCustomURL() {
$output = $renderer->renderRoot($output);
$this->assertStringContainsString('/node?page=1&foo=bar', $output, 'The read more link with href "/node?page=1&foo=bar" was found.');
- // Test more link with fragment in the url.
+ // Test more link with fragment in the URL.
$view->display_handler->setOption('link_display', 'custom_url');
$view->display_handler->setOption('link_url', 'node#target');
$this->executeView($view);
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index d10d3a3613e9..b6bbbe4ef665 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -324,7 +324,7 @@ public function save(array $form, FormStateInterface $form_state) {
$destination = $query->get('destination');
if (!empty($destination)) {
- // Find out the first display which has a changed path and redirect to this url.
+ // Find out the first display which has a changed path and redirect to this URL.
$old_view = Views::getView($view->id());
$old_view->initDisplay();
foreach ($old_view->displayHandlers as $id => $display) {
diff --git a/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php b/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
index 9f5c103ab08c..bc6a3207a4b8 100644
--- a/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
@@ -93,7 +93,7 @@ public function doPathXssFilterTest() {
$this->assertSession()->assertEscaped('/<object>malformed_path</object>');
$this->assertSession()->assertEscaped('/<script>alert("hello");</script>');
$this->assertSession()->assertEscaped('/<script>alert("hello I have placeholders %");</script>');
- // Links should be url-encoded.
+ // Links should be URL-encoded.
$this->assertSession()->responseContains('/%3Cobject%3Emalformed_path%3C/object%3E');
$this->assertSession()->responseContains('/%3Cscript%3Ealert%28%22hello%22%29%3B%3C/script%3E');
}
diff --git a/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu--main.html.twig b/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu--main.html.twig
index ced0de2176a8..185dccab32eb 100644
--- a/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu--main.html.twig
+++ b/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu--main.html.twig
@@ -9,7 +9,7 @@
* - attributes: HTML attributes for the menu item.
* - below: The menu item child items.
* - title: The menu link title.
- * - url: The menu link url, instance of \Drupal\Core\Url
+ * - url: The menu link URL, instance of \Drupal\Core\Url
* - localized_options: Menu link localized options.
* - is_expanded: TRUE if the link has visible children within the current
* menu tree.
diff --git a/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu.html.twig b/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu.html.twig
index 4a599ccc437d..bdee7c717359 100644
--- a/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu.html.twig
+++ b/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu.html.twig
@@ -9,7 +9,7 @@
* - attributes: HTML attributes for the menu item.
* - below: The menu item child items.
* - title: The menu link title.
- * - url: The menu link url, instance of \Drupal\Core\Url
+ * - url: The menu link URL, instance of \Drupal\Core\Url
* - localized_options: Menu link localized options.
* - is_expanded: TRUE if the link has visible children within the current
* menu tree.
diff --git a/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php b/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php
index 0f2088aa173d..ed5e1425a3df 100644
--- a/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php
+++ b/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php
@@ -138,7 +138,7 @@ protected function setUp(): void {
$kernel = TestRunnerKernel::createFromRequest($request, $autoloader);
$kernel->loadLegacyIncludes();
- // Set the update url. This must be set here rather than in
+ // Set the update URL. This must be set here rather than in
// self::__construct() or the old URL generator will leak additional test
// sites. Additionally, we need to prevent the path alias processor from
// running because we might not have a working alias system before running
diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index 4bb41d8f71ea..97da3a5071e1 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -548,7 +548,7 @@ public function installDrupal() {
// as expected.
$this->container->get('cache_tags.invalidator')->resetChecksums();
- // Generate a route to prime the url generator with the correct base url.
+ // Generate a route to prime the URL generator with the correct base URL.
// @todo Remove in https://www.drupal.org/project/drupal/issues/3207896.
Url::fromRoute('<front>')->setAbsolute()->toString();
diff --git a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
index 2b540e3980f5..23ca0d012d79 100644
--- a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
@@ -541,10 +541,10 @@ public static function providerTestStripDangerousProtocols() {
}
/**
- * Enhances test urls with schemes.
+ * Enhances test URLs with schemes.
*
* @param array $urls
- * The list of urls.
+ * The list of URLs.
*
* @return array
* A list of provider data with schemes.
@@ -561,10 +561,10 @@ protected function dataEnhanceWithScheme(array $urls) {
}
/**
- * Enhances test urls with prefixes.
+ * Enhances test URLs with prefixes.
*
* @param array $urls
- * The list of urls.
+ * The list of URLs.
*
* @return array
* A list of provider data with prefixes.
@@ -581,7 +581,7 @@ protected function dataEnhanceWithPrefix(array $urls) {
}
/**
- * Tests detecting external urls that point to local resources.
+ * Tests detecting external URLs that point to local resources.
*
* @param string $url
* The external URL to test.
@@ -661,7 +661,7 @@ public function providerTestExternalIsLocalInvalid() {
['http://example.com/foo', ''],
['http://example.com/foo', 'bar'],
['http://example.com/foo', 'http://'],
- // Invalid destination urls.
+ // Invalid destination URLs.
['', 'http://example.com/foo'],
['bar', 'http://example.com/foo'],
['/bar', 'http://example.com/foo'],
diff --git a/core/themes/claro/templates/classy/navigation/menu.html.twig b/core/themes/claro/templates/classy/navigation/menu.html.twig
index ef04cedd1756..91bd0f475c85 100644
--- a/core/themes/claro/templates/classy/navigation/menu.html.twig
+++ b/core/themes/claro/templates/classy/navigation/menu.html.twig
@@ -9,7 +9,7 @@
* - attributes: HTML attributes for the menu item.
* - below: The menu item child items.
* - title: The menu link title.
- * - url: The menu link url, instance of \Drupal\Core\Url
+ * - url: The menu link URL, instance of \Drupal\Core\Url
* - localized_options: Menu link localized options.
* - is_expanded: TRUE if the link has visible children within the current
* menu tree.
diff --git a/core/themes/claro/templates/navigation/menu--toolbar.html.twig b/core/themes/claro/templates/navigation/menu--toolbar.html.twig
index ead73a479a50..4a109382de23 100644
--- a/core/themes/claro/templates/navigation/menu--toolbar.html.twig
+++ b/core/themes/claro/templates/navigation/menu--toolbar.html.twig
@@ -12,7 +12,7 @@
* - attributes: HTML attributes for the menu item.
* - below: The menu item child items.
* - title: The menu link title.
- * - url: The menu link url, instance of \Drupal\Core\Url
+ * - url: The menu link URL, instance of \Drupal\Core\Url
* - localized_options: Menu link localized options.
* - is_expanded: TRUE if the link has visible children within the current
* menu tree.
diff --git a/core/themes/olivero/templates/navigation/menu--primary-menu.html.twig b/core/themes/olivero/templates/navigation/menu--primary-menu.html.twig
index 0338c1a1acdc..cbc13efb0896 100644
--- a/core/themes/olivero/templates/navigation/menu--primary-menu.html.twig
+++ b/core/themes/olivero/templates/navigation/menu--primary-menu.html.twig
@@ -9,7 +9,7 @@
* - attributes: HTML attributes for the menu item.
* - below: The menu item child items.
* - title: The menu link title.
- * - url: The menu link url, instance of \Drupal\Core\Url
+ * - url: The menu link URL, instance of \Drupal\Core\Url
* - localized_options: Menu link localized options.
* - is_expanded: TRUE if the link has visible children within the current
* menu tree.
diff --git a/core/themes/olivero/templates/navigation/menu--secondary-menu.html.twig b/core/themes/olivero/templates/navigation/menu--secondary-menu.html.twig
index 68d1b25b7d14..602ae632916b 100644
--- a/core/themes/olivero/templates/navigation/menu--secondary-menu.html.twig
+++ b/core/themes/olivero/templates/navigation/menu--secondary-menu.html.twig
@@ -9,7 +9,7 @@
* - attributes: HTML attributes for the menu item.
* - below: The menu item child items.
* - title: The menu link title.
- * - url: The menu link url, instance of \Drupal\Core\Url
+ * - url: The menu link URL, instance of \Drupal\Core\Url
* - localized_options: Menu link localized options.
* - is_expanded: TRUE if the link has visible children within the current
* menu tree.
diff --git a/core/themes/olivero/templates/navigation/menu.html.twig b/core/themes/olivero/templates/navigation/menu.html.twig
index 1f7eda20267b..a28693ce6c37 100644
--- a/core/themes/olivero/templates/navigation/menu.html.twig
+++ b/core/themes/olivero/templates/navigation/menu.html.twig
@@ -9,7 +9,7 @@
* - attributes: HTML attributes for the menu item.
* - below: The menu item child items.
* - title: The menu link title.
- * - url: The menu link url, instance of \Drupal\Core\Url
+ * - url: The menu link URL, instance of \Drupal\Core\Url
* - localized_options: Menu link localized options.
* - is_expanded: TRUE if the link has visible children within the current
* menu tree.
diff --git a/core/themes/stable9/templates/admin/update-project-status.html.twig b/core/themes/stable9/templates/admin/update-project-status.html.twig
index db681b59eea0..6d2d4c85cd15 100644
--- a/core/themes/stable9/templates/admin/update-project-status.html.twig
+++ b/core/themes/stable9/templates/admin/update-project-status.html.twig
@@ -5,7 +5,7 @@
*
* Available variables:
* - title: The project title.
- * - url: The project url.
+ * - url: The project URL.
* - status: The project status.
* - label: The project status label.
* - attributes: HTML attributes for the project status.
diff --git a/core/themes/stable9/templates/navigation/menu--toolbar.html.twig b/core/themes/stable9/templates/navigation/menu--toolbar.html.twig
index 2e6fd1735ce3..c0fb8ddc46db 100644
--- a/core/themes/stable9/templates/navigation/menu--toolbar.html.twig
+++ b/core/themes/stable9/templates/navigation/menu--toolbar.html.twig
@@ -9,7 +9,7 @@
* - attributes: HTML attributes for the menu item.
* - below: The menu item child items.
* - title: The menu link title.
- * - url: The menu link url, instance of \Drupal\Core\Url
+ * - url: The menu link URL, instance of \Drupal\Core\Url
* - localized_options: Menu link localized options.
* - is_expanded: TRUE if the link has visible children within the current
* menu tree.
diff --git a/core/themes/stable9/templates/navigation/menu.html.twig b/core/themes/stable9/templates/navigation/menu.html.twig
index ee1d534e478f..adcf63e8d494 100644
--- a/core/themes/stable9/templates/navigation/menu.html.twig
+++ b/core/themes/stable9/templates/navigation/menu.html.twig
@@ -9,7 +9,7 @@
* - attributes: HTML attributes for the menu item.
* - below: The menu item child items.
* - title: The menu link title.
- * - url: The menu link url, instance of \Drupal\Core\Url
+ * - url: The menu link URL, instance of \Drupal\Core\Url
* - localized_options: Menu link localized options.
* - is_expanded: TRUE if the link has visible children within the current
* menu tree.
diff --git a/core/themes/starterkit_theme/templates/navigation/menu.html.twig b/core/themes/starterkit_theme/templates/navigation/menu.html.twig
index ef04cedd1756..91bd0f475c85 100644
--- a/core/themes/starterkit_theme/templates/navigation/menu.html.twig
+++ b/core/themes/starterkit_theme/templates/navigation/menu.html.twig
@@ -9,7 +9,7 @@
* - attributes: HTML attributes for the menu item.
* - below: The menu item child items.
* - title: The menu link title.
- * - url: The menu link url, instance of \Drupal\Core\Url
+ * - url: The menu link URL, instance of \Drupal\Core\Url
* - localized_options: Menu link localized options.
* - is_expanded: TRUE if the link has visible children within the current
* menu tree.
--
GitLab