diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php index 5d1588d..1113433 100644 --- a/core/lib/Drupal.php +++ b/core/lib/Drupal.php @@ -496,10 +496,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/Archiver/ArchiveTar.php b/core/lib/Drupal/Core/Archiver/ArchiveTar.php index 24085ce..54a12d5 100644 --- a/core/lib/Drupal/Core/Archiver/ArchiveTar.php +++ b/core/lib/Drupal/Core/Archiver/ArchiveTar.php @@ -994,7 +994,7 @@ public function _close() } // ----- Look if a local copy need to be erase - // Note that it might be interesting to keep the url for a time : ToDo + // Note that it might be interesting to keep the URL for a time : ToDo if ($this->_temp_tarname != '') { @drupal_unlink($this->_temp_tarname); $this->_temp_tarname = ''; diff --git a/core/lib/Drupal/Core/Asset/JsOptimizer.php b/core/lib/Drupal/Core/Asset/JsOptimizer.php index 6b8c217..af3f686 100644 --- a/core/lib/Drupal/Core/Asset/JsOptimizer.php +++ b/core/lib/Drupal/Core/Asset/JsOptimizer.php @@ -45,7 +45,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 ec3b188..b4fc73b 100644 --- a/core/lib/Drupal/Core/Command/DbCommandBase.php +++ b/core/lib/Drupal/Core/Command/DbCommandBase.php @@ -29,7 +29,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/EventSubscriber/MaintenanceModeSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php index 57d43ec..f0769e9 100644 --- a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php @@ -45,7 +45,7 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface { protected $config; /** - * The url generator. + * The URL generator. * * @var \Drupal\Core\Routing\UrlGeneratorInterface */ @@ -68,7 +68,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 6f3ce02..549ed52 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php @@ -193,7 +193,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 such as RDFa. if (!empty($items[$delta]->_attributes)) { $items[$delta]->_attributes += array('resource' => $entity->url()); diff --git a/core/lib/Drupal/Core/Form/ConfirmFormHelper.php b/core/lib/Drupal/Core/Form/ConfirmFormHelper.php index fc92ff9..ca662ac 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 9342f5c..9e55169 100644 --- a/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php +++ b/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php @@ -69,7 +69,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $install_ $form['help'] = array( '#type' => 'item', // #markup is XSS admin filtered which ensures unsafe protocols will be - // removed from the url. + // removed from the URL. '#markup' => '

Translations will be downloaded from the Drupal Translation website. If you do not want this, select English.

', '#states' => array( 'invisible' => array( diff --git a/core/lib/Drupal/Core/Link.php b/core/lib/Drupal/Core/Link.php index 6810fb0..8769252 100644 --- a/core/lib/Drupal/Core/Link.php +++ b/core/lib/Drupal/Core/Link.php @@ -80,7 +80,7 @@ public static function createFromRoute($text, $route_name, $route_parameters = a * @param string $text * The text of the link. * @param \Drupal\Core\Url $url - * The Url to create the link for. + * The URL to create the link for. * * @return static */ diff --git a/core/lib/Drupal/Core/Mail/MailFormatHelper.php b/core/lib/Drupal/Core/Mail/MailFormatHelper.php index 080b326..68f632f 100644 --- a/core/lib/Drupal/Core/Mail/MailFormatHelper.php +++ b/core/lib/Drupal/Core/Mail/MailFormatHelper.php @@ -13,7 +13,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/ParamConverter/EntityConverter.php b/core/lib/Drupal/Core/ParamConverter/EntityConverter.php index 573cd49..a26347a 100644 --- a/core/lib/Drupal/Core/ParamConverter/EntityConverter.php +++ b/core/lib/Drupal/Core/ParamConverter/EntityConverter.php @@ -25,7 +25,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 e024ae5..d7261c3 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 @@ * The path to check. * * @return \Drupal\Core\Url|false - * The url object, or FALSE if the path is not valid. + * The 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 URL object, or FALSE if the path is not valid. */ public function getUrlIfValidWithoutAccessCheck($path); diff --git a/core/lib/Drupal/Core/Routing/RouteProvider.php b/core/lib/Drupal/Core/Routing/RouteProvider.php index 53ed626..68be755 100644 --- a/core/lib/Drupal/Core/Routing/RouteProvider.php +++ b/core/lib/Drupal/Core/Routing/RouteProvider.php @@ -125,7 +125,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. * @@ -137,7 +137,7 @@ public function __construct(Connection $connection, StateInterface $state, Curre * @param Request $request * A request against which to match. * - * @return \Symfony\Component\Routing\RouteCollection with all urls that + * @return \Symfony\Component\Routing\RouteCollection with all URLs that * could potentially match $request. Empty collection if nothing can * match. */ diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php index ccf2b60..05e7aa2 100644 --- a/core/lib/Drupal/Core/Routing/UrlGenerator.php +++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php @@ -32,7 +32,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 */ @@ -68,7 +68,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 @@ -154,7 +154,7 @@ public function getPathFromRoute($name, $parameters = array()) { * The route name or other identifying string from ::getRouteDebugMessage(). * * @return string - * The url path, without any base path, including possible query string. + * The URL path, without any base path, including possible query string. * * @throws MissingMandatoryParametersException * When some parameters are missing that are mandatory for the route. @@ -251,7 +251,7 @@ protected function doGenerate(array $variables, array $defaults, array $tokens, * $parameters merged in. * * @return string - * The url path corresponding to the route, without the base path. + * The URL path corresponding to the route, without the base path. */ protected function getInternalPathFromRoute($name, SymfonyRoute $route, $parameters = array(), $query_params = array()) { // The Route has a cache of its own and is not recompiled as long as it does diff --git a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php index 70829cd..63e662a 100644 --- a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php +++ b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php @@ -5,7 +5,7 @@ use Symfony\Cmf\Component\Routing\VersatileGeneratorInterface; /** - * 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/Routing/UrlGeneratorTrait.php b/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php index 98429d4..1ce3c1e 100644 --- a/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php +++ b/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php @@ -18,7 +18,7 @@ trait UrlGeneratorTrait { /** - * The url generator. + * The URL generator. * * @var \Drupal\Core\Routing\UrlGeneratorInterface */ @@ -81,7 +81,7 @@ protected function getUrlGenerator() { * Sets the URL generator service. * * @param \Drupal\Core\Routing\UrlGeneratorInterface $generator - * The url generator service. + * The URL generator service. * * @return $this */ diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php index 6a58319..44ecbd9 100644 --- a/core/lib/Drupal/Core/Url.php +++ b/core/lib/Drupal/Core/Url.php @@ -784,7 +784,7 @@ public function getInternalPath() { * user. * * @return bool - * Returns TRUE if the user has access to the url, otherwise FALSE. + * Returns TRUE if the user has access to the URL, otherwise FALSE. */ public function access(AccountInterface $account = NULL) { if ($this->isRouted()) { @@ -800,7 +800,7 @@ public function access(AccountInterface $account = NULL) { * 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 4118661..6719429 100644 --- a/core/lib/Drupal/Core/Utility/LinkGenerator.php +++ b/core/lib/Drupal/Core/Utility/LinkGenerator.php @@ -20,7 +20,7 @@ class LinkGenerator implements LinkGeneratorInterface { /** - * The url generator. + * The URL generator. * * @var \Drupal\Core\Routing\UrlGeneratorInterface */ @@ -44,7 +44,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 @@ -100,7 +100,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/aggregator/src/FeedInterface.php b/core/modules/aggregator/src/FeedInterface.php index 19bde2e..bb7155c 100644 --- a/core/modules/aggregator/src/FeedInterface.php +++ b/core/modules/aggregator/src/FeedInterface.php @@ -21,18 +21,18 @@ public function setTitle($title); /** - * Returns the url to the feed. + * Returns the URL to the feed. * * @return string - * The url to the feed. + * The URL to the feed. */ public function getUrl(); /** - * Sets the url to the feed. + * Sets the URL to the feed. * * @param string $url - * A string containing the url of the feed. + * A string containing the URL of the feed. * * @return \Drupal\aggregator\FeedInterface * The class instance that this method is called on. diff --git a/core/modules/aggregator/src/Tests/AggregatorTestBase.php b/core/modules/aggregator/src/Tests/AggregatorTestBase.php index 1777fe5..3158d93 100644 --- a/core/modules/aggregator/src/Tests/AggregatorTestBase.php +++ b/core/modules/aggregator/src/Tests/AggregatorTestBase.php @@ -218,7 +218,7 @@ public function updateAndDelete(FeedInterface $feed, $expected_count) { * @param string $feed_name * String containing the feed name to check. * @param string $feed_url - * String containing the feed url to check. + * String containing the feed URL to check. * * @return bool * TRUE if feed is unique. diff --git a/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php b/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php index 4aac851..80298bf 100644 --- a/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php +++ b/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php @@ -26,7 +26,7 @@ protected function setUp() { * Test fetching functionality. */ public function testfetch() { - // Create feed with local url. + // Create feed with local URL. $feed = $this->createFeed(); $this->updateFeedItems($feed); $this->assertFalse(empty($feed->items)); diff --git a/core/modules/basic_auth/src/Tests/BasicAuthTestTrait.php b/core/modules/basic_auth/src/Tests/BasicAuthTestTrait.php index b5766fb..227a8c0 100644 --- a/core/modules/basic_auth/src/Tests/BasicAuthTestTrait.php +++ b/core/modules/basic_auth/src/Tests/BasicAuthTestTrait.php @@ -17,7 +17,7 @@ * @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(). @@ -40,7 +40,7 @@ protected function basicAuthGet($path, $username, $password, array $options = [] * @param string $password * The password to use for basic authentication. * @param array $options - * Options to be forwarded to the url generator. + * Options to be forwarded to the URL generator. * @param string $form_html_id * (optional) HTML ID of the form to be submitted. * @param string $extra_post diff --git a/core/modules/block_content/src/Tests/BlockContentCreationTest.php b/core/modules/block_content/src/Tests/BlockContentCreationTest.php index 0cca85e..0f42a01 100644 --- a/core/modules/block_content/src/Tests/BlockContentCreationTest.php +++ b/core/modules/block_content/src/Tests/BlockContentCreationTest.php @@ -167,7 +167,7 @@ public function testDefaultBlockContentCreation() { $edit = array(); $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->drupalPostForm('block/add', $edit, t('Save')); // Check that the block has been created and that it is a basic block. diff --git a/core/modules/ckeditor/js/ckeditor.js b/core/modules/ckeditor/js/ckeditor.js index 497393f..aba7880 100644 --- a/core/modules/ckeditor/js/ckeditor.js +++ b/core/modules/ckeditor/js/ckeditor.js @@ -196,7 +196,7 @@ * @param {string} url * The URL that contains the contents of the dialog. * @param {object} existingValues - * Existing values that will be sent via POST to the url for the dialog + * Existing values that will be sent via POST to the URL for the dialog * contents. * @param {function} saveCallback * A function to be called upon saving the dialog. diff --git a/core/modules/comment/src/CommentManager.php b/core/modules/comment/src/CommentManager.php index fcec230..db98808 100644 --- a/core/modules/comment/src/CommentManager.php +++ b/core/modules/comment/src/CommentManager.php @@ -78,7 +78,7 @@ class CommentManager implements CommentManagerInterface { * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation * The string translation service. * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator - * The url generator service. + * The URL generator service. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler service. * @param \Drupal\Core\Session\AccountInterface $current_user diff --git a/core/modules/comment/src/Controller/CommentController.php b/core/modules/comment/src/Controller/CommentController.php index 0b682e8..b8a3e9f 100644 --- a/core/modules/comment/src/Controller/CommentController.php +++ b/core/modules/comment/src/Controller/CommentController.php @@ -167,7 +167,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/comment/src/Tests/CommentInterfaceTest.php b/core/modules/comment/src/Tests/CommentInterfaceTest.php index a250614..170ce56 100644 --- a/core/modules/comment/src/Tests/CommentInterfaceTest.php +++ b/core/modules/comment/src/Tests/CommentInterfaceTest.php @@ -114,7 +114,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/src/Tests/CommentNonNodeTest.php b/core/modules/comment/src/Tests/CommentNonNodeTest.php index 1b37c1f..f795994 100644 --- a/core/modules/comment/src/Tests/CommentNonNodeTest.php +++ b/core/modules/comment/src/Tests/CommentNonNodeTest.php @@ -436,7 +436,7 @@ function testCommentFunctionality() { $this->assertFieldChecked('edit-field-foobar-0-status-2'); $this->assertNoField('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->assertNoFieldByName('subject[0][value]', '', 'Subject field found.'); $this->assertNoFieldByName('comment_body[0][value]', '', 'Comment field found.'); diff --git a/core/modules/contact/src/Tests/ContactSitewideTest.php b/core/modules/contact/src/Tests/ContactSitewideTest.php index ce69388..487786c 100644 --- a/core/modules/contact/src/Tests/ContactSitewideTest.php +++ b/core/modules/contact/src/Tests/ContactSitewideTest.php @@ -72,7 +72,7 @@ function testSiteWideContact() { // Default form exists. $this->assertLinkByHref('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. $edit_link = $this->xpath('//a[@href=:href]', array( diff --git a/core/modules/contextual/src/Element/ContextualLinks.php b/core/modules/contextual/src/Element/ContextualLinks.php index 8f67023..ddfa5a9 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/dblog/src/Tests/DbLogTest.php b/core/modules/dblog/src/Tests/DbLogTest.php index 90cb6c2..cfdb6f2 100644 --- a/core/modules/dblog/src/Tests/DbLogTest.php +++ b/core/modules/dblog/src/Tests/DbLogTest.php @@ -184,7 +184,7 @@ private function verifyCron($row_limit) { * - 'user': String identifying the username. * - '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/filter/src/Tests/FilterAdminTest.php b/core/modules/filter/src/Tests/FilterAdminTest.php index 8d28465..3af6009 100644 --- a/core/modules/filter/src/Tests/FilterAdminTest.php +++ b/core/modules/filter/src/Tests/FilterAdminTest.php @@ -135,7 +135,7 @@ function testFormatAdmin() { // Edit text format. $this->drupalGet('admin/config/content/formats'); - // Cannot use the assertNoLinkByHref method as it does partial url matching + // Cannot use the assertNoLinkByHref method as it does partial URL matching // and 'admin/config/content/formats/manage/' . $format_id . '/disable' // exists. // @todo: See https://www.drupal.org/node/2031223 for the above. diff --git a/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php index 5ce4e6d..a3a70b4 100644 --- a/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php +++ b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php @@ -107,7 +107,7 @@ function testImageSource() { $images = array( $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/Controller/ForumController.php b/core/modules/forum/src/Controller/ForumController.php index 0e3d995..0cc4af8 100644 --- a/core/modules/forum/src/Controller/ForumController.php +++ b/core/modules/forum/src/Controller/ForumController.php @@ -308,7 +308,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/forum/src/Form/ContainerForm.php b/core/modules/forum/src/Form/ContainerForm.php index d12d098..3aceb81 100644 --- a/core/modules/forum/src/Form/ContainerForm.php +++ b/core/modules/forum/src/Form/ContainerForm.php @@ -10,7 +10,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 415fef7..af7ef11 100644 --- a/core/modules/forum/src/Form/ForumForm.php +++ b/core/modules/forum/src/Form/ForumForm.php @@ -19,7 +19,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/hal/src/Normalizer/FileEntityNormalizer.php b/core/modules/hal/src/Normalizer/FileEntityNormalizer.php index 46c6094..28b0cb5 100644 --- a/core/modules/hal/src/Normalizer/FileEntityNormalizer.php +++ b/core/modules/hal/src/Normalizer/FileEntityNormalizer.php @@ -49,7 +49,7 @@ public function __construct(EntityManagerInterface $entity_manager, ClientInterf */ public function normalize($entity, $format = NULL, array $context = array()) { $data = parent::normalize($entity, $format, $context); - // Replace the file url with a full url for the file. + // Replace the file URL with a full URL for the file. $data['uri'][0]['value'] = $this->getEntityUri($entity); return $data; diff --git a/core/modules/image/src/Routing/ImageStyleRoutes.php b/core/modules/image/src/Routing/ImageStyleRoutes.php index 66f6bfa..1a3d7ee 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 2e91305..d0586c6 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 78edb89..19dc2dd 100644 --- a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php +++ b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php @@ -101,9 +101,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))) { @@ -111,8 +111,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']); @@ -171,13 +171,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 the content entity language negotiator has higher priority - * than the url language negotiator, FALSE otherwise. + * than the URL language negotiator, FALSE otherwise. */ protected function hasLowerLanguageNegotiationWeight() { if (!isset($this->hasLowerLanguageNegotiationWeightResult)) { @@ -186,7 +186,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; } @@ -215,10 +215,10 @@ protected function hasLowerLanguageNegotiationWeight() { * Determines if content entity route condition is met. * * Requirements: currently being on an 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. + * 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/Kernel/EntityUrlLanguageTest.php b/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php index fb62f48..97ea0a2 100644 --- a/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php +++ b/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php @@ -88,7 +88,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->assertTrue(strpos($this->entity->urlInfo('canonical')->toString(), '/en/entity_test/' . $this->entity->id() . '?' . LanguageNegotiationContentEntity::QUERY_PARAMETER . '=en') !== FALSE); $this->assertTrue(strpos($this->entity->getTranslation('es')->urlInfo('canonical')->toString(), '/en/entity_test/' . $this->entity->id() . '?' . LanguageNegotiationContentEntity::QUERY_PARAMETER . '=es') !== FALSE); $this->assertTrue(strpos($this->entity->getTranslation('fr')->urlInfo('canonical')->toString(), '/en/entity_test/' . $this->entity->id() . '?' . LanguageNegotiationContentEntity::QUERY_PARAMETER . '=fr') !== FALSE); diff --git a/core/modules/node/src/Tests/NodeTranslationUITest.php b/core/modules/node/src/Tests/NodeTranslationUITest.php index b4dce56..841736f 100644 --- a/core/modules/node/src/Tests/NodeTranslationUITest.php +++ b/core/modules/node/src/Tests/NodeTranslationUITest.php @@ -295,7 +295,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 363846f..f36f2ff 100644 --- a/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php +++ b/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php @@ -44,7 +44,7 @@ private function assertPath($pid, $conditions, $path) { } /** - * Test the url alias migration. + * Test the URL alias migration. */ public function testUrlAlias() { $id_map = $this->getMigration('d6_url_alias')->getIdMap(); diff --git a/core/modules/quickedit/js/util.js b/core/modules/quickedit/js/util.js index 4b0a4c4..e1682d4 100644 --- a/core/modules/quickedit/js/util.js +++ b/core/modules/quickedit/js/util.js @@ -24,7 +24,7 @@ Drupal.quickedit.util.constants.transitionEnd = 'transitionEnd.quickedit webkitTransitionEnd.quickedit transitionend.quickedit msTransitionEnd.quickedit oTransitionEnd.quickedit'; /** - * Converts a field id into a formatted url path. + * Converts a field id into a formatted URL path. * * @example * Drupal.quickedit.util.buildUrl( diff --git a/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php index d4e1cf0..5ca6e99 100644 --- a/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php +++ b/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php @@ -154,7 +154,7 @@ public function runTestAllFormatters($expected_rdf, $type = NULL) { 'value' => $this->testValue, 'type' => 'literal', ); - // Test the link formatter: trim at 20, url only (as plaintext.) + // Test the link formatter: trim at 20, URL only (as plaintext.) $formatter = array( 'type' => 'link', 'settings' => array( @@ -167,7 +167,7 @@ public function runTestAllFormatters($expected_rdf, $type = NULL) { ); $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf); - // Test the link formatter: do not trim, url only (as plaintext.) + // Test the link formatter: do not trim, URL only (as plaintext.) $formatter = array( 'type' => 'link', 'settings' => array( diff --git a/core/modules/simpletest/src/KernelTestBase.php b/core/modules/simpletest/src/KernelTestBase.php index 96c5cf6..c467ef2 100644 --- a/core/modules/simpletest/src/KernelTestBase.php +++ b/core/modules/simpletest/src/KernelTestBase.php @@ -359,7 +359,7 @@ public function containerBuild(ContainerBuilder $container) { // Prevent the alias-based path processor, which requires a url_alias db // table, from being registered to the path processor manager. We do this // by removing the tags that the compiler pass looks for. This means the - // url generator can safely be used within tests. + // URL generator can safely be used within tests. $definition = $container->getDefinition('path_processor_alias'); $definition->clearTag('path_processor_inbound')->clearTag('path_processor_outbound'); } diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php index cb454a1..e1055cd 100644 --- a/core/modules/simpletest/src/WebTestBase.php +++ b/core/modules/simpletest/src/WebTestBase.php @@ -1043,7 +1043,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(); } @@ -1110,7 +1110,7 @@ protected function tearDown() { $this->loggedInUser = FALSE; $this->additionalCurlOptions = array(); - // Close the CURL handler and reset the cookies array used for upgrade + // Close the cURL handler and reset the cookies array used for upgrade // testing so test classes containing multiple tests are not polluted. $this->curlClose(); $this->curlCookies = array(); @@ -1193,7 +1193,7 @@ protected function curlExec($curl_options, $redirect = FALSE) { // fragment in the request to the server, causing some web servers // to reject the request citing "400 - Bad Request". To prevent // this, we strip the fragment from the request. - // TODO: Remove this for Drupal 8, since fixed in curl 7.20.0. + // TODO: Remove this for Drupal 8, since fixed in cURL 7.20.0. if (strpos($curl_options[CURLOPT_URL], '#')) { $original_url = $curl_options[CURLOPT_URL]; $curl_options[CURLOPT_URL] = strtok($curl_options[CURLOPT_URL], '#'); @@ -1203,11 +1203,11 @@ protected function curlExec($curl_options, $redirect = FALSE) { $url = empty($curl_options[CURLOPT_URL]) ? curl_getinfo($this->curlHandle, CURLINFO_EFFECTIVE_URL) : $curl_options[CURLOPT_URL]; if (!empty($curl_options[CURLOPT_POST])) { - // This is a fix for the Curl library to prevent Expect: 100-continue + // This is a fix for the cURL library to prevent Expect: 100-continue // headers in POST requests, that may cause unexpected HTTP response // codes from some webservers (like lighttpd that returns a 417 error // code). It is done by setting an empty "Expect" header field that is - // not overwritten by Curl. + // not overwritten by cURL. $curl_options[CURLOPT_HTTPHEADER][] = 'Expect:'; } @@ -1269,7 +1269,7 @@ protected function curlExec($curl_options, $redirect = FALSE) { // letting cURL handle redirects we take of them ourselves to // to prevent fragments being sent to the web server as part // of the request. - // TODO: Remove this for Drupal 8, since fixed in curl 7.20.0. + // TODO: Remove this for Drupal 8, since fixed in cURL 7.20.0. if (in_array($status, array(300, 301, 302, 303, 305, 307)) && $this->redirectCount < $this->maximumRedirects) { if ($this->drupalGetHeader('location')) { $this->redirectCount++; @@ -1376,7 +1376,7 @@ protected function isInChildSite() { * @param \Drupal\Core\Url|string $path * Drupal path or URL to load into internal browser * @param $options - * Options to be forwarded to the url generator. + * Options to be forwarded to the URL generator. * @param $headers * An array containing additional HTTP request headers, each formatted as * "name: value". @@ -1385,7 +1385,7 @@ protected function isInChildSite() { * The retrieved HTML string, also available as $this->getRawContent() */ protected function drupalGet($path, array $options = array(), array $headers = array()) { - // We re-using a CURL connection here. If that connection still has certain + // We re-using a cURL connection here. If that connection still has certain // options set, it might change the GET into a POST. Make sure we clear out // previous options. $out = $this->curlExec(array(CURLOPT_HTTPGET => TRUE, CURLOPT_URL => $this->buildUrl($path, $options), CURLOPT_NOBODY => FALSE, CURLOPT_HTTPHEADER => $headers)); @@ -1555,7 +1555,7 @@ protected function drupalGetXHR($path, array $options = array(), array $headers * textfield: under these conditions, no button information is added to the * POST data. * @param $options - * Options to be forwarded to the url generator. + * Options to be forwarded to the URL generator. * @param $headers * An array containing additional HTTP request headers, each formatted as * "name: value". @@ -1699,7 +1699,7 @@ protected function drupalPostForm($path, $edit, $submit, array $options = array( * (optional) Override the path set by the Ajax settings of the triggering * element. * @param $options - * (optional) Options to be forwarded to the url generator. + * (optional) Options to be forwarded to the URL generator. * @param $headers * (optional) An array containing additional HTTP request headers, each * formatted as "name: value". Forwarded to drupalPostForm(). @@ -1954,7 +1954,7 @@ protected function drupalProcessAjaxResponse($content, array $ajax_response, arr * Ajax page state data should be included. Use getAjaxPageStatePostData() * for that. * @param array $options - * (optional) Options to be forwarded to the url generator. The 'absolute' + * (optional) Options to be forwarded to the URL generator. The 'absolute' * option will automatically be enabled. * * @return @@ -1987,7 +1987,7 @@ protected function drupalPost($path, $accept, array $post, $options = array()) { * Ajax page state data should be included. Use getAjaxPageStatePostData() * for that. * @param array $options - * (optional) Options to be forwarded to the url generator. The 'absolute' + * (optional) Options to be forwarded to the URL generator. The 'absolute' * option will automatically be enabled. * * @return string @@ -2102,7 +2102,7 @@ protected function checkForMetaRefresh() { * @param $path * Drupal path or URL to load into internal browser * @param $options - * Options to be forwarded to the url generator. + * Options to be forwarded to the URL generator. * @param $headers * An array containing additional HTTP request headers, each formatted as * "name: value". @@ -2523,7 +2523,7 @@ protected function assertHeader($header, $value, $message = '', $group = 'Browse * @param \Drupal\Core\Url|string $path * The expected system path or URL. * @param $options - * (optional) Any additional options to pass for $path to the url generator. + * (optional) Any additional options to pass for $path to the URL generator. * @param $message * (optional) A message to display with the assertion. Do not translate * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed @@ -2622,12 +2622,12 @@ protected function assertNoResponse($code, $message = '', $group = 'Browser') { * * 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 $override_server_vars * An array of server variables to override. * diff --git a/core/modules/system/src/Tests/Form/ConfirmFormTest.php b/core/modules/system/src/Tests/Form/ConfirmFormTest.php index 312aa2e..acf6a81 100644 --- a/core/modules/system/src/Tests/Form/ConfirmFormTest.php +++ b/core/modules/system/src/Tests/Form/ConfirmFormTest.php @@ -68,7 +68,7 @@ public function testConfirmFormWithExternalDestination() { * Asserts that a cancel link is present pointing to the provided URL. * * @param \Drupal\Core\Url $url - * The url to check for. + * The URL to check for. * @param string $message * The assert message. * @param string $group diff --git a/core/modules/system/src/Tests/ParamConverter/UpcastingTest.php b/core/modules/system/src/Tests/ParamConverter/UpcastingTest.php index b881386..d745a3d 100644 --- a/core/modules/system/src/Tests/ParamConverter/UpcastingTest.php +++ b/core/modules/system/src/Tests/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/src/Tests/Routing/RouterTest.php b/core/modules/system/src/Tests/Routing/RouterTest.php index 1b33baf..62c9b2a 100644 --- a/core/modules/system/src/Tests/Routing/RouterTest.php +++ b/core/modules/system/src/Tests/Routing/RouterTest.php @@ -185,7 +185,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('', [], ['absolute' => TRUE]); diff --git a/core/modules/system/src/Tests/System/AdminTest.php b/core/modules/system/src/Tests/System/AdminTest.php index 8921ad0..3ffa738 100644 --- a/core/modules/system/src/Tests/System/AdminTest.php +++ b/core/modules/system/src/Tests/System/AdminTest.php @@ -146,7 +146,7 @@ protected function getTopLevelMenuLinks() { function testCompactMode() { // The front page defaults to 'user/login', which redirects to 'user/{user}' // for authenticated users. We cannot use '', 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/src/Tests/Update/UpdatePathTestBase.php b/core/modules/system/src/Tests/Update/UpdatePathTestBase.php index 82169ad..ab8dc6e 100644 --- a/core/modules/system/src/Tests/Update/UpdatePathTestBase.php +++ b/core/modules/system/src/Tests/Update/UpdatePathTestBase.php @@ -158,7 +158,7 @@ protected function setUp() { return; } - // 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. $this->updateUrl = Url::fromRoute('system.db_update'); diff --git a/core/modules/system/templates/menu.html.twig b/core/modules/system/templates/menu.html.twig index 03704f2..46a2957 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/src/Kernel/Scripts/DbCommandBaseTest.php b/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php index c11770d..52946ef 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() { } /** - * Test supplying database connection as a url. + * Test supplying database connection as a URL. */ public function testSpecifyDbUrl() { $connection_info = Database::getConnectionInfo('default')['default']; diff --git a/core/modules/toolbar/templates/menu--toolbar.html.twig b/core/modules/toolbar/templates/menu--toolbar.html.twig index 659e8f5..a6faad3 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/tour/js/tour.js b/core/modules/tour/js/tour.js index 2c7050f..7b24090 100644 --- a/core/modules/tour/js/tour.js +++ b/core/modules/tour/js/tour.js @@ -15,7 +15,7 @@ * It uses the query string for: * - tour: When ?tour=1 is present, the tour will start automatically after * the page has loaded. - * - tips: Pass ?tips=class in the url to filter the available tips to the + * - tips: Pass ?tips=class in the URL to filter the available tips to the * subset which match the given class. * * @example 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 0e1d80f..783b5fb 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 @@ -16,10 +16,10 @@ class TipPluginImage extends TipPluginBase { /** - * 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 29d5582..0ce8a53 100644 --- a/core/modules/update/src/UpdateFetcher.php +++ b/core/modules/update/src/UpdateFetcher.php @@ -20,7 +20,7 @@ class UpdateFetcher implements UpdateFetcherInterface { const UPDATE_DEFAULT_URL = 'http://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/templates/update-project-status.html.twig b/core/modules/update/templates/update-project-status.html.twig index 4cc9a19..b67bdd0 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/update/tests/src/Unit/UpdateFetcherTest.php b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php index c203f3b..866c7af 100644 --- a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php +++ b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php @@ -41,7 +41,7 @@ protected function setUp() { * @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 * @@ -59,7 +59,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 = array(); 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 88ffd64..c6192db 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 an 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/views/js/base.js b/core/modules/views/js/base.js index 7c7622d..42668d9 100644 --- a/core/modules/views/js/base.js +++ b/core/modules/views/js/base.js @@ -92,7 +92,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 b124d65..8416496 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 */ @@ -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/DisplayPluginInterface.php b/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php index 982b4ce..9f83d9d 100644 --- a/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php +++ b/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php @@ -583,7 +583,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/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php index cde5ecb..47d5dee 100644 --- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php @@ -1384,7 +1384,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 /. @@ -1432,7 +1432,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']; @@ -1516,7 +1516,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/Tests/Handler/FieldWebTest.php b/core/modules/views/src/Tests/Handler/FieldWebTest.php index a6ff1b4..e4078a4 100644 --- a/core/modules/views/src/Tests/Handler/FieldWebTest.php +++ b/core/modules/views/src/Tests/Handler/FieldWebTest.php @@ -284,11 +284,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) { @@ -296,7 +296,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/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php index da85925..1a0076f 100644 --- a/core/modules/views/src/ViewExecutable.php +++ b/core/modules/views/src/ViewExecutable.php @@ -232,14 +232,14 @@ class ViewExecutable implements \Serializable { public $row_index; /** - * Allow to override the url of the current view. + * Allow to override the URL of the current view. * * @var \Drupal\Core\Url */ 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/Kernel/Handler/FieldUrlTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php index bfb764d..d0d61f0 100644 --- a/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php +++ b/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php @@ -46,7 +46,7 @@ public function testFieldUrl() { $this->assertEqual('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 9672dc2..3e87f02a 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 */ @@ -167,7 +167,7 @@ protected function setUp() { } /** - * 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->getMock('Drupal\Core\PathProcessor\OutboundPathProcessorInterface'); @@ -397,7 +397,7 @@ public function providerTestRenderAsLinkWithUrlAndOptions() { $url = Url::fromRoute('test_route'); $data[] = [$url, [], clone $url, '/test-path', clone $url, 'value']; - // 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, 'value']; diff --git a/core/modules/views_ui/src/Tests/DuplicateTest.php b/core/modules/views_ui/src/Tests/DuplicateTest.php index a6948f0..f593f44 100644 --- a/core/modules/views_ui/src/Tests/DuplicateTest.php +++ b/core/modules/views_ui/src/Tests/DuplicateTest.php @@ -33,7 +33,7 @@ public function testDuplicateView() { // Duplicate view. $this->drupalPostForm('admin/structure/views/view/' . $random_view['id'] . '/duplicate', $view, t('Duplicate')); - // Assert that the page url is correct. + // Assert that the page URL is correct. $this->assertUrl('admin/structure/views/view/' . $view['id'], array(), 'Make sure the view saving was successful and the browser got redirected to the edit page.'); // Assert that the page title is correctly displayed. diff --git a/core/modules/views_ui/src/Tests/PreviewTest.php b/core/modules/views_ui/src/Tests/PreviewTest.php index 3b4dd9b..e6d932d 100644 --- a/core/modules/views_ui/src/Tests/PreviewTest.php +++ b/core/modules/views_ui/src/Tests/PreviewTest.php @@ -312,7 +312,7 @@ protected function getPreviewAJAX($view_name, $panel_id, $row_count) { * Mimic clicking on a preview link. * * @param string $url - * The url to navigate to. + * The URL to navigate to. * @param int $row_count * The expected number of rows in the preview. */ diff --git a/core/modules/views_ui/src/Tests/RedirectTest.php b/core/modules/views_ui/src/Tests/RedirectTest.php index 7a01959..9684f39 100644 --- a/core/modules/views_ui/src/Tests/RedirectTest.php +++ b/core/modules/views_ui/src/Tests/RedirectTest.php @@ -29,7 +29,7 @@ public function testRedirect() { $this->assertUrl($random_destination, array(), 'Make sure the user got redirected to the expected page defined in the 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/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php index 5f8c095..81a5451 100644 --- a/core/modules/views_ui/src/ViewEditForm.php +++ b/core/modules/views_ui/src/ViewEditForm.php @@ -289,7 +289,8 @@ 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/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php index ed3875d..1a5ebf1 100644 --- a/core/tests/Drupal/KernelTests/KernelTestBase.php +++ b/core/tests/Drupal/KernelTests/KernelTestBase.php @@ -631,7 +631,7 @@ public function register(ContainerBuilder $container) { // Prevent the alias-based path processor, which requires a url_alias db // table, from being registered to the path processor manager. We do this // by removing the tags that the compiler pass looks for. This means the - // url generator can safely be used within tests. + // URL generator can safely be used within tests. $container->getDefinition('path_processor_alias') ->clearTag('path_processor_inbound') ->clearTag('path_processor_outbound'); diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php index c701dbd..e4c978a 100644 --- a/core/tests/Drupal/Tests/BrowserTestBase.php +++ b/core/tests/Drupal/Tests/BrowserTestBase.php @@ -580,7 +580,7 @@ protected function prepareRequest() { * @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. * * @return string * The retrieved HTML string, also available as $this->getRawContent() @@ -1424,7 +1424,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(); } @@ -1434,12 +1434,12 @@ protected function rebuildContainer() { * * 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/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php index 87ab75f..68a10a3 100644 --- a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php @@ -81,7 +81,7 @@ public function providerTestValidAbsoluteData() { * @covers ::isValid * * @param string $url - * The url to test. + * The URL to test. * @param string $scheme * The scheme to test. */ @@ -112,7 +112,7 @@ public function providerTestInvalidAbsolute() { * @covers ::isValid * * @param string $url - * The url to test. + * The URL to test. * @param string $scheme * The scheme to test. */ @@ -146,7 +146,7 @@ public function providerTestValidRelativeData() { * @covers ::isValid * * @param string $url - * The url to test. + * The URL to test. * @param string $prefix * The prefix to test. */ @@ -177,7 +177,7 @@ public function providerTestInvalidRelativeData() { * @covers ::isValid * * @param string $url - * The url to test. + * The URL to test. * @param string $prefix * The prefix to test. */ @@ -229,7 +229,7 @@ public static function providerTestFilterQueryParameters() { } /** - * Tests url parsing. + * Tests URL parsing. * * @dataProvider providerTestParse * @covers ::parse @@ -423,7 +423,7 @@ public static function providerTestFilterBadProtocol() { } /** - * Tests dangerous url protocol filtering. + * Tests dangerous URL protocol filtering. * * @dataProvider providerTestStripDangerousProtocols * @covers ::setAllowedProtocols @@ -460,10 +460,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. @@ -480,10 +480,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. @@ -500,15 +500,15 @@ protected function dataEnhanceWithPrefix(array $urls) { } /** - * Test detecting external urls that point to local resources. + * Test 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 @@ -518,7 +518,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() */ @@ -551,12 +551,12 @@ public function providerTestExternalIsLocal() { } /** - * Test invalid url arguments. + * Test 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 @@ -567,7 +567,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() */ @@ -576,7 +576,7 @@ public function providerTestExternalIsLocalInvalid() { array('http://example.com/foo', ''), array('http://example.com/foo', 'bar'), array('http://example.com/foo', 'http://'), - // Invalid destination urls. + // Invalid destination URLs. array('', 'http://example.com/foo'), array('bar', 'http://example.com/foo'), array('/bar', 'http://example.com/foo'), diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php index 5537046..99cb180 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 06e8c17..2d35300 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 */ diff --git a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php index 1299b3f..97f9298 100644 --- a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php +++ b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php @@ -27,7 +27,7 @@ class LinkGeneratorTest extends UnitTestCase { protected $linkGenerator; /** - * The mocked url generator. + * The mocked URL generator. * * @var \PHPUnit_Framework_MockObject_MockObject */ @@ -87,7 +87,7 @@ protected function setUp() { */ public function providerTestGenerateHrefs() { return array( - // Test that the url returned by the URL generator is used. + // Test that the URL returned by the URL generator is used. array('test_route_1', array(), FALSE, '/test-route-1'), // Test that $parameters is passed to the URL generator. array('test_route_2', array('value' => 'example'), FALSE, '/test-route-2/example'), diff --git a/core/themes/classy/templates/navigation/menu.html.twig b/core/themes/classy/templates/navigation/menu.html.twig index e482ef4..dbe70e8 100644 --- a/core/themes/classy/templates/navigation/menu.html.twig +++ b/core/themes/classy/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/stable/templates/admin/update-project-status.html.twig b/core/themes/stable/templates/admin/update-project-status.html.twig index 5a6d2ec..19ff004 100644 --- a/core/themes/stable/templates/admin/update-project-status.html.twig +++ b/core/themes/stable/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/stable/templates/navigation/menu--toolbar.html.twig b/core/themes/stable/templates/navigation/menu--toolbar.html.twig index 55cfc5b..a0c1e8c 100644 --- a/core/themes/stable/templates/navigation/menu--toolbar.html.twig +++ b/core/themes/stable/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/stable/templates/navigation/menu.html.twig b/core/themes/stable/templates/navigation/menu.html.twig index 33efca8..9f9cdbd 100644 --- a/core/themes/stable/templates/navigation/menu.html.twig +++ b/core/themes/stable/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.