From 00bcd1740c5d239d7af875553059a71d49f1b208 Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Thu, 26 Jan 2023 16:06:23 -0600
Subject: [PATCH] Issue #2574981 by Manjit.Singh, dimaro, wengerk, darol100,
izus, pguillard, vsujeetkumar, Himanshu5050, snehi, paulocs, rakesh.gectcr,
jofitz, _utsavsharma, charginghawk, rajeshwari10, sdstyles, quietone,
benjifisher, marcusvsouza, LoMo, joelpittet, justAChris, cilefen, YesCT,
mradcliffe, spitzialist, annajl, jhodgdon, catch, alexpott, Sabbi0612,
kattekrab, Mile23, antojose, leanderl, rodrigoac: Fix grammar ("an URL"
should be "a URL") and consistent use of URL (not "url" / "Url") in
documentation only
---
core/lib/Drupal.php | 4 +--
.../Entity/Controller/EntityController.php | 2 +-
.../MaintenanceModeSubscriber.php | 2 +-
core/lib/Drupal/Core/Link.php | 2 +-
.../Core/ParamConverter/EntityConverter.php | 2 +-
.../Core/Path/PathValidatorInterface.php | 6 ++--
.../Core/Render/Element/PathElement.php | 2 +-
.../lib/Drupal/Core/Routing/NullGenerator.php | 2 +-
core/lib/Drupal/Core/Routing/UrlGenerator.php | 2 +-
.../Core/Routing/UrlGeneratorInterface.php | 2 +-
.../Drupal/Core/Template/TwigExtension.php | 4 +--
.../Core/Test/FunctionalTestSetupTrait.php | 6 ++--
core/lib/Drupal/Core/Url.php | 12 ++++----
.../lib/Drupal/Core/Utility/LinkGenerator.php | 4 +--
.../tests/src/Traits/BasicAuthTestTrait.php | 2 +-
.../Functional/BlockContentCreationTest.php | 2 +-
.../src/Functional/CommentInterfaceTest.php | 2 +-
.../src/Functional/CommentNonNodeTest.php | 2 +-
.../tests/src/Functional/CommentTitleTest.php | 2 +-
.../contact/src/ContactFormInterface.php | 6 ++--
.../src/Functional/ContactSitewideTest.php | 2 +-
.../src/Element/ContextualLinks.php | 2 +-
.../src/Plugin/migrate/process/d6/FileUri.php | 2 +-
.../Functional/FilterHtmlImageSecureTest.php | 2 +-
core/modules/forum/src/Form/ContainerForm.php | 2 +-
core/modules/forum/src/Form/ForumForm.php | 2 +-
.../image/src/Routing/ImageStyleRoutes.php | 2 +-
.../src/HttpKernel/PathProcessorLanguage.php | 2 +-
.../LanguageNegotiationContentEntity.php | 18 ++++++------
.../tests/src/Functional/Form/FormTest.php | 2 +-
.../ParamConverter/UpcastingTest.php | 2 +-
.../src/Functional/Routing/RouterTest.php | 2 +-
.../src/Functional/TermAutocompleteTest.php | 2 +-
.../src/Plugin/tour/tip/TipPluginImage.php | 4 +--
core/modules/update/src/UpdateFetcher.php | 2 +-
.../tests/src/Unit/UpdateFetcherTest.php | 4 +--
core/modules/views/src/Form/ViewsForm.php | 2 +-
.../Plugin/views/field/FieldPluginBase.php | 6 ++--
core/modules/views/src/ViewExecutable.php | 2 +-
.../src/Functional/Handler/FieldWebTest.php | 6 ++--
.../tests/src/Kernel/Handler/FieldUrlTest.php | 2 +-
.../Unit/Plugin/field/FieldPluginBaseTest.php | 10 +++----
.../tests/src/Functional/DuplicateTest.php | 2 +-
.../tests/src/Functional/RedirectTest.php | 2 +-
.../BrowserWithJavascriptTest.php | 2 +-
.../FunctionalTests/BrowserTestBaseTest.php | 2 +-
.../Routing/PathEncodedTest.php | 2 +-
.../Core/File/UrlTransformRelativeTest.php | 2 +-
.../Tests/Component/Utility/UrlHelperTest.php | 28 +++++++++----------
.../Tests/Core/Database/UrlConversionTest.php | 2 +-
.../Menu/LocalTaskIntegrationTestBase.php | 2 +-
.../Tests/Core/Routing/UrlGeneratorTest.php | 4 +--
.../Tests/Core/Template/TwigExtensionTest.php | 2 +-
core/tests/Drupal/Tests/Core/UrlTest.php | 4 +--
.../Tests/Core/Utility/LinkGeneratorTest.php | 6 ++--
core/tests/Drupal/Tests/UiHelperTrait.php | 4 +--
56 files changed, 106 insertions(+), 106 deletions(-)
diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index 1d0a2bc2bacf..f704528a1c61 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -555,10 +555,10 @@ public static function token() {
}
/**
- * Returns the url generator service.
+ * Returns the URL generator service.
*
* @return \Drupal\Core\Routing\UrlGeneratorInterface
- * The url generator service.
+ * The URL generator service.
*/
public static function urlGenerator() {
return static::getContainer()->get('url_generator');
diff --git a/core/lib/Drupal/Core/Entity/Controller/EntityController.php b/core/lib/Drupal/Core/Entity/Controller/EntityController.php
index dc70185670c0..17f6a36ea125 100644
--- a/core/lib/Drupal/Core/Entity/Controller/EntityController.php
+++ b/core/lib/Drupal/Core/Entity/Controller/EntityController.php
@@ -81,7 +81,7 @@ class EntityController implements ContainerInjectionInterface {
* @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
* The string translation.
* @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
- * The url generator.
+ * The URL generator.
*/
public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info, EntityRepositoryInterface $entity_repository, RendererInterface $renderer, TranslationInterface $string_translation, UrlGeneratorInterface $url_generator) {
$this->entityTypeManager = $entity_type_manager;
diff --git a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
index 172fd1425c9b..e47c0b35bd0c 100644
--- a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
@@ -47,7 +47,7 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface {
protected $config;
/**
- * The url generator.
+ * The URL generator.
*
* @var \Drupal\Core\Routing\UrlGeneratorInterface
*/
diff --git a/core/lib/Drupal/Core/Link.php b/core/lib/Drupal/Core/Link.php
index d382ef6cd828..abdc63e29910 100644
--- a/core/lib/Drupal/Core/Link.php
+++ b/core/lib/Drupal/Core/Link.php
@@ -46,7 +46,7 @@ class Link implements RenderableInterface {
* the output of \Drupal\Component\Utility\Xss::filter() or
* \Drupal\Component\Render\FormattableMarkup.
* @param \Drupal\Core\Url $url
- * The url object.
+ * The \Drupal\Core\Url object.
*/
public function __construct($text, Url $url) {
$this->text = $text;
diff --git a/core/lib/Drupal/Core/ParamConverter/EntityConverter.php b/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
index 515517b91129..823dcdaa1e12 100644
--- a/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
+++ b/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
@@ -27,7 +27,7 @@
* type: entity:node
* @endcode
*
- * If you want to have the entity type itself dynamic in the url you can
+ * If you want to have the entity type itself dynamic in the URL you can
* specify it like the following:
* @code
* example.route:
diff --git a/core/lib/Drupal/Core/Path/PathValidatorInterface.php b/core/lib/Drupal/Core/Path/PathValidatorInterface.php
index e024ae5208ac..06d9cc664c03 100644
--- a/core/lib/Drupal/Core/Path/PathValidatorInterface.php
+++ b/core/lib/Drupal/Core/Path/PathValidatorInterface.php
@@ -3,7 +3,7 @@
namespace Drupal\Core\Path;
/**
- * Provides an interface for url path validators.
+ * Provides an interface for URL path validators.
*/
interface PathValidatorInterface {
@@ -14,7 +14,7 @@ interface PathValidatorInterface {
* The path to check.
*
* @return \Drupal\Core\Url|false
- * The url object, or FALSE if the path is not valid.
+ * The \Drupal\Core\Url object, or FALSE if the path is not valid.
*/
public function getUrlIfValid($path);
@@ -28,7 +28,7 @@ public function getUrlIfValid($path);
* The path to check.
*
* @return \Drupal\Core\Url|false
- * The url object, or FALSE if the path is not valid.
+ * The \Drupal\Core\Url object, or FALSE if the path is not valid.
*/
public function getUrlIfValidWithoutAccessCheck($path);
diff --git a/core/lib/Drupal/Core/Render/Element/PathElement.php b/core/lib/Drupal/Core/Render/Element/PathElement.php
index 86baff16d73f..00e8f6ebb133 100644
--- a/core/lib/Drupal/Core/Render/Element/PathElement.php
+++ b/core/lib/Drupal/Core/Render/Element/PathElement.php
@@ -67,7 +67,7 @@ public static function validateMatchedPath(&$element, FormStateInterface $form_s
return;
}
if ($element['#convert_path'] == self::CONVERT_NONE) {
- // Url is valid, no conversion required.
+ // URL is valid, no conversion required.
return;
}
// We do the value conversion here whilst the Url object is in scope
diff --git a/core/lib/Drupal/Core/Routing/NullGenerator.php b/core/lib/Drupal/Core/Routing/NullGenerator.php
index 0f0d13ec3bf7..ae0638d00fe5 100644
--- a/core/lib/Drupal/Core/Routing/NullGenerator.php
+++ b/core/lib/Drupal/Core/Routing/NullGenerator.php
@@ -8,7 +8,7 @@
use Symfony\Component\Routing\Route;
/**
- * No-op implementation of a Url Generator, needed for backward compatibility.
+ * No-op implementation of a URL Generator, needed for backward compatibility.
*/
class NullGenerator extends UrlGenerator {
diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index 7efa6b75b80c..968bb5a951ae 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -163,7 +163,7 @@ public function getPathFromRoute($name, $parameters = []) {
* The route name or other identifying string from ::getRouteDebugMessage().
*
* @return string
- * The url path, without any base path, without the query string, not URL
+ * The URL path, without any base path, without the query string, not URL
* encoded.
*
* @throws \Symfony\Component\Routing\Exception\MissingMandatoryParametersException
diff --git a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
index bbc91de1d195..891b035413a3 100644
--- a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
+++ b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
@@ -5,7 +5,7 @@
use Symfony\Component\Routing\Generator\UrlGeneratorInterface as SymfonyUrlGeneratorInterface;
/**
- * Defines an interface for generating a url from a route or system path.
+ * Defines an interface for generating a URL from a route or system path.
*
* Provides additional methods and options not present in the base interface.
*/
diff --git a/core/lib/Drupal/Core/Template/TwigExtension.php b/core/lib/Drupal/Core/Template/TwigExtension.php
index 0e99830fc5f8..e38c0a0fcbbd 100644
--- a/core/lib/Drupal/Core/Template/TwigExtension.php
+++ b/core/lib/Drupal/Core/Template/TwigExtension.php
@@ -98,7 +98,7 @@ public function getFunctions() {
return [
// This function will receive a renderable array, if an array is detected.
new TwigFunction('render_var', [$this, 'renderVar']),
- // The url and path function are defined in close parallel to those found
+ // The URL and path function are defined in close parallel to those found
// in \Symfony\Bridge\Twig\Extension\RoutingExtension
new TwigFunction('url', [$this, 'getUrl'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
new TwigFunction('path', [$this, 'getPath'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
@@ -228,7 +228,7 @@ public function getUrl($name, $parameters = [], $options = []) {
}
/**
- * Gets a rendered link from a url object.
+ * Gets a rendered link from a URL object.
*
* @param string $text
* The link text for the anchor tag as a translated string.
diff --git a/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php b/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
index 3e9932ee3cf3..38d57e317f13 100644
--- a/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
+++ b/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
@@ -208,7 +208,7 @@ protected function rebuildContainer() {
// Rebuild the kernel and bring it back to a fully bootstrapped state.
$this->container = $this->kernel->rebuildContainer();
- // Make sure the url generator has a request object, otherwise calls to
+ // Make sure the URL generator has a request object, otherwise calls to
// $this->drupalGet() will fail.
$this->prepareRequestForGenerator();
}
@@ -237,12 +237,12 @@ protected function resetAll() {
*
* This is used to manipulate how the generator generates paths during tests.
* It also ensures that calls to $this->drupalGet() will work when running
- * from run-tests.sh because the url generator no longer looks at the global
+ * from run-tests.sh because the URL generator no longer looks at the global
* variables that are set there but relies on getting this information from a
* request object.
*
* @param bool $clean_urls
- * Whether to mock the request using clean urls.
+ * Whether to mock the request using clean URLs.
* @param array $override_server_vars
* An array of server variables to override.
*
diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php
index c4779cf9a0fd..2f1cee32fe9e 100644
--- a/core/lib/Drupal/Core/Url.php
+++ b/core/lib/Drupal/Core/Url.php
@@ -495,7 +495,7 @@ public static function createFromRequest(Request $request) {
}
/**
- * Sets this Url to encapsulate an unrouted URI.
+ * Sets this URL to encapsulate an unrouted URI.
*
* @return $this
*/
@@ -537,7 +537,7 @@ public function toUriString() {
}
/**
- * Indicates if this Url is external.
+ * Indicates if this URL is external.
*
* @return bool
*/
@@ -546,7 +546,7 @@ public function isExternal() {
}
/**
- * Indicates if this Url has a Drupal route.
+ * Indicates if this URL has a Drupal route.
*
* @return bool
*/
@@ -727,7 +727,7 @@ public function getUri() {
* Sets the value of the absolute option for this Url.
*
* @param bool $absolute
- * (optional) Whether to make this Url absolute or not. Defaults to TRUE.
+ * (optional) Whether to make this URL absolute or not. Defaults to TRUE.
*
* @return $this
*/
@@ -829,13 +829,13 @@ public function access(AccountInterface $account = NULL, $return_as_object = FAL
}
/**
- * Checks a Url render element against applicable access check services.
+ * Checks a URL render element against applicable access check services.
*
* @param array $element
* A render element as returned from \Drupal\Core\Url::toRenderArray().
*
* @return bool
- * Returns TRUE if the current user has access to the url, otherwise FALSE.
+ * Returns TRUE if the current user has access to the URL, otherwise FALSE.
*/
public static function renderAccess(array $element) {
return $element['#url']->access();
diff --git a/core/lib/Drupal/Core/Utility/LinkGenerator.php b/core/lib/Drupal/Core/Utility/LinkGenerator.php
index 50bc3089a2f5..a8aa71f0c043 100644
--- a/core/lib/Drupal/Core/Utility/LinkGenerator.php
+++ b/core/lib/Drupal/Core/Utility/LinkGenerator.php
@@ -21,7 +21,7 @@
class LinkGenerator implements LinkGeneratorInterface {
/**
- * The url generator.
+ * The URL generator.
*
* @var \Drupal\Core\Routing\UrlGeneratorInterface
*/
@@ -106,7 +106,7 @@ public function generate($text, Url $url) {
'absolute' => FALSE,
];
- // Add a hreflang attribute if we know the language of this link's url and
+ // Add a hreflang attribute if we know the language of this link's URL and
// hreflang has not already been set.
if (!empty($variables['options']['language']) && !isset($variables['options']['attributes']['hreflang'])) {
$variables['options']['attributes']['hreflang'] = $variables['options']['language']->getId();
diff --git a/core/modules/basic_auth/tests/src/Traits/BasicAuthTestTrait.php b/core/modules/basic_auth/tests/src/Traits/BasicAuthTestTrait.php
index b51b17138bf9..15de6407d5b3 100644
--- a/core/modules/basic_auth/tests/src/Traits/BasicAuthTestTrait.php
+++ b/core/modules/basic_auth/tests/src/Traits/BasicAuthTestTrait.php
@@ -17,7 +17,7 @@ trait BasicAuthTestTrait {
* @param string $password
* The password to use for basic authentication.
* @param array $options
- * (optional) Options to be forwarded to the url generator.
+ * (optional) Options to be forwarded to the URL generator.
*
* @return string
* The retrieved HTML string, also available as $this->getRawContent().
diff --git a/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php b/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php
index 1b4cc4d15bc6..ba3f7335b888 100644
--- a/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php
@@ -169,7 +169,7 @@ public function testDefaultBlockContentCreation() {
$edit = [];
$edit['info[0][value]'] = $this->randomMachineName(8);
$edit['body[0][value]'] = $this->randomMachineName(16);
- // Don't pass the custom block type in the url so the default is forced.
+ // Don't pass the custom block type in the URL so the default is forced.
$this->drupalGet('block/add');
$this->submitForm($edit, 'Save');
diff --git a/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php b/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
index eca7d143b421..ac81de679337 100644
--- a/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
@@ -121,7 +121,7 @@ public function testCommentInterface() {
// Reply to comment #2 creating comment #3 with optional preview and no
// subject though field enabled.
$this->drupalLogin($this->webUser);
- // Deliberately use the wrong url to test
+ // Deliberately use the wrong URL to test
// \Drupal\comment\Controller\CommentController::redirectNode().
$this->drupalGet('comment/' . $this->node->id() . '/reply');
// Verify we were correctly redirected.
diff --git a/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php b/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
index f695911e8ed0..16b809f3b174 100644
--- a/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
@@ -462,7 +462,7 @@ public function testCommentFunctionality() {
$this->assertSession()->checkboxChecked('edit-field-foobar-0-status-2');
$this->assertSession()->fieldNotExists('edit-field-foobar-0-status-0');
- // @todo Check proper url and form https://www.drupal.org/node/2458323
+ // @todo Check proper URL and form https://www.drupal.org/node/2458323
$this->drupalGet('comment/reply/entity_test/comment/' . $new_entity->id());
$this->assertSession()->fieldNotExists('subject[0][value]');
$this->assertSession()->fieldNotExists('comment_body[0][value]');
diff --git a/core/modules/comment/tests/src/Functional/CommentTitleTest.php b/core/modules/comment/tests/src/Functional/CommentTitleTest.php
index c2a42e254aaa..69d65cf4851e 100644
--- a/core/modules/comment/tests/src/Functional/CommentTitleTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentTitleTest.php
@@ -93,7 +93,7 @@ public function testCommentPopulatedTitles() {
// Tests that the comment's title link is the permalink of the comment.
$comment_permalink = $this->cssSelect('.permalink');
$comment_permalink = $comment_permalink[0]->getAttribute('href');
- // Tests that the comment's title link contains the url fragment.
+ // Tests that the comment's title link contains the URL fragment.
$this->assertStringContainsString('#comment-' . $comment1->id(), $comment_permalink, "The comment's title link contains the url fragment.");
$this->assertEquals($comment1->permalink()->toString(), $comment_permalink, "The comment's title has the correct link.");
}
diff --git a/core/modules/contact/src/ContactFormInterface.php b/core/modules/contact/src/ContactFormInterface.php
index ef3b3ebfa800..68998298e182 100644
--- a/core/modules/contact/src/ContactFormInterface.php
+++ b/core/modules/contact/src/ContactFormInterface.php
@@ -34,12 +34,12 @@ public function getRecipients();
public function getRedirectPath();
/**
- * Returns the url object for redirect path.
+ * Returns the \Drupal\Core\Url object for redirect path.
*
- * Empty redirect property results a url object of front page.
+ * Empty redirect property results a \Drupal\Core\Url object of front page.
*
* @return \Drupal\Core\Url
- * The redirect url object.
+ * The redirect \Drupal\Core\Url object.
*/
public function getRedirectUrl();
diff --git a/core/modules/contact/tests/src/Functional/ContactSitewideTest.php b/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
index 7963002572ae..ce2ace64bafd 100644
--- a/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
+++ b/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
@@ -115,7 +115,7 @@ public function testSiteWideContact() {
// Default form exists.
$this->assertSession()->linkByHrefExists('admin/structure/contact/manage/feedback/delete');
// User form could not be changed or deleted.
- // Cannot use ::assertNoLinkByHref as it does partial url matching and with
+ // Cannot use ::assertNoLinkByHref as it does partial URL matching and with
// field_ui enabled admin/structure/contact/manage/personal/fields exists.
// @todo: See https://www.drupal.org/node/2031223 for the above.
$url = Url::fromRoute('entity.contact_form.edit_form', ['contact_form' => 'personal'])->toString();
diff --git a/core/modules/contextual/src/Element/ContextualLinks.php b/core/modules/contextual/src/Element/ContextualLinks.php
index 27c71dcbcb87..915a3132ca68 100644
--- a/core/modules/contextual/src/Element/ContextualLinks.php
+++ b/core/modules/contextual/src/Element/ContextualLinks.php
@@ -42,7 +42,7 @@ public function getInfo() {
* render (based on the 'group' key in the *.links.contextual.yml files for
* all enabled modules). The value contains an associative array containing
* the following keys:
- * - route_parameters: The route parameters passed to the url generator.
+ * - route_parameters: The route parameters passed to the URL generator.
* - metadata: Any additional data needed in order to alter the link.
* @code
* array('#contextual_links' => array(
diff --git a/core/modules/file/src/Plugin/migrate/process/d6/FileUri.php b/core/modules/file/src/Plugin/migrate/process/d6/FileUri.php
index 32c30b45bbb0..2acf883f97d4 100644
--- a/core/modules/file/src/Plugin/migrate/process/d6/FileUri.php
+++ b/core/modules/file/src/Plugin/migrate/process/d6/FileUri.php
@@ -7,7 +7,7 @@
use Drupal\migrate\Row;
/**
- * Process the file url into a D8 compatible URL.
+ * Process the file URL into a D8 compatible URL.
*
* @MigrateProcessPlugin(
* id = "file_uri"
diff --git a/core/modules/filter/tests/src/Functional/FilterHtmlImageSecureTest.php b/core/modules/filter/tests/src/Functional/FilterHtmlImageSecureTest.php
index 66006bc0e46c..3aa0428cfe21 100644
--- a/core/modules/filter/tests/src/Functional/FilterHtmlImageSecureTest.php
+++ b/core/modules/filter/tests/src/Functional/FilterHtmlImageSecureTest.php
@@ -111,7 +111,7 @@ public function testImageSource() {
$images = [
$http_base_url . '/' . $druplicon => base_path() . $druplicon,
$https_base_url . '/' . $druplicon => base_path() . $druplicon,
- // Test a url that includes a port.
+ // Test a URL that includes a port.
preg_replace($host_pattern, 'http://' . $host . ':', $http_base_url . '/' . $druplicon) => base_path() . $druplicon,
preg_replace($host_pattern, 'http://' . $host . ':80', $http_base_url . '/' . $druplicon) => base_path() . $druplicon,
preg_replace($host_pattern, 'http://' . $host . ':443', $http_base_url . '/' . $druplicon) => base_path() . $druplicon,
diff --git a/core/modules/forum/src/Form/ContainerForm.php b/core/modules/forum/src/Form/ContainerForm.php
index afcb1ccc3366..1e4c1f3411ab 100644
--- a/core/modules/forum/src/Form/ContainerForm.php
+++ b/core/modules/forum/src/Form/ContainerForm.php
@@ -12,7 +12,7 @@
class ContainerForm extends ForumForm {
/**
- * Reusable url stub to use in watchdog messages.
+ * Reusable URL stub to use in watchdog messages.
*
* @var string
*/
diff --git a/core/modules/forum/src/Form/ForumForm.php b/core/modules/forum/src/Form/ForumForm.php
index 75264cc4d578..339dd265c44b 100644
--- a/core/modules/forum/src/Form/ForumForm.php
+++ b/core/modules/forum/src/Form/ForumForm.php
@@ -22,7 +22,7 @@ class ForumForm extends TermForm {
protected $forumFormType;
/**
- * Reusable url stub to use in watchdog messages.
+ * Reusable URL stub to use in watchdog messages.
*
* @var string
*/
diff --git a/core/modules/image/src/Routing/ImageStyleRoutes.php b/core/modules/image/src/Routing/ImageStyleRoutes.php
index ed414e23e69a..acb0502b0558 100644
--- a/core/modules/image/src/Routing/ImageStyleRoutes.php
+++ b/core/modules/image/src/Routing/ImageStyleRoutes.php
@@ -8,7 +8,7 @@
use Symfony\Component\Routing\Route;
/**
- * Defines a route subscriber to register a url for serving image styles.
+ * Defines a route subscriber to register a URL for serving image styles.
*/
class ImageStyleRoutes implements ContainerInjectionInterface {
diff --git a/core/modules/language/src/HttpKernel/PathProcessorLanguage.php b/core/modules/language/src/HttpKernel/PathProcessorLanguage.php
index 512f22bde920..a5d5ecbb80b4 100644
--- a/core/modules/language/src/HttpKernel/PathProcessorLanguage.php
+++ b/core/modules/language/src/HttpKernel/PathProcessorLanguage.php
@@ -26,7 +26,7 @@ class PathProcessorLanguage implements InboundPathProcessorInterface, OutboundPa
protected $config;
/**
- * Language manager for retrieving the url language type.
+ * Language manager for retrieving the URL language type.
*
* @var \Drupal\language\ConfigurableLanguageManagerInterface
*/
diff --git a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
index 34474f35e553..11c59adb4ac3 100644
--- a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
+++ b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
@@ -100,9 +100,9 @@ public function getLangcode(Request $request = NULL) {
* {@inheritdoc}
*/
public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
- // If appropriate, process outbound to add a query parameter to the url and
- // remove the language option, so that url negotiator does not rewrite the
- // url.
+ // If appropriate, process outbound to add a query parameter to the URL and
+ // remove the language option, so that URL negotiator does not rewrite the
+ // URL.
// First, check if processing conditions are met.
if (!($request && !empty($options['route']) && $this->hasLowerLanguageNegotiationWeight() && $this->meetsContentEntityRoutesCondition($options['route'], $request))) {
@@ -110,8 +110,8 @@ public function processOutbound($path, &$options = [], Request $request = NULL,
}
if (isset($options['language']) || $langcode = $this->getLangcode($request)) {
- // If the language option is set, unset it, so that the url language
- // negotiator does not rewrite the url.
+ // If the language option is set, unset it, so that the URL language
+ // negotiator does not rewrite the URL.
if (isset($options['language'])) {
$langcode = $options['language']->getId();
unset($options['language']);
@@ -158,13 +158,13 @@ public function getLanguageSwitchLinks(Request $request, $type, Url $url) {
/**
* Determines if content entity language negotiator has higher priority.
*
- * The content entity language negotiator having higher priority than the url
+ * The content entity language negotiator having higher priority than the URL
* language negotiator, is a criteria in
* \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationContentEntity::processOutbound().
*
* @return bool
* TRUE if the content entity language negotiator has higher priority than
- * the url language negotiator, FALSE otherwise.
+ * the URL language negotiator, FALSE otherwise.
*/
protected function hasLowerLanguageNegotiationWeight() {
if (!isset($this->hasLowerLanguageNegotiationWeightResult)) {
@@ -173,7 +173,7 @@ protected function hasLowerLanguageNegotiationWeight() {
$content_method_weights = $this->config->get('language.types')->get('negotiation.language_content.enabled') ?: [];
// Check if the content language is configured to be dependent on the
- // url negotiator directly or indirectly over the interface negotiator.
+ // URL negotiator directly or indirectly over the interface negotiator.
if (isset($content_method_weights[LanguageNegotiationUrl::METHOD_ID]) && ($content_method_weights[static::METHOD_ID] > $content_method_weights[LanguageNegotiationUrl::METHOD_ID])) {
$this->hasLowerLanguageNegotiationWeightResult = FALSE;
}
@@ -202,7 +202,7 @@ protected function hasLowerLanguageNegotiationWeight() {
* Determines if content entity route condition is met.
*
* Requirements: currently being on a content entity route and processing
- * outbound url pointing to the same content entity.
+ * 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.
diff --git a/core/modules/system/tests/src/Functional/Form/FormTest.php b/core/modules/system/tests/src/Functional/Form/FormTest.php
index b572859bb32d..5599bf9dff58 100644
--- a/core/modules/system/tests/src/Functional/Form/FormTest.php
+++ b/core/modules/system/tests/src/Functional/Form/FormTest.php
@@ -311,7 +311,7 @@ public function testInputWithInvalidToken() {
$this->assertSession()->pageTextContains('The form has become outdated.');
$this->assertSession()->fieldValueEquals('integer_step', 5);
- // Check a form with a Url field
+ // Check a form with a URL field
$this->drupalGet(Url::fromRoute('form_test.url'));
$this->assertSession()
->elementExists('css', 'input[name="form_token"]')
diff --git a/core/modules/system/tests/src/Functional/ParamConverter/UpcastingTest.php b/core/modules/system/tests/src/Functional/ParamConverter/UpcastingTest.php
index 76e7e39fe9bb..c5b383e8d3fe 100644
--- a/core/modules/system/tests/src/Functional/ParamConverter/UpcastingTest.php
+++ b/core/modules/system/tests/src/Functional/ParamConverter/UpcastingTest.php
@@ -6,7 +6,7 @@
use Drupal\language\Entity\ConfigurableLanguage;
/**
- * Tests upcasting of url arguments to entities.
+ * Tests upcasting of URL arguments to entities.
*
* @group ParamConverter
*/
diff --git a/core/modules/system/tests/src/Functional/Routing/RouterTest.php b/core/modules/system/tests/src/Functional/Routing/RouterTest.php
index 66bcc5f70cd6..674d74171f7a 100644
--- a/core/modules/system/tests/src/Functional/Routing/RouterTest.php
+++ b/core/modules/system/tests/src/Functional/Routing/RouterTest.php
@@ -229,7 +229,7 @@ public function testControllerResolutionPage() {
}
/**
- * Checks the generate method on the url generator using the front router.
+ * Checks the generate method on the URL generator using the front router.
*/
public function testUrlGeneratorFront() {
$front_url = Url::fromRoute('<front>', [], ['absolute' => TRUE]);
diff --git a/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php b/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php
index f64a0af32f71..5e4b9784b71d 100644
--- a/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php
@@ -149,7 +149,7 @@ protected function setUp(): void {
* @param string|\Drupal\Core\Url $path
* Drupal path or URL to load into Mink controlled browser.
* @param array $options
- * (optional) Options to be forwarded to the url generator.
+ * (optional) Options to be forwarded to the URL generator.
* @param string[] $headers
* (optional) An array containing additional HTTP request headers.
*
diff --git a/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php b/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php
index 763b76b6af52..a54a195410f1 100644
--- a/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php
+++ b/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php
@@ -19,10 +19,10 @@
class TipPluginImage extends TipPluginBase implements ContainerFactoryPluginInterface, TourTipPluginInterface {
/**
- * 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/src/UpdateFetcher.php b/core/modules/update/src/UpdateFetcher.php
index 3bec19dc9e25..263f17451086 100644
--- a/core/modules/update/src/UpdateFetcher.php
+++ b/core/modules/update/src/UpdateFetcher.php
@@ -21,7 +21,7 @@ class UpdateFetcher implements UpdateFetcherInterface {
const UPDATE_DEFAULT_URL = 'https://updates.drupal.org/release-history';
/**
- * The fetch url configured in the update settings.
+ * The fetch URL configured in the update settings.
*
* @var string
*/
diff --git a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
index 6dd3f9ef6be5..325d687dee9c 100644
--- a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
+++ b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
@@ -104,7 +104,7 @@ protected function setUp(): void {
* @param string $site_key
* A string to mimic an anonymous site key hash.
* @param string $expected
- * The expected url returned from UpdateFetcher::buildFetchUrl()
+ * The expected URL returned from UpdateFetcher::buildFetchUrl()
*
* @dataProvider providerTestUpdateBuildFetchUrl
*
@@ -123,7 +123,7 @@ public function testUpdateBuildFetchUrl(array $project, $site_key, $expected) {
* An array of arrays, each containing:
* - 'project' - An array matching a project's .info file structure.
* - 'site_key' - An arbitrary site key.
- * - 'expected' - The expected url from UpdateFetcher::buildFetchUrl().
+ * - 'expected' - The expected URL from UpdateFetcher::buildFetchUrl().
*/
public function providerTestUpdateBuildFetchUrl() {
$data = [];
diff --git a/core/modules/views/src/Form/ViewsForm.php b/core/modules/views/src/Form/ViewsForm.php
index e2bfb1585178..766e366d134f 100644
--- a/core/modules/views/src/Form/ViewsForm.php
+++ b/core/modules/views/src/Form/ViewsForm.php
@@ -40,7 +40,7 @@ class ViewsForm implements FormInterface, ContainerInjectionInterface {
protected $requestStack;
/**
- * The url generator to generate the form action.
+ * The URL generator to generate the form action.
*
* @var \Drupal\Core\Routing\UrlGeneratorInterface
*/
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index 8428f1308c24..77eec2fa132c 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -1445,7 +1445,7 @@ protected function renderAsLink($alter, $text, $tokens) {
}
// If no scheme is provided in the $path, assign the default 'http://'.
- // This allows a url of 'www.example.com' to be converted to
+ // This allows a URL of 'www.example.com' to be converted to
// 'http://www.example.com'.
// Only do this when flag for external has been set, $path doesn't contain
// a scheme and $path doesn't have a leading /.
@@ -1493,7 +1493,7 @@ protected function renderAsLink($alter, $text, $tokens) {
return $text;
}
- // If we get to here we have a path from the url parsing. So assign that to
+ // If we get to here we have a path from the URL parsing. So assign that to
// $path now so we don't get query strings or fragments in the path.
$path = $url['path'];
@@ -1577,7 +1577,7 @@ protected function renderAsLink($alter, $text, $tokens) {
$options['language'] = $alter['language'];
}
- // If the url came from entity_uri(), pass along the required options.
+ // If the URL came from entity_uri(), pass along the required options.
if (isset($alter['entity'])) {
$options['entity'] = $alter['entity'];
}
diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index ff88e497430f..defce1aa8c6a 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -247,7 +247,7 @@ class ViewExecutable {
public $row_index;
/**
- * Allow to override the url of the current view.
+ * Allow to override the \Drupal\Core\Url of the current view.
*
* @var \Drupal\Core\Url
*/
diff --git a/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php b/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
index 565974cb3a20..bd589fe96003 100644
--- a/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
@@ -311,11 +311,11 @@ public function testAlterUrl() {
$output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
return $id_field->theme($row);
});
- // The url has a space in it, so to check we have to decode the url output.
+ // The URL has a space in it, so to check we have to decode the URL output.
$this->assertSubString(urldecode($output), $path);
// Tests the external flag.
- // Switch on the external flag should output an external url as well.
+ // Switch on the external flag should output an external URL as well.
$id_field->options['alter']['external'] = TRUE;
$id_field->options['alter']['path'] = $path = 'www.drupal.org';
$output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
@@ -323,7 +323,7 @@ public function testAlterUrl() {
});
$this->assertSubString($output, 'http://www.drupal.org');
- // Setup a not external url, which shouldn't lead to an external url.
+ // Setup a not external URL, which shouldn't lead to an external URL.
$id_field->options['alter']['external'] = FALSE;
$id_field->options['alter']['path'] = $path = 'www.drupal.org';
$output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php
index 162895a7876b..c68346855309 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php
@@ -47,7 +47,7 @@ public function testFieldUrl() {
$this->assertEquals('John', $view->field['name']->advancedRender($view->result[0]));
- // Make the url a link.
+ // Make the URL a link.
$view->destroy();
$view->setDisplay();
diff --git a/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
index 8517215b572f..fe159703984e 100644
--- a/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
@@ -86,7 +86,7 @@ class FieldPluginBaseTest extends UnitTestCase {
protected $display;
/**
- * The mocked url generator.
+ * The mocked URL generator.
*
* @var \Drupal\Core\Routing\UrlGeneratorInterface|\PHPUnit\Framework\MockObject\MockObject
*/
@@ -100,7 +100,7 @@ class FieldPluginBaseTest extends UnitTestCase {
protected $pathValidator;
/**
- * The unrouted url assembler service.
+ * The unrouted URL assembler service.
*
* @var \Drupal\Core\Utility\UnroutedUrlAssemblerInterface|\PHPUnit\Framework\MockObject\MockObject
*/
@@ -170,7 +170,7 @@ protected function setUp(): void {
}
/**
- * Sets up the unrouted url assembler and the link generator.
+ * Sets up the unrouted URL assembler and the link generator.
*/
protected function setUpUrlIntegrationServices() {
$this->pathProcessor = $this->createMock('Drupal\Core\PathProcessor\OutboundPathProcessorInterface');
@@ -235,7 +235,7 @@ public function testRenderAsLinkWithoutPath() {
* @param string $path
* An internal or external path.
* @param string $url
- * The final url used by the more link.
+ * The final URL used by the more link.
*
* @dataProvider providerTestRenderTrimmedWithMoreLinkAndPath
* @covers ::renderText
@@ -434,7 +434,7 @@ public function providerTestRenderAsLinkWithUrlAndOptions() {
$url = Url::fromRoute('test_route');
$data[] = [$url, [], clone $url, '/test-path', clone $url, '<a href="/test-path">value</a>'];
- // Simple url with parameters.
+ // Simple URL with parameters.
$url_parameters = Url::fromRoute('test_route', ['key' => 'value']);
$data[] = [$url_parameters, [], clone $url_parameters, '/test-path/value', clone $url_parameters, '<a href="/test-path/value">value</a>'];
diff --git a/core/modules/views_ui/tests/src/Functional/DuplicateTest.php b/core/modules/views_ui/tests/src/Functional/DuplicateTest.php
index 90de1faec7da..1b17ab4a1358 100644
--- a/core/modules/views_ui/tests/src/Functional/DuplicateTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DuplicateTest.php
@@ -42,7 +42,7 @@ public function testDuplicateView() {
$this->drupalGet('admin/structure/views/view/' . $random_view['id'] . '/duplicate');
$this->submitForm($view, 'Duplicate');
- // Assert that the page url is correct.
+ // Assert that the page URL is correct.
$this->assertSession()->addressEquals('admin/structure/views/view/' . $view['id']);
// Assert that the page title is correctly displayed.
diff --git a/core/modules/views_ui/tests/src/Functional/RedirectTest.php b/core/modules/views_ui/tests/src/Functional/RedirectTest.php
index 4c9bc18e671c..6350cb928535 100644
--- a/core/modules/views_ui/tests/src/Functional/RedirectTest.php
+++ b/core/modules/views_ui/tests/src/Functional/RedirectTest.php
@@ -37,7 +37,7 @@ public function testRedirect() {
$this->assertSession()->addressEquals($random_destination);
// Setup a view with a certain page display path. If you change the path
- // but have the old url in the destination the user should be redirected to
+ // but have the old URL in the destination the user should be redirected to
// the new path.
$view_name = 'test_redirect_view';
$new_path = $this->randomMachineName();
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/BrowserWithJavascriptTest.php b/core/tests/Drupal/FunctionalJavascriptTests/BrowserWithJavascriptTest.php
index 35f7016cc8ef..85a171b2a342 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/BrowserWithJavascriptTest.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/BrowserWithJavascriptTest.php
@@ -110,7 +110,7 @@ public function testEscapingAssertions() {
* @param string|\Drupal\Core\Url $path
* Drupal path or URL to load into Mink controlled browser.
* @param array $options
- * (optional) Options to be forwarded to the url generator.
+ * (optional) Options to be forwarded to the URL generator.
* @param string[] $headers
* An array containing additional HTTP request headers, the array keys are
* the header names and the array values the header values. This is useful
diff --git a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
index 2b9656e70c4d..5ef97c1e08eb 100644
--- a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
+++ b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
@@ -69,7 +69,7 @@ public function testGoTo() {
$js_settings = $this->getDrupalSettings();
$this->assertSame('azAZ09();.,\\\/-_{}', $js_settings['test-setting']);
- // Test drupalGet with a url object.
+ // Test drupalGet with a URL object.
$url = Url::fromRoute('test_page_test.render_title');
$this->drupalGet($url);
$this->assertSession()->statusCodeEquals(200);
diff --git a/core/tests/Drupal/FunctionalTests/Routing/PathEncodedTest.php b/core/tests/Drupal/FunctionalTests/Routing/PathEncodedTest.php
index 6b4e9e72b35b..0f9fdf167bf3 100644
--- a/core/tests/Drupal/FunctionalTests/Routing/PathEncodedTest.php
+++ b/core/tests/Drupal/FunctionalTests/Routing/PathEncodedTest.php
@@ -7,7 +7,7 @@
use Drupal\Tests\Traits\Core\PathAliasTestTrait;
/**
- * Tests url generation and routing for route paths with encoded characters.
+ * Tests URL generation and routing for route paths with encoded characters.
*
* @group path
* @group routing
diff --git a/core/tests/Drupal/KernelTests/Core/File/UrlTransformRelativeTest.php b/core/tests/Drupal/KernelTests/Core/File/UrlTransformRelativeTest.php
index d6f2d00dc18a..57111ee2f442 100644
--- a/core/tests/Drupal/KernelTests/Core/File/UrlTransformRelativeTest.php
+++ b/core/tests/Drupal/KernelTests/Core/File/UrlTransformRelativeTest.php
@@ -6,7 +6,7 @@
use Symfony\Component\HttpFoundation\Request;
/**
- * Tests url transform to relative.
+ * Tests URL transform to relative.
*
* @group Utility
*/
diff --git a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
index a69954592e25..61262997dcc9 100644
--- a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
@@ -82,7 +82,7 @@ public function providerTestValidAbsoluteData() {
* @covers ::isValid
*
* @param string $url
- * The url to test.
+ * The URL to test.
* @param string $scheme
* The scheme to test.
*/
@@ -137,7 +137,7 @@ public function testUncompressInvalidString() {
* @covers ::isValid
*
* @param string $url
- * The url to test.
+ * The URL to test.
* @param string $scheme
* The scheme to test.
*/
@@ -171,7 +171,7 @@ public function providerTestValidRelativeData() {
* @covers ::isValid
*
* @param string $url
- * The url to test.
+ * The URL to test.
* @param string $prefix
* The prefix to test.
*/
@@ -202,7 +202,7 @@ public function providerTestInvalidRelativeData() {
* @covers ::isValid
*
* @param string $url
- * The url to test.
+ * The URL to test.
* @param string $prefix
* The prefix to test.
*/
@@ -254,7 +254,7 @@ public static function providerTestFilterQueryParameters() {
}
/**
- * Tests url parsing.
+ * Tests URL parsing.
*
* @dataProvider providerTestParse
* @covers ::parse
@@ -502,7 +502,7 @@ public static function providerTestFilterBadProtocol() {
}
/**
- * Tests dangerous url protocol filtering.
+ * Tests dangerous URL protocol filtering.
*
* @dataProvider providerTestStripDangerousProtocols
* @covers ::setAllowedProtocols
@@ -584,12 +584,12 @@ protected function dataEnhanceWithPrefix(array $urls) {
* Tests detecting external urls that point to local resources.
*
* @param string $url
- * The external url to test.
+ * The external URL to test.
* @param string $base_url
- * The base url.
+ * The base URL.
* @param bool $expected
* TRUE if an external URL points to this installation as determined by the
- * base url.
+ * base URL.
*
* @covers ::externalIsLocal
* @dataProvider providerTestExternalIsLocal
@@ -599,7 +599,7 @@ public function testExternalIsLocal($url, $base_url, $expected) {
}
/**
- * Provider for local external url detection.
+ * Provider for local external URL detection.
*
* @see \Drupal\Tests\Component\Utility\UrlHelperTest::testExternalIsLocal()
*/
@@ -636,12 +636,12 @@ public function providerTestExternalIsLocal() {
}
/**
- * Tests invalid url arguments.
+ * TTests invalid URL arguments.
*
* @param string $url
- * The url to test.
+ * The URL to test.
* @param string $base_url
- * The base url.
+ * The base URL.
*
* @covers ::externalIsLocal
* @dataProvider providerTestExternalIsLocalInvalid
@@ -652,7 +652,7 @@ public function testExternalIsLocalInvalid($url, $base_url) {
}
/**
- * Provides invalid argument data for local external url detection.
+ * Provides invalid argument data for local external URL detection.
*
* @see \Drupal\Tests\Component\Utility\UrlHelperTest::testExternalIsLocalInvalid()
*/
diff --git a/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php b/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php
index 2e836da87c36..091449fd5a77 100644
--- a/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php
@@ -266,7 +266,7 @@ public function testGetInvalidArgumentExceptionInUrlConversion($url, $root, $exp
*
* @return array
* Array of arrays with the following elements:
- * - An invalid Url string.
+ * - An invalid URL string.
* - Drupal root string.
* - The expected exception message.
*/
diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
index fc90fdb85e67..ec5a48ed7943 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
@@ -11,7 +11,7 @@
/**
* Defines a base unit test for testing existence of local tasks.
*
- * @todo Add tests for access checking and url building,
+ * @todo Add tests for access checking and URL building,
* https://www.drupal.org/node/2112245.
*/
abstract class LocalTaskIntegrationTestBase extends UnitTestCase {
diff --git a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
index bd3268d86d96..b796efea4502 100644
--- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
@@ -34,7 +34,7 @@ class UrlGeneratorTest extends UnitTestCase {
protected $provider;
/**
- * The url generator to test.
+ * The URL generator to test.
*
* @var \Drupal\Core\Routing\UrlGenerator
*/
@@ -452,7 +452,7 @@ public function testBaseURLGeneration() {
}
/**
- * Tests that the 'scheme' route requirement is respected during url
+ * Tests that the 'scheme' route requirement is respected during URL
* generation.
*/
public function testUrlGenerationWithHttpsRequirement() {
diff --git a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
index 6a043397d2ad..880b9388206e 100644
--- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
+++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
@@ -36,7 +36,7 @@ class TwigExtensionTest extends UnitTestCase {
protected $renderer;
/**
- * The url generator.
+ * The URL generator.
*
* @var \Drupal\Core\Routing\UrlGeneratorInterface|\PHPUnit\Framework\MockObject\MockObject
*/
diff --git a/core/tests/Drupal/Tests/Core/UrlTest.php b/core/tests/Drupal/Tests/Core/UrlTest.php
index d9817a32a930..2efae32b40af 100644
--- a/core/tests/Drupal/Tests/Core/UrlTest.php
+++ b/core/tests/Drupal/Tests/Core/UrlTest.php
@@ -118,7 +118,7 @@ protected function setUp(): void {
}
/**
- * Tests creating a Url from a request.
+ * Tests creating a URL from a request.
*/
public function testUrlFromRequest() {
$this->router->expects($this->exactly(3))
@@ -358,7 +358,7 @@ public function testGetInternalPath($urls) {
$map[] = ['node_edit', ['node' => '2'], '/node/2/edit'];
foreach ($urls as $url) {
- // Clone the url so that there is no leak of internal state into the
+ // Clone the URL so that there is no leak of internal state into the
// other ones.
$url = clone $url;
$url_generator = $this->createMock('Drupal\Core\Routing\UrlGeneratorInterface');
diff --git a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
index 7d9596871055..0338a6517413 100644
--- a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
@@ -28,7 +28,7 @@ class LinkGeneratorTest extends UnitTestCase {
protected $linkGenerator;
/**
- * The mocked url generator.
+ * The mocked URL generator.
*
* @var \PHPUnit\Framework\MockObject\MockObject
*/
@@ -90,7 +90,7 @@ protected function setUp(): void {
*/
public function providerTestGenerateHrefs() {
return [
- // Test that the url returned by the URL generator is used.
+ // Test that the URL returned by the URL generator is used.
['test_route_1', [], FALSE, '/test-route-1'],
// Test that $parameters is passed to the URL generator.
['test_route_2', ['value' => 'example'], FALSE, '/test-route-2/example'],
@@ -274,7 +274,7 @@ public function testGenerateExternal() {
}
/**
- * Tests the generate() method with a url containing double quotes.
+ * Tests the generate() method with a URL containing double quotes.
*
* @covers ::generate
*/
diff --git a/core/tests/Drupal/Tests/UiHelperTrait.php b/core/tests/Drupal/Tests/UiHelperTrait.php
index be7a0c7c1a1c..ae40e52f9c92 100644
--- a/core/tests/Drupal/Tests/UiHelperTrait.php
+++ b/core/tests/Drupal/Tests/UiHelperTrait.php
@@ -208,7 +208,7 @@ public function assertSession($name = NULL) {
* @param string|\Drupal\Core\Url $path
* Drupal path or URL to load into Mink controlled browser.
* @param array $options
- * (optional) Options to be forwarded to the url generator.
+ * (optional) Options to be forwarded to the URL generator.
* @param string[] $headers
* An array containing additional HTTP request headers, the array keys are
* the header names and the array values the header values. This is useful
@@ -264,7 +264,7 @@ protected function drupalGet($path, array $options = [], array $headers = []) {
* Builds an absolute URL from a system path or a URL object.
*
* @param string|\Drupal\Core\Url $path
- * A system path or a URL.
+ * A system path or a URL object.
* @param array $options
* Options to be passed to Url::fromUri().
*
--
GitLab