Issue #1742958 by DamienMcKenna, jhodgdon: Fixed All spellings of URI should be uppercase.

core/includes/authorize.inc

@@ -18,7 +18,7 @@ function authorize_filetransfer_form($form, &$form_state) {
   global $base_url, $is_https;
   $form = array();
 
-  // If possible, we want to post this form securely via https.
+  // If possible, we want to post this form securely via HTTPS.
   $form['#https'] = TRUE;
 
   // Get all the available ways to transfer files.

core/includes/bootstrap.inc

@@ -433,7 +433,7 @@ function conf_path($require_settings = TRUE, $reset = FALSE) {
  *   The hostname and optional port number, e.g. "www.example.com" or
  *   "www.example.com:8080".
  * @param $script_name
- *   The part of the url following the hostname, including the leading slash.
+ *   The part of the URL following the hostname, including the leading slash.
  * @param $require_settings
  *   Defaults to TRUE. If TRUE, then only match directories with a
  *   'settings.php' file. Otherwise match any directory.
@@ -768,7 +768,7 @@ function drupal_settings_initialize() {
   }
   else {
     // Otherwise use $base_url as session name, without the protocol
-    // to use the same session identifiers across http and https.
+    // to use the same session identifiers across HTTP and HTTPS.
     list( , $session_name) = explode('://', $base_url, 2);
     // HTTP_HOST can be modified by a visitor, but we already sanitized it
     // in drupal_settings_initialize().

core/includes/common.inc

@@ -448,7 +448,7 @@ function drupal_get_query_parameters(array $query = NULL, array $exclude = array
  *   The query string to split.
  *
  * @return
- *   An array of url decoded couples $param_name => $value.
+ *   An array of URL decoded couples $param_name => $value.
  */
 function drupal_get_query_array($query) {
   $result = array();
@@ -2086,7 +2086,7 @@ function _format_date_callback(array $matches = NULL, $new_langcode = NULL) {
  *     for the URL. If $options['language'] is omitted, the language will be
  *     obtained from language(LANGUAGE_TYPE_URL).
  *   - 'https': Whether this URL should point to a secure location. If not
- *     defined, the current scheme is used, so the user stays on http or https
+ *     defined, the current scheme is used, so the user stays on HTTP or HTTPS
  *     respectively. TRUE enforces HTTPS and FALSE enforces HTTP, but HTTPS can
  *     only be enforced when the variable 'https' is set to TRUE.
  *   - 'base_url': Only used internally, to modify the base URL when a language

core/includes/file.inc

@@ -464,8 +464,8 @@ function file_create_url($uri) {
     }
   }
   elseif ($scheme == 'http' || $scheme == 'https') {
-    // Check for http so that we don't have to implement getExternalUrl() for
-    // the http wrapper.
+    // Check for HTTP so that we don't have to implement getExternalUrl() for
+    // the HTTP wrapper.
     return $uri;
   }
   else {

core/includes/form.inc

@@ -4154,7 +4154,7 @@ function form_type_range_value($element, $input = FALSE) {
 }
 
 /**
- * Returns HTML for a url form element.
+ * Returns HTML for a URL form element.
  *
  * @param $variables
  *   An associative array containing:

core/includes/theme.inc

@@ -2087,7 +2087,7 @@ function theme_item_list($variables) {
  *
  * @param $variables
  *   An associative array containing:
- *   - url: The url for the link.
+ *   - url: The URL for the link.
  */
 function theme_more_help_link($variables) {
   return '<div class="more-help-link">' . l(t('More help'), $variables['url']) . '</div>';
@@ -2152,7 +2152,7 @@ function theme_html_tag($variables) {
  *
  * @param $variables
  *   An associative array containing:
- *   - url: The url of the main page.
+ *   - url: The URL of the main page.
  *   - title: A descriptive verb for the link, like 'Read more'.
  */
 function theme_more_link($variables) {

core/lib/Drupal/Core/Language/LanguageManager.php

@@ -14,7 +14,7 @@
  *
  * This service is dependent on the 'request' service and can therefore pass the
  * Request object to the code that deals with each particular language type.
- * This means the Request can be used directly for things like url-based
+ * This means the Request can be used directly for things like URL-based
  * language negotiation.
  */
 class LanguageManager {

core/lib/Drupal/Core/StreamWrapper/LocalStream.php

@@ -342,7 +342,7 @@ public function stream_close() {
    * Support for unlink().
    *
    * @param string $uri
-   *   A string containing the uri to the resource to delete.
+   *   A string containing the URI to the resource to delete.
    *
    * @return bool
    *   TRUE if resource was successfully deleted.
@@ -358,9 +358,9 @@ public function unlink($uri) {
    * Support for rename().
    *
    * @param string $from_uri,
-   *   The uri to the file to rename.
+   *   The URI to the file to rename.
    * @param string $to_uri
-   *   The new uri for file.
+   *   The new URI for file.
    *
    * @return bool
    *   TRUE if file was successfully renamed.

core/misc/collapse.js

@@ -15,7 +15,7 @@ function CollapsibleFieldset(node, settings) {
     settings
   );
   // Expand fieldset if there are errors inside, or if it contains an
-  // element that is targeted by the uri fragment identifier.
+  // element that is targeted by the URI fragment identifier.
   var anchor = location.hash && location.hash !== '#' ? ', ' + location.hash : '';
   if (this.$node.find('.error' + anchor).length) {
     this.$node.removeClass('collapsed');

core/modules/comment/comment.module

@@ -173,7 +173,7 @@ function comment_node_type_load($name) {
 }
 
 /**
- * Entity uri callback.
+ * Entity URI callback.
  */
 function comment_uri(Comment $comment) {
   return array(

core/modules/config/tests/config_test/config_test.module

@@ -94,7 +94,7 @@ function config_test_entity_info() {
 }
 
 /**
- * Entity uri callback.
+ * Entity URI callback.
  *
  * @param Drupal\config_test\ConfigTest $config_test
  *   A ConfigTest entity.

core/modules/dblog/lib/Drupal/dblog/Tests/DBLogTest.php

@@ -275,7 +275,7 @@ private function doUser() {
     // View the database log page-not-found report page.
     $this->drupalGet('admin/reports/page-not-found');
     $this->assertResponse(200);
-    // Check that full-length url displayed.
+    // Check that full-length URL displayed.
     $this->assertText($not_found_url, t('DBLog event was recorded: [page not found]'));
   }
 

core/modules/entity/entity.api.php

@@ -44,8 +44,8 @@
  *     if a higher level persistent cache is available for the entity type.
  *     Defaults to TRUE.
  *   - uri callback: A function taking an entity as argument and returning the
- *     uri elements of the entity, e.g. 'path' and 'options'. The actual entity
- *     uri can be constructed by passing these elements to url().
+ *     URI elements of the entity, e.g. 'path' and 'options'. The actual entity
+ *     URI can be constructed by passing these elements to url().
  *   - label callback: (optional) A function taking an entity and optional langcode
  *     argument, and returning the label of the entity. If langcode is omitted, the
  *     entity's default language is used.

core/modules/image/image.module

@@ -1198,7 +1198,7 @@ function theme_image_style($variables) {
   $variables['width'] = $dimensions['width'];
   $variables['height'] = $dimensions['height'];
 
-  // Determine the url for the styled image.
+  // Determine the URL for the styled image.
   $variables['uri'] = image_style_url($variables['style_name'], $variables['uri']);
   return theme('image', $variables);
 }

core/modules/language/language.negotiation.inc

@@ -265,7 +265,7 @@ function language_from_url($languages, $request) {
       foreach ($languages as $language) {
         // Skip the check if the language doesn't have a domain.
         if (!empty($domains[$language->langcode])) {
-          // Ensure that there is exactly one protocol in the url when checking
+          // Ensure that there is exactly one protocol in the URL when checking
           // the hostname.
           $host = 'http://' . str_replace(array('http://', 'https://'), '', $domains[$language->langcode]);
           $host = parse_url($host, PHP_URL_HOST);

core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php

@@ -52,7 +52,7 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name' => 'UI language negotiation',
-      'description' => 'Test UI language switching by url path prefix and domain.',
+      'description' => 'Test UI language switching by URL path prefix and domain.',
       'group' => 'Language',
     );
   }
@@ -434,21 +434,21 @@ function testLanguageDomain() {
     $italian_url = url('admin', array('language' => $languages['it'], 'script' => ''));
     $url_scheme = ($is_https) ? 'https://' : 'http://';
     $correct_link = $url_scheme . $link;
-    $this->assertTrue($italian_url == $correct_link, t('The url() function returns the right url (@url) in accordance with the chosen language', array('@url' => $italian_url)));
+    $this->assertTrue($italian_url == $correct_link, t('The url() function returns the right URL (@url) in accordance with the chosen language', array('@url' => $italian_url)));
 
-    // Test https via options.
+    // Test HTTPS via options.
     variable_set('https', TRUE);
     $italian_url = url('admin', array('https' => TRUE, 'language' => $languages['it'], 'script' => ''));
     $correct_link = 'https://' . $link;
-    $this->assertTrue($italian_url == $correct_link, t('The url() function returns the right https url (via options) (@url) in accordance with the chosen language', array('@url' => $italian_url)));
+    $this->assertTrue($italian_url == $correct_link, t('The url() function returns the right HTTPS URL (via options) (@url) in accordance with the chosen language', array('@url' => $italian_url)));
     variable_set('https', FALSE);
 
-    // Test https via current url scheme.
+    // Test HTTPS via current URL scheme.
     $temp_https = $is_https;
     $is_https = TRUE;
     $italian_url = url('admin', array('language' => $languages['it'], 'script' => ''));
     $correct_link = 'https://' . $link;
-    $this->assertTrue($italian_url == $correct_link, t('The url() function returns the right url (via current url scheme) (@url) in accordance with the chosen language', array('@url' => $italian_url)));
+    $this->assertTrue($italian_url == $correct_link, t('The url() function returns the right URL (via current URL scheme) (@url) in accordance with the chosen language', array('@url' => $italian_url)));
     $is_https = $temp_https;
   }
 }

core/modules/locale/lib/Drupal/locale/Gettext.php

@@ -28,7 +28,7 @@ class Gettext {
    * @param string $langcode
    *   Language code string.
    * @param array $files
-   *   List of file objects with uri properties pointing to read.
+   *   List of file objects with URI properties pointing to read.
    *
    * @return array
    *   Structured array as produced by a PoMemoryWriter.
@@ -52,7 +52,7 @@ static function filesToArray($langcode, array $files) {
    * Reads the given PO files into the database.
    *
    * @param stdClass $file
-   *   File object with an uri property pointing at the file's path.
+   *   File object with an URI property pointing at the file's path.
    *
    * @param array $options
    *   An array with options that can have the following elements:

core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php

@@ -24,7 +24,7 @@ class LocalePathTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Path language settings',
-      'description' => 'Checks you can configure a language for individual url aliases.',
+      'description' => 'Checks you can configure a language for individual URL aliases.',
       'group' => 'Locale',
     );
   }

core/modules/node/node.module

@@ -281,7 +281,7 @@ function node_field_display_node_alter(&$display, $context) {
 }
 
 /**
- * Entity uri callback.
+ * Entity URI callback.
  *
  * @param Drupal\node\Node $node
  *   A node entity.

core/modules/node/node.tpl.php

@@ -14,7 +14,7 @@
  * - $date: Formatted creation date. Preprocess functions can reformat it by
  *   calling format_date() with the desired parameters on the $created variable.
  * - $name: Themed username of node author output from theme_username().
- * - $node_url: Direct url of the current node.
+ * - $node_url: Direct URL of the current node.
  * - $display_submitted: Whether submission information should be displayed.
  * - $submitted: Submission information created from $name and $date during
  *   template_preprocess_node().