Update Drupal 7 dependencies

2025-09-06 09:01:23 +00:00 · 2025-06-03 10:37:00 -06:00 · 2025-06-03 10:37:00 -06:00 · 13df912654
commit 13df912654
parent 7d902ba1ef
391 changed files with 2900 additions and 1502 deletions
--- a/drupal7/web/modules/simpletest/drupal_web_test_case.php
+++ b/drupal7/web/modules/simpletest/drupal_web_test_case.php
@ -560,23 +560,22 @@ abstract class DrupalTestCase {
          'function' => $class . '->' . $method . '()',
        );
        $completion_check_id = DrupalTestCase::insertAssert($this->testId, $class, FALSE, t('The test did not complete due to a fatal error.'), 'Completion check', $caller);
-        $this->setUp();
-        if ($this->setup) {
-          try {
+        try {
+          $this->setUp();
+          if ($this->setup) {
            $this->$method();
-            // Finish up.
+            $this->tearDown();
          }
-          catch (Throwable $e) {
-            $this->exceptionHandler($e);
+          else {
+            $this->fail(t("The test cannot be executed because it has not been set up properly."));
          }
-          catch (Exception $e) {
-            // Cater for older PHP versions.
-            $this->exceptionHandler($e);
-          }
-          $this->tearDown();
        }
-        else {
-          $this->fail(t("The test cannot be executed because it has not been set up properly."));
+        catch (Throwable $e) {
+          $this->exceptionHandler($e);
+        }
+        catch (Exception $e) {
+          // Cater for older PHP versions.
+          $this->exceptionHandler($e);
        }
        // Remove the completion check record.
        DrupalTestCase::deleteAssert($completion_check_id);
--- a/drupal7/web/modules/simpletest/simpletest.info
+++ b/drupal7/web/modules/simpletest/simpletest.info
@ -58,7 +58,7 @@ files[] = tests/upgrade/update.trigger.test
 files[] = tests/upgrade/update.field.test
 files[] = tests/upgrade/update.user.test

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/simpletest.pages.inc
+++ b/drupal7/web/modules/simpletest/simpletest.pages.inc
@ -443,7 +443,7 @@ function simpletest_settings_form($form, &$form_state) {
  $form['general']['simpletest_clear_results'] = array(
    '#type' => 'checkbox',
    '#title' => t('Clear results after each complete test suite run'),
-    '#description' => t('By default SimpleTest will clear the results after they have been viewed on the results page, but in some cases it may be useful to leave the results in the database. The results can then be viewed at <em>admin/config/development/testing/[test_id]</em>. The test ID can be found in the database, simpletest table, or kept track of when viewing the results the first time. Additionally, some modules may provide more analysis or features that require this setting to be disabled.'),
+    '#description' => t('By default SimpleTest will clear the results after they have been viewed on the results page, but in some cases it may be useful to leave the results in the database. The results can then be viewed at <em>admin/config/development/testing/results/[test_id]</em>. The test ID can be found in the database, simpletest table, or kept track of when viewing the results the first time. Additionally, some modules may provide more analysis or features that require this setting to be disabled.'),
    '#default_value' => variable_get('simpletest_clear_results', TRUE),
  );
  $form['general']['simpletest_verbose'] = array(
--- a/drupal7/web/modules/simpletest/tests/actions_loop_test.info
+++ b/drupal7/web/modules/simpletest/tests/actions_loop_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/ajax.test
+++ b/drupal7/web/modules/simpletest/tests/ajax.test
@ -618,4 +618,16 @@ class AJAXElementValidation extends AJAXTestCase {
    $this->assertNoText(t('Error message'), "No error message in resultant JSON");
    $this->assertText('ajax_forms_test_validation_form_callback invoked', 'The correct callback was invoked');
  }
+
+  /**
+   * Try to open default Ajax callback without passing required data.
+   */
+  function testAJAXPathWithoutData() {
+    $this->drupalGet('system/ajax');
+    $query_parameters = array(
+      ':type' => 'php',
+      ':severity' => WATCHDOG_WARNING,
+    );
+    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND severity = :severity', $query_parameters)->fetchField(), 0, 'No warning message appears in the logs.');
+  }
 }
--- a/drupal7/web/modules/simpletest/tests/ajax_forms_test.info
+++ b/drupal7/web/modules/simpletest/tests/ajax_forms_test.info
@ -5,7 +5,7 @@ package = Testing
 version = VERSION
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/ajax_test.info
+++ b/drupal7/web/modules/simpletest/tests/ajax_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/batch_test.info
+++ b/drupal7/web/modules/simpletest/tests/batch_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/boot_test_1.info
+++ b/drupal7/web/modules/simpletest/tests/boot_test_1.info
@ -5,7 +5,7 @@ package = Testing
 version = VERSION
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/boot_test_2.info
+++ b/drupal7/web/modules/simpletest/tests/boot_test_2.info
@ -5,7 +5,7 @@ package = Testing
 version = VERSION
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/bootstrap.test
+++ b/drupal7/web/modules/simpletest/tests/bootstrap.test
@ -963,3 +963,62 @@ class BootstrapDrupalCacheArrayTestCase extends DrupalWebTestCase {
    $this->assertTrue(is_string($payload2) && (strpos($payload2, 'phpinfo') !== FALSE), 'DrupalCacheArray persisted data to cache_form.');
  }
 }
+
+/**
+ * Test the trusted HTTP host configuration.
+ */
+class BootstrapTrustedHostsTestCase extends DrupalUnitTestCase {
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Trusted HTTP host test',
+      'description' => 'Tests the trusted_host_patterns configuration.',
+      'group' => 'Bootstrap',
+    );
+  }
+
+  /**
+   * Tests hostname validation.
+   *
+   * @see drupal_check_trusted_hosts()
+   */
+  function testTrustedHosts() {
+    $trusted_host_patterns = array(
+      '^example\.com$',
+      '^.+\.example\.com$',
+      '^example\.org',
+      '^.+\.example\.org',
+    );
+
+    foreach ($this->providerTestTrustedHosts() as $data) {
+      $test = array_combine(array('host', 'message', 'expected'), $data);
+      $valid_host = drupal_check_trusted_hosts($test['host'], $trusted_host_patterns);
+      $this->assertEqual($test['expected'], $valid_host, $test['message']);
+    }
+  }
+
+  /**
+   * Provides test data for testTrustedHosts().
+   */
+  public function providerTestTrustedHosts() {
+    $data = array();
+
+    // Tests canonical URL.
+    $data[] = array('www.example.com', 'canonical URL is trusted', TRUE);
+
+    // Tests missing hostname for HTTP/1.0 compatability where the Host
+    // header is optional.
+    $data[] = array(NULL, 'empty Host is valid', TRUE);
+
+    // Tests the additional patterns from the settings.
+    $data[] = array('example.com', 'host from settings is trusted', TRUE);
+    $data[] = array('subdomain.example.com', 'host from settings is trusted', TRUE);
+    $data[] = array('www.example.org', 'host from settings is trusted', TRUE);
+    $data[] = array('example.org', 'host from settings is trusted', TRUE);
+
+    // Tests mismatch.
+    $data[] = array('www.blackhat.com', 'unspecified host is untrusted', FALSE);
+
+    return $data;
+  }
+}
--- a/drupal7/web/modules/simpletest/tests/cache.test
+++ b/drupal7/web/modules/simpletest/tests/cache.test
@ -303,20 +303,6 @@ class CacheClearCase extends CacheTestCase {

    $this->assertTrue($this->checkCacheExists('test_cid_clear3', $this->default_value),
                      'Entry was not cleared from the cache');
-
-    // Set the cache clear threshold to 2 to confirm that the full bin is cleared
-    // when the threshold is exceeded.
-    variable_set('cache_clear_threshold', 2);
-    cache_set('test_cid_clear1', $this->default_value, $this->default_bin);
-    cache_set('test_cid_clear2', $this->default_value, $this->default_bin);
-    $this->assertTrue($this->checkCacheExists('test_cid_clear1', $this->default_value)
-                      && $this->checkCacheExists('test_cid_clear2', $this->default_value),
-                      'Two cache entries were created.');
-    cache_clear_all(array('test_cid_clear1', 'test_cid_clear2', 'test_cid_clear3'), $this->default_bin);
-    $this->assertFalse($this->checkCacheExists('test_cid_clear1', $this->default_value)
-                       || $this->checkCacheExists('test_cid_clear2', $this->default_value)
-                       || $this->checkCacheExists('test_cid_clear3', $this->default_value),
-                       'All cache entries removed when the array exceeded the cache clear threshold.');
  }

  /**
--- a/drupal7/web/modules/simpletest/tests/common_test.info
+++ b/drupal7/web/modules/simpletest/tests/common_test.info
@ -7,7 +7,7 @@ stylesheets[all][] = common_test.css
 stylesheets[print][] = common_test.print.css
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/common_test_cron_helper.info
+++ b/drupal7/web/modules/simpletest/tests/common_test_cron_helper.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/database_test.info
+++ b/drupal7/web/modules/simpletest/tests/database_test.info
@ -5,7 +5,7 @@ package = Testing
 version = VERSION
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info
+++ b/drupal7/web/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info
@ -7,7 +7,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
+++ b/drupal7/web/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
+++ b/drupal7/web/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/entity_cache_test.info
+++ b/drupal7/web/modules/simpletest/tests/entity_cache_test.info
@ -6,7 +6,7 @@ core = 7.x
 dependencies[] = entity_cache_test_dependency
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/entity_cache_test_dependency.info
+++ b/drupal7/web/modules/simpletest/tests/entity_cache_test_dependency.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/entity_crud.test
+++ b/drupal7/web/modules/simpletest/tests/entity_crud.test
@ -58,4 +58,33 @@ class EntityLoadTestCase extends DrupalWebTestCase {
    $nodes_loaded = entity_load('node', array('1.', '2'));
    $this->assertEqual(count($nodes_loaded), 1);
  }
+
+  /**
+   * Tests the controller class loading functionality on non-existing entity
+   * types and on entities without valid controller class.
+   */
+  public function testEntityLoadInvalidControllerClass() {
+    // Ensure that loading a non-existing entity type will throw an
+    // EntityMalformedException.
+    try {
+      entity_load('test', array('1'));
+      $this->fail(t('Cannot load a controller class on non-existing entity type.'));
+    }
+    catch (EntityMalformedException $e) {
+      $this->pass(t('Cannot load a controller class on non-existing entity type.'));
+    }
+
+    // Ensure that loading an entity without valid controller class will throw
+    // an EntityMalformedException.
+    module_enable(array('entity_crud_hook_test'));
+    variable_set('entity_crud_hook_test_alter_controller_class', TRUE);
+    try {
+      entity_load('node', array('1'));
+      $this->fail(t('Cannot load a missing or non-existent controller class.'));
+    }
+    catch (EntityMalformedException $e) {
+      $this->pass(t('Cannot load a missing or non-existent controller class.'));
+    }
+    variable_set('entity_crud_hook_test_alter_controller_class', FALSE);
+  }
 }
--- a/drupal7/web/modules/simpletest/tests/entity_crud_hook_test.info
+++ b/drupal7/web/modules/simpletest/tests/entity_crud_hook_test.info
@ -5,7 +5,7 @@ package = Testing
 version = VERSION
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/entity_crud_hook_test.module
+++ b/drupal7/web/modules/simpletest/tests/entity_crud_hook_test.module
@ -249,3 +249,13 @@ function entity_crud_hook_test_taxonomy_vocabulary_delete() {
 function entity_crud_hook_test_user_delete() {
  $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
+
+/**
+ * Implements hook_entity_info_alter().
+ */
+function entity_crud_hook_test_entity_info_alter(&$entity_info) {
+  if (variable_get('entity_crud_hook_test_alter_controller_class', FALSE)) {
+    // Set the controller class for nodes to NULL.
+    $entity_info['node']['controller class'] = NULL;
+  }
+}
--- a/drupal7/web/modules/simpletest/tests/entity_query_access_test.info
+++ b/drupal7/web/modules/simpletest/tests/entity_query_access_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/error.test
+++ b/drupal7/web/modules/simpletest/tests/error.test
@ -103,6 +103,15 @@ class DrupalErrorHandlerTestCase extends DrupalWebTestCase {
  function assertErrorMessage(array $error) {
    $message = t('%type: !message in %function (line ', $error);
    $this->assertRaw($message, format_string('Found error message: !message.', array('!message' => $message)));
+
+    // Also check that no full path from the error is displayed.
+    $this->assertNoRaw($error['%file'], format_string('Full path from error not displayed: %file.', array('%file' => $error['%file'])));
+
+    // Check that the path was displayed with the DRUPAL_ROOT hidden.
+    $root_length = strlen(DRUPAL_ROOT);
+    $stripped_path = substr($error['%file'], $root_length + 1);
+    $sanitized_path = t('of %path)', array('%path' => $stripped_path));
+    $this->assertRaw($sanitized_path, 'Path in error message was sanitized.');
  }

  /**
@ -111,5 +120,8 @@ class DrupalErrorHandlerTestCase extends DrupalWebTestCase {
  function assertNoErrorMessage(array $error) {
    $message = t('%type: !message in %function (line ', $error);
    $this->assertNoRaw($message, format_string('Did not find error message: !message.', array('!message' => $message)));
+
+    // Also check that no full path from the error is displayed.
+    $this->assertNoRaw($error['%file'], format_string('Full path from error not displayed: %file.', array('%file' => $error['%file'])));
  }
 }
--- a/drupal7/web/modules/simpletest/tests/error_test.info
+++ b/drupal7/web/modules/simpletest/tests/error_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/file.test
+++ b/drupal7/web/modules/simpletest/tests/file.test
@ -2616,11 +2616,16 @@ class FileDownloadTest extends FileTestCase {
    $url  = file_create_url($file->uri);

    // Set file_test access header to allow the download.
+    file_test_reset();
    file_test_set_return('download', array('x-foo' => 'Bar'));
    $this->drupalGet($url);
    $headers = $this->drupalGetHeaders();
    $this->assertEqual($headers['x-foo'], 'Bar', 'Found header set by file_test module on private download.');
    $this->assertResponse(200, 'Correctly allowed access to a file when file_test provides headers.');
+    // Ensure hook_file_download is fired correctly.
+    $hooks_results = file_test_get_all_calls();
+    $file_uri = !empty($hooks_results['download']) ? reset($hooks_results['download'][0]) : '';
+    $this->assertEqual($file->uri, $file_uri);

    // Test that the file transferred correctly.
    $this->assertEqual($contents, $this->content, 'Contents of the file are correct.');
@ -2631,9 +2636,23 @@ class FileDownloadTest extends FileTestCase {
    $this->assertResponse(403, 'Correctly denied access to a file when file_test sets the header to -1.');

    // Try non-existent file.
+    file_test_reset();
    $url = file_create_url('private://' . $this->randomName());
    $this->drupalHead($url);
    $this->assertResponse(404, 'Correctly returned 404 response for a non-existent file.');
+    // Assert that hook_file_download is not called.
+    $hooks_results = file_test_get_all_calls();
+    $hook_download_results = isset($hooks_results['download']) ? $hooks_results['download'] : NULL;
+    $this->assertEqual(array(), $hook_download_results);
+
+    // Try requesting the private file url without a file specified.
+    file_test_reset();
+    $this->drupalGet('system/files');
+    $this->assertResponse(404, 'Correctly returned 404 response for a private file url without a file specified.');
+    // Assert that hook_file_download is not called.
+    $hooks_results = file_test_get_all_calls();
+    $hook_download_results = isset($hooks_results['download']) ? $hooks_results['download'] : NULL;
+    $this->assertEqual(array(), $hook_download_results);
  }

  /**
--- a/drupal7/web/modules/simpletest/tests/file_test.info
+++ b/drupal7/web/modules/simpletest/tests/file_test.info
@ -6,7 +6,7 @@ core = 7.x
 files[] = file_test.module
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/filter_test.info
+++ b/drupal7/web/modules/simpletest/tests/filter_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/form.test
+++ b/drupal7/web/modules/simpletest/tests/form.test
@ -768,6 +768,109 @@ class FormValidationTestCase extends DrupalWebTestCase {
  }
 }

+/**
+ * Tests validation of additional Form API properties.
+ *
+ * Limited to maxlength validation at present.
+ */
+class FormsElementsValidationTestCase extends DrupalWebTestCase {
+  public static function getInfo() {
+    return array(
+      'name' => 'Form element validation - misc',
+      'description' => 'Tests miscellaneous form element validation mechanisms.',
+      'group' => 'Form API',
+    );
+  }
+
+  function setUp() {
+    parent::setUp('form_test');
+  }
+
+  /**
+   * Tests #maxlength validation.
+   */
+  public function testMaxlengthValidation() {
+    $max_length = 5;
+    // The field types that support #maxlength.
+    $form = array(
+      'textfield' => array(
+        '#type' => 'textfield',
+        '#title' => 'Textfield',
+        '#required' => FALSE,
+        '#maxlength' => $max_length,
+      ),
+      'password' => array(
+        '#type' => 'password',
+        '#title' => 'Password',
+        '#maxlength' => $max_length,
+      ),
+    );
+
+    $edit = array(
+      'textfield' => $this->randomString($max_length + 1),
+      'password' => $this->randomString($max_length + 1),
+    );
+    list($processed_form, $form_state, $errors) = $this->formSubmitHelper($form, $edit);
+    $this->assertFalse(empty($errors), 'Form with overly long inputs returned errors.');
+    $this->assertTrue(isset($errors['textfield']) && strpos($errors['textfield'], 'cannot be longer than') !== FALSE, 'Long input error in textfield.');
+    $this->assertTrue(isset($errors['password']) && strpos($errors['password'], 'cannot be longer than') !== FALSE, 'Long input error in password.');
+
+    // This test for NULL inputs cannot be performed using the drupalPost() method.
+    $edit['textfield'] = NULL;
+    $edit['password'] = NULL;
+    list($processed_form, $form_state, $errors) = $this->formSubmitHelper($form, $edit);
+    $this->assertTrue(empty($errors), 'Form with NULL inputs did not return errors.');
+
+    $edit['textfield'] = $this->randomString($max_length);
+    $edit['password'] = $this->randomString($max_length);
+    list($processed_form, $form_state, $errors) = $this->formSubmitHelper($form, $edit);
+    $this->assertTrue(empty($errors), 'Form with maxlength inputs did not return errors.');
+
+  }
+
+  /**
+   * Helper function for the option check test to submit a form while collecting errors.
+   *
+   * Copied from FormsElementsTableSelectFunctionalTest.
+   *
+   * @param $form_element
+   *   A form element to test.
+   * @param $edit
+   *   An array containing post data.
+   *
+   * @return
+   *   An array containing the processed form, the form_state and any errors.
+   */
+  private function formSubmitHelper($form, $edit) {
+    $form_id = $this->randomName();
+    $form_state = form_state_defaults();
+
+    $form['op'] = array('#type' => 'submit', '#value' => t('Submit'));
+
+    $form_state['input'] = $edit;
+    $form_state['input']['form_id'] = $form_id;
+
+    // The form token CSRF protection should not interfere with this test,
+    // so we bypass it by marking this test form as programmed.
+    $form_state['programmed'] = TRUE;
+
+    drupal_prepare_form($form_id, $form, $form_state);
+
+    drupal_process_form($form_id, $form, $form_state);
+
+    $errors = form_get_errors();
+
+    // Clear errors and messages.
+    drupal_get_messages();
+    form_clear_error();
+
+    // Return the processed form together with form_state and errors
+    // to allow the caller lowlevel access to the form.
+    return array($form, $form_state, $errors);
+  }
+
+}
+
 /**
 * Test form element labels, required markers and associated output.
 */
--- a/drupal7/web/modules/simpletest/tests/form_test.info
+++ b/drupal7/web/modules/simpletest/tests/form_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/image_test.info
+++ b/drupal7/web/modules/simpletest/tests/image_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/menu_test.info
+++ b/drupal7/web/modules/simpletest/tests/menu_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/module_test.info
+++ b/drupal7/web/modules/simpletest/tests/module_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/password.test
+++ b/drupal7/web/modules/simpletest/tests/password.test
@ -73,6 +73,7 @@ class PasswordHashingTest extends DrupalWebTestCase {
    $result = user_hash_password($password);
    $this->assertFalse(empty($result), '510 byte long password is allowed.');
    $password .= 'xx';
+    $result = user_hash_password($password);
    $this->assertFalse(empty($result), '512 byte long password is allowed.');
    $password = str_repeat('€', 171);
    $result = user_hash_password($password);
--- a/drupal7/web/modules/simpletest/tests/path_test.info
+++ b/drupal7/web/modules/simpletest/tests/path_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/psr_0_test/psr_0_test.info
+++ b/drupal7/web/modules/simpletest/tests/psr_0_test/psr_0_test.info
@ -5,7 +5,7 @@ core = 7.x
 hidden = TRUE
 package = Testing

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/psr_4_test/psr_4_test.info
+++ b/drupal7/web/modules/simpletest/tests/psr_4_test/psr_4_test.info
@ -5,7 +5,7 @@ core = 7.x
 hidden = TRUE
 package = Testing

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/requirements1_test.info
+++ b/drupal7/web/modules/simpletest/tests/requirements1_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/requirements2_test.info
+++ b/drupal7/web/modules/simpletest/tests/requirements2_test.info
@ -7,7 +7,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/session.test
+++ b/drupal7/web/modules/simpletest/tests/session.test
@ -779,8 +779,10 @@ class SessionHttpsTestCase extends DrupalWebTestCase {
    $form[0]['action'] = $this->httpsUrl('user');
    $this->drupalPost(NULL, $edit, t('Log in'));

-    // Make the secure session cookie blank.
-    curl_setopt($this->curlHandle, CURLOPT_COOKIE, "$secure_session_name=");
+    // Make the secure session cookie blank. Closing the curl handler will stop
+    // the previous session ID from persisting.
+    $this->curlClose();
+    $this->additionalCurlOptions[CURLOPT_COOKIE] = rawurlencode($secure_session_name) . '=;';
    $this->drupalGet($this->httpsUrl('user'));
    $this->assertNoText($admin_user->name, 'User is not logged in as admin');
    $this->assertNoText($standard_user->name, "The user's own name is not displayed because the invalid session cookie has logged them out.");
--- a/drupal7/web/modules/simpletest/tests/session_test.info
+++ b/drupal7/web/modules/simpletest/tests/session_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/system_admin_test.info
+++ b/drupal7/web/modules/simpletest/tests/system_admin_test.info
@ -6,7 +6,7 @@ core = 7.x
 hidden = FALSE
 configure = config/broken

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/system_dependencies_test.info
+++ b/drupal7/web/modules/simpletest/tests/system_dependencies_test.info
@ -6,7 +6,7 @@ core = 7.x
 hidden = TRUE
 dependencies[] = _missing_dependency

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info
+++ b/drupal7/web/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info
@ -6,7 +6,7 @@ core = 7.x
 hidden = TRUE
 dependencies[] = system_incompatible_core_version_test

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/system_incompatible_core_version_test.info
+++ b/drupal7/web/modules/simpletest/tests/system_incompatible_core_version_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 5.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info
+++ b/drupal7/web/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info
@ -7,7 +7,7 @@ hidden = TRUE
 ; system_incompatible_module_version_test declares version 1.0
 dependencies[] = system_incompatible_module_version_test (>2.0)

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/system_incompatible_module_version_test.info
+++ b/drupal7/web/modules/simpletest/tests/system_incompatible_module_version_test.info
@ -5,7 +5,7 @@ version = 1.0
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/system_null_version_test.info
+++ b/drupal7/web/modules/simpletest/tests/system_null_version_test.info
@ -4,7 +4,7 @@ package = Only For Testing
 core = 7.x
 hidden = FALSE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/system_project_namespace_test.info
+++ b/drupal7/web/modules/simpletest/tests/system_project_namespace_test.info
@ -6,7 +6,7 @@ core = 7.x
 hidden = TRUE
 dependencies[] = drupal:filter

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/system_requires_null_version_test.info
+++ b/drupal7/web/modules/simpletest/tests/system_requires_null_version_test.info
@ -6,7 +6,7 @@ version = VERSION
 hidden = FALSE
 dependencies[] = system_null_version_test

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/system_test.info
+++ b/drupal7/web/modules/simpletest/tests/system_test.info
@ -6,7 +6,7 @@ core = 7.x
 files[] = system_test.module
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/taxonomy_nodes_test.info
+++ b/drupal7/web/modules/simpletest/tests/taxonomy_nodes_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/taxonomy_test.info
+++ b/drupal7/web/modules/simpletest/tests/taxonomy_test.info
@ -6,7 +6,7 @@ core = 7.x
 hidden = TRUE
 dependencies[] = taxonomy

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/theme_test.info
+++ b/drupal7/web/modules/simpletest/tests/theme_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
+++ b/drupal7/web/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
@ -6,7 +6,7 @@ hidden = TRUE
 settings[basetheme_only] = base theme value
 settings[subtheme_override] = base theme value

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
+++ b/drupal7/web/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
@ -6,7 +6,7 @@ hidden = TRUE

 settings[subtheme_override] = subtheme value

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/themes/test_theme/test_theme.info
+++ b/drupal7/web/modules/simpletest/tests/themes/test_theme/test_theme.info
@ -17,7 +17,7 @@ stylesheets[all][] = system.base.css

 settings[theme_test_setting] = default value

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/themes/test_theme_nyan_cat/test_theme_nyan_cat.info
+++ b/drupal7/web/modules/simpletest/tests/themes/test_theme_nyan_cat/test_theme_nyan_cat.info
@ -4,7 +4,7 @@ core = 7.x
 hidden = TRUE
 engine = nyan_cat

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/unicode.test
+++ b/drupal7/web/modules/simpletest/tests/unicode.test
@ -118,10 +118,12 @@ class UnicodeUnitTest extends DrupalUnitTestCase {
    $testcase = array(
      'tHe QUIcK bRoWn' => 15,
      'ÜBER-åwesome' => 12,
+      'NULL' => 0,
    );

    foreach ($testcase as $input => $output) {
-      $this->assertEqual(drupal_strlen($input), $output, format_string('%input length is %output', array('%input' => $input, '%output' => $output)));
+      $tested_value = ($input === 'NULL' ? NULL : $input);
+      $this->assertEqual(drupal_strlen($tested_value), $output, format_string('%input length is %output', array('%input' => $input, '%output' => $output)));
    }
  }

--- a/drupal7/web/modules/simpletest/tests/update_script_test.info
+++ b/drupal7/web/modules/simpletest/tests/update_script_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/update_test_1.info
+++ b/drupal7/web/modules/simpletest/tests/update_test_1.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/update_test_2.info
+++ b/drupal7/web/modules/simpletest/tests/update_test_2.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/update_test_3.info
+++ b/drupal7/web/modules/simpletest/tests/update_test_3.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/url_alter_test.info
+++ b/drupal7/web/modules/simpletest/tests/url_alter_test.info
@ -5,7 +5,7 @@ package = Testing
 version = VERSION
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"
--- a/drupal7/web/modules/simpletest/tests/xmlrpc_test.info
+++ b/drupal7/web/modules/simpletest/tests/xmlrpc_test.info
@ -5,7 +5,7 @@ version = VERSION
 core = 7.x
 hidden = TRUE

-; Information added by Drupal.org packaging script on 2024-03-06
-version = "7.100"
+; Information added by Drupal.org packaging script on 2024-12-04
+version = "7.103"
 project = "drupal"
-datestamp = "1709734591"
+datestamp = "1733324608"