From 781b787ddee07d240a2b7eefac2a9bfa935cfeeb Mon Sep 17 00:00:00 2001 From: Jonathan Hunt Date: Fri, 6 May 2022 11:25:25 +1200 Subject: [PATCH] #10 Update Drupal to 7.89 --- docroot/CHANGELOG.txt | 5 + docroot/includes/bootstrap.inc | 4 +- docroot/includes/database/pgsql/database.inc | 3 +- docroot/includes/database/pgsql/query.inc | 4 +- docroot/includes/database/pgsql/schema.inc | 148 ++++++++++++++++-- docroot/modules/aggregator/aggregator.info | 6 +- .../aggregator/tests/aggregator_test.info | 6 +- docroot/modules/block/block.info | 6 +- docroot/modules/block/tests/block_test.info | 6 +- .../block_test_theme/block_test_theme.info | 6 +- docroot/modules/blog/blog.info | 6 +- docroot/modules/book/book.info | 6 +- docroot/modules/color/color.info | 6 +- docroot/modules/comment/comment.info | 6 +- docroot/modules/contact/contact.info | 6 +- docroot/modules/contextual/contextual.info | 6 +- docroot/modules/dashboard/dashboard.info | 6 +- docroot/modules/dblog/dblog.info | 6 +- docroot/modules/field/field.crud.inc | 1 + docroot/modules/field/field.info | 6 +- docroot/modules/field/field.info.class.inc | 2 +- .../field_sql_storage/field_sql_storage.info | 6 +- docroot/modules/field/modules/list/list.info | 6 +- .../field/modules/list/tests/list_test.info | 6 +- .../modules/field/modules/number/number.info | 6 +- .../field/modules/options/options.info | 6 +- docroot/modules/field/modules/text/text.info | 6 +- docroot/modules/field/tests/field_test.info | 6 +- docroot/modules/field_ui/field_ui.info | 6 +- docroot/modules/file/file.field.inc | 2 +- docroot/modules/file/file.info | 6 +- docroot/modules/file/tests/file.test | 49 +++++- .../modules/file/tests/file_module_test.info | 6 +- docroot/modules/filter/filter.info | 6 +- docroot/modules/forum/forum.info | 6 +- docroot/modules/help/help.info | 6 +- docroot/modules/image/image.info | 6 +- .../image/tests/image_module_test.info | 6 +- docroot/modules/locale/locale.info | 6 +- docroot/modules/locale/tests/locale_test.info | 6 +- docroot/modules/menu/menu.info | 6 +- docroot/modules/node/node.info | 6 +- docroot/modules/node/node.test | 13 +- .../modules/node/tests/node_access_test.info | 6 +- docroot/modules/node/tests/node_test.info | 6 +- .../node/tests/node_test_exception.info | 6 +- docroot/modules/openid/openid.info | 6 +- docroot/modules/openid/tests/openid_test.info | 6 +- docroot/modules/overlay/overlay.info | 6 +- docroot/modules/path/path.info | 6 +- docroot/modules/php/php.info | 6 +- docroot/modules/poll/poll.info | 6 +- docroot/modules/poll/poll.test | 2 +- docroot/modules/profile/profile.info | 6 +- docroot/modules/rdf/rdf.info | 6 +- docroot/modules/rdf/tests/rdf_test.info | 6 +- docroot/modules/search/search.info | 6 +- .../search/tests/search_embedded_form.info | 6 +- .../search/tests/search_extra_type.info | 6 +- .../search/tests/search_node_tags.info | 6 +- docroot/modules/shortcut/shortcut.info | 6 +- docroot/modules/simpletest/simpletest.info | 6 +- .../simpletest/tests/actions_loop_test.info | 6 +- .../simpletest/tests/ajax_forms_test.info | 6 +- .../modules/simpletest/tests/ajax_test.info | 6 +- .../modules/simpletest/tests/batch_test.info | 6 +- .../modules/simpletest/tests/boot_test_1.info | 6 +- .../modules/simpletest/tests/boot_test_2.info | 6 +- docroot/modules/simpletest/tests/common.test | 5 + .../modules/simpletest/tests/common_test.info | 6 +- .../tests/common_test_cron_helper.info | 6 +- .../simpletest/tests/database_test.info | 6 +- .../simpletest/tests/database_test.test | 45 +++++- .../drupal_autoload_test.info | 6 +- ...drupal_system_listing_compatible_test.info | 6 +- ...upal_system_listing_incompatible_test.info | 6 +- .../simpletest/tests/entity_cache_test.info | 6 +- .../tests/entity_cache_test_dependency.info | 6 +- .../tests/entity_crud_hook_test.info | 6 +- .../tests/entity_query_access_test.info | 6 +- .../modules/simpletest/tests/error_test.info | 6 +- .../modules/simpletest/tests/file_test.info | 6 +- .../modules/simpletest/tests/filter_test.info | 6 +- .../modules/simpletest/tests/form_test.info | 6 +- .../modules/simpletest/tests/image_test.info | 6 +- .../modules/simpletest/tests/menu_test.info | 6 +- docroot/modules/simpletest/tests/module.test | 12 ++ .../modules/simpletest/tests/module_test.info | 6 +- .../modules/simpletest/tests/path_test.info | 6 +- .../tests/psr_0_test/psr_0_test.info | 6 +- .../tests/psr_4_test/psr_4_test.info | 6 +- .../simpletest/tests/requirements1_test.info | 6 +- .../simpletest/tests/requirements2_test.info | 6 +- .../simpletest/tests/session_test.info | 6 +- .../tests/system_dependencies_test.info | 6 +- ...atible_core_version_dependencies_test.info | 6 +- ...system_incompatible_core_version_test.info | 6 +- ...ible_module_version_dependencies_test.info | 6 +- ...stem_incompatible_module_version_test.info | 6 +- .../tests/system_null_version_test.info | 10 ++ .../tests/system_null_version_test.module | 1 + .../tests/system_project_namespace_test.info | 6 +- .../system_requires_null_version_test.info | 12 ++ .../system_requires_null_version_test.module | 1 + .../modules/simpletest/tests/system_test.info | 6 +- .../simpletest/tests/taxonomy_test.info | 6 +- .../modules/simpletest/tests/theme_test.info | 6 +- .../themes/test_basetheme/test_basetheme.info | 6 +- .../themes/test_subtheme/test_subtheme.info | 6 +- .../tests/themes/test_theme/test_theme.info | 6 +- .../test_theme_nyan_cat.info | 6 +- .../simpletest/tests/update_script_test.info | 6 +- .../simpletest/tests/update_test_1.info | 6 +- .../simpletest/tests/update_test_2.info | 6 +- .../simpletest/tests/update_test_3.info | 6 +- .../tests/upgrade/update.aggregator.test | 1 + .../tests/upgrade/upgrade.comment.test | 3 + .../tests/upgrade/upgrade.filter.test | 3 + .../tests/upgrade/upgrade.forum.test | 3 + .../tests/upgrade/upgrade.locale.test | 12 ++ .../tests/upgrade/upgrade.menu.test | 3 + .../tests/upgrade/upgrade.node.test | 9 ++ .../tests/upgrade/upgrade.poll.test | 3 + .../tests/upgrade/upgrade.taxonomy.test | 3 + .../simpletest/tests/upgrade/upgrade.test | 26 ++- .../tests/upgrade/upgrade.translatable.test | 3 + .../tests/upgrade/upgrade.trigger.test | 3 + .../tests/upgrade/upgrade.upload.test | 3 + .../tests/upgrade/upgrade.user.test | 9 ++ .../simpletest/tests/url_alter_test.info | 6 +- .../modules/simpletest/tests/xmlrpc_test.info | 6 +- docroot/modules/statistics/statistics.info | 6 +- docroot/modules/syslog/syslog.info | 6 +- docroot/modules/system/system.admin.inc | 2 +- docroot/modules/system/system.info | 6 +- docroot/modules/system/system.install | 2 +- .../modules/system/tests/cron_queue_test.info | 6 +- .../system/tests/system_cron_test.info | 6 +- docroot/modules/taxonomy/taxonomy.info | 6 +- docroot/modules/toolbar/toolbar.info | 6 +- docroot/modules/tracker/tracker.info | 6 +- .../translation/tests/translation_test.info | 6 +- docroot/modules/translation/translation.info | 6 +- .../modules/trigger/tests/trigger_test.info | 6 +- docroot/modules/trigger/trigger.info | 6 +- .../modules/update/tests/aaa_update_test.info | 6 +- .../modules/update/tests/bbb_update_test.info | 6 +- .../modules/update/tests/ccc_update_test.info | 6 +- .../update_test_admintheme.info | 6 +- .../update_test_basetheme.info | 6 +- .../update_test_subtheme.info | 6 +- docroot/modules/update/tests/update_test.info | 6 +- docroot/modules/update/update.info | 6 +- .../modules/user/tests/user_flood_test.info | 6 +- .../modules/user/tests/user_form_test.info | 6 +- .../modules/user/tests/user_session_test.info | 6 +- docroot/modules/user/user.info | 6 +- docroot/modules/user/user.install | 26 ++- docroot/profiles/minimal/minimal.info | 6 +- docroot/profiles/standard/standard.info | 6 +- ...drupal_system_listing_compatible_test.info | 6 +- ...upal_system_listing_incompatible_test.info | 6 +- docroot/profiles/testing/testing.info | 6 +- docroot/themes/bartik/bartik.info | 6 +- docroot/themes/garland/garland.info | 6 +- docroot/themes/seven/seven.info | 6 +- docroot/themes/stark/stark.info | 6 +- 167 files changed, 784 insertions(+), 441 deletions(-) create mode 100644 docroot/modules/simpletest/tests/system_null_version_test.info create mode 100644 docroot/modules/simpletest/tests/system_null_version_test.module create mode 100644 docroot/modules/simpletest/tests/system_requires_null_version_test.info create mode 100644 docroot/modules/simpletest/tests/system_requires_null_version_test.module diff --git a/docroot/CHANGELOG.txt b/docroot/CHANGELOG.txt index 5d4edb5a..34e45a3b 100644 --- a/docroot/CHANGELOG.txt +++ b/docroot/CHANGELOG.txt @@ -1,3 +1,8 @@ +Drupal 7.89, 2022-03-02 +----------------------- +- Bug fixes for PHP 8.1 +- Fix tests for PostgreSQL + Drupal 7.88, 2022-02-15 ----------------------- - Fixed security issues: diff --git a/docroot/includes/bootstrap.inc b/docroot/includes/bootstrap.inc index b9301291..14168353 100644 --- a/docroot/includes/bootstrap.inc +++ b/docroot/includes/bootstrap.inc @@ -8,7 +8,7 @@ /** * The current system version. */ -define('VERSION', '7.88'); +define('VERSION', '7.89'); /** * Core API compatibility. @@ -1905,7 +1905,7 @@ function format_string($string, array $args = array()) { * @ingroup sanitization */ function check_plain($text) { - return htmlspecialchars($text, ENT_QUOTES, 'UTF-8'); + return htmlspecialchars((string) $text, ENT_QUOTES, 'UTF-8'); } /** diff --git a/docroot/includes/database/pgsql/database.inc b/docroot/includes/database/pgsql/database.inc index 96ffc1d3..7aa69a92 100644 --- a/docroot/includes/database/pgsql/database.inc +++ b/docroot/includes/database/pgsql/database.inc @@ -117,7 +117,8 @@ class DatabaseConnection_pgsql extends DatabaseConnection { case Database::RETURN_AFFECTED: return $stmt->rowCount(); case Database::RETURN_INSERT_ID: - return $this->connection->lastInsertId($options['sequence_name']); + $sequence_name = isset($options['sequence_name']) ? $options['sequence_name'] : NULL; + return $this->connection->lastInsertId($sequence_name); case Database::RETURN_NULL: return; default: diff --git a/docroot/includes/database/pgsql/query.inc b/docroot/includes/database/pgsql/query.inc index 9902b164..e2d587d5 100644 --- a/docroot/includes/database/pgsql/query.inc +++ b/docroot/includes/database/pgsql/query.inc @@ -30,7 +30,7 @@ class InsertQuery_pgsql extends InsertQuery { foreach ($this->insertFields as $idx => $field) { if (isset($table_information->blob_fields[$field])) { $blobs[$blob_count] = fopen('php://memory', 'a'); - fwrite($blobs[$blob_count], $insert_values[$idx]); + fwrite($blobs[$blob_count], (string) $insert_values[$idx]); rewind($blobs[$blob_count]); $stmt->bindParam(':db_insert_placeholder_' . $max_placeholder++, $blobs[$blob_count], PDO::PARAM_LOB); @@ -182,7 +182,7 @@ class UpdateQuery_pgsql extends UpdateQuery { if (isset($table_information->blob_fields[$field])) { $blobs[$blob_count] = fopen('php://memory', 'a'); - fwrite($blobs[$blob_count], $value); + fwrite($blobs[$blob_count], (string) $value); rewind($blobs[$blob_count]); $stmt->bindParam($placeholder, $blobs[$blob_count], PDO::PARAM_LOB); ++$blob_count; diff --git a/docroot/includes/database/pgsql/schema.inc b/docroot/includes/database/pgsql/schema.inc index f5774de1..db8266f8 100644 --- a/docroot/includes/database/pgsql/schema.inc +++ b/docroot/includes/database/pgsql/schema.inc @@ -23,6 +23,64 @@ class DatabaseSchema_pgsql extends DatabaseSchema { */ protected $tableInformation = array(); + /** + * The maximum allowed length for index, primary key and constraint names. + * + * Value will usually be set to a 63 chars limit but PostgreSQL allows + * to higher this value before compiling, so we need to check for that. + * + * @var int + */ + protected $maxIdentifierLength; + + /** + * Make sure to limit identifiers according to PostgreSQL compiled in length. + * + * PostgreSQL allows in standard configuration identifiers no longer than 63 + * chars for table/relation names, indexes, primary keys, and constraints. So + * we map all identifiers that are too long to drupal_base64hash_tag, where + * tag is one of: + * - idx for indexes + * - key for constraints + * - pkey for primary keys + * - seq for sequences + * + * @param string $table_identifier_part + * The first argument used to build the identifier string. This usually + * refers to a table/relation name. + * @param string $column_identifier_part + * The second argument used to build the identifier string. This usually + * refers to one or more column names. + * @param string $tag + * The identifier tag. It can be one of 'idx', 'key', 'pkey' or 'seq'. + * + * @return string + * The index/constraint/pkey identifier. + */ + protected function ensureIdentifiersLength($table_identifier_part, $column_identifier_part, $tag) { + $info = $this->getPrefixInfo($table_identifier_part); + $table_identifier_part = $info['table']; + + // Filters out potentially empty $column_identifier_part to ensure + // compatibility with old naming convention (see prefixNonTable()). + $identifiers = array_filter(array($table_identifier_part, $column_identifier_part, $tag)); + $identifierName = implode('_', $identifiers); + + // Retrieve the max identifier length which is usually 63 characters + // but can be altered before PostgreSQL is compiled so we need to check. + if (empty($this->maxIdentifierLength)) { + $this->maxIdentifierLength = $this->connection->query("SHOW max_identifier_length")->fetchField(); + } + + if (strlen($identifierName) > $this->maxIdentifierLength) { + $saveIdentifier = 'drupal_' . $this->hashBase64($identifierName) . '_' . $tag; + } + else { + $saveIdentifier = $identifierName; + } + return $saveIdentifier; + } + /** * Fetch the list of blobs and sequences used on a table. * @@ -124,11 +182,11 @@ class DatabaseSchema_pgsql extends DatabaseSchema { $sql_keys = array(); if (isset($table['primary key']) && is_array($table['primary key'])) { - $sql_keys[] = 'PRIMARY KEY (' . implode(', ', $table['primary key']) . ')'; + $sql_keys[] = 'CONSTRAINT ' . $this->ensureIdentifiersLength($name, '', 'pkey') . ' PRIMARY KEY (' . implode(', ', $table['primary key']) . ')'; } if (isset($table['unique keys']) && is_array($table['unique keys'])) { foreach ($table['unique keys'] as $key_name => $key) { - $sql_keys[] = 'CONSTRAINT ' . $this->prefixNonTable($name, $key_name, 'key') . ' UNIQUE (' . implode(', ', $key) . ')'; + $sql_keys[] = 'CONSTRAINT ' . $this->ensureIdentifiersLength($name, $key_name, 'key') . ' UNIQUE (' . implode(', ', $key) . ')'; } } @@ -328,10 +386,31 @@ class DatabaseSchema_pgsql extends DatabaseSchema { // rename them when renaming the table. $indexes = $this->connection->query('SELECT indexname FROM pg_indexes WHERE schemaname = :schema AND tablename = :table', array(':schema' => $old_schema, ':table' => $old_table_name)); foreach ($indexes as $index) { - if (preg_match('/^' . preg_quote($old_full_name) . '_(.*)$/', $index->indexname, $matches)) { + // Get the index type by suffix, e.g. idx/key/pkey + $index_type = substr($index->indexname, strrpos($index->indexname, '_') + 1); + + // If the index is already rewritten by ensureIdentifiersLength() to not + // exceed the 63 chars limit of PostgreSQL, we need to take care of that. + // Example (drupal_Gk7Su_T1jcBHVuvSPeP22_I3Ni4GrVEgTYlIYnBJkro_idx). + if (strpos($index->indexname, 'drupal_') !== FALSE) { + preg_match('/^drupal_(.*)_' . preg_quote($index_type) . '/', $index->indexname, $matches); $index_name = $matches[1]; - $this->connection->query('ALTER INDEX ' . $index->indexname . ' RENAME TO {' . $new_name . '}_' . $index_name); } + else { + if ($index_type == 'pkey') { + // Primary keys do not have a specific name in D7. + $index_name = ''; + } + else { + // Make sure to remove the suffix from index names, because + // ensureIdentifiersLength() will add the suffix again and thus + // would result in a wrong index name. + preg_match('/^' . preg_quote($old_full_name) . '_(.*)_' . preg_quote($index_type) . '/', $index->indexname, $matches); + $index_name = $matches[1]; + } + } + + $this->connection->query('ALTER INDEX ' . $index->indexname . ' RENAME TO ' . $this->ensureIdentifiersLength($new_name, $index_name, $index_type)); } // Now rename the table. @@ -415,8 +494,8 @@ class DatabaseSchema_pgsql extends DatabaseSchema { } public function indexExists($table, $name) { - // Details http://www.postgresql.org/docs/8.3/interactive/view-pg-indexes.html - $index_name = '{' . $table . '}_' . $name . '_idx'; + // Details https://www.postgresql.org/docs/10/view-pg-indexes.html + $index_name = $this->ensureIdentifiersLength($table, $name, 'idx'); return (bool) $this->connection->query("SELECT 1 FROM pg_indexes WHERE indexname = '$index_name'")->fetchField(); } @@ -429,7 +508,18 @@ class DatabaseSchema_pgsql extends DatabaseSchema { * The name of the constraint (typically 'pkey' or '[constraint]_key'). */ protected function constraintExists($table, $name) { - $constraint_name = '{' . $table . '}_' . $name; + // ensureIdentifiersLength() expects three parameters, thus we split our + // constraint name in a proper name and a suffix. + if ($name == 'pkey') { + $suffix = $name; + $name = ''; + } + else { + $pos = strrpos($name, '_'); + $suffix = substr($name, $pos + 1); + $name = substr($name, 0, $pos); + } + $constraint_name = $this->ensureIdentifiersLength($table, $name, $suffix); return (bool) $this->connection->query("SELECT 1 FROM pg_constraint WHERE conname = '$constraint_name'")->fetchField(); } @@ -441,7 +531,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema { throw new DatabaseSchemaObjectExistsException(t("Cannot add primary key to table @table: primary key already exists.", array('@table' => $table))); } - $this->connection->query('ALTER TABLE {' . $table . '} ADD PRIMARY KEY (' . implode(',', $fields) . ')'); + $this->connection->query('ALTER TABLE {' . $table . '} ADD CONSTRAINT ' . $this->ensureIdentifiersLength($table, '', 'pkey') . ' PRIMARY KEY (' . implode(',', $fields) . ')'); } public function dropPrimaryKey($table) { @@ -449,7 +539,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema { return FALSE; } - $this->connection->query('ALTER TABLE {' . $table . '} DROP CONSTRAINT ' . $this->prefixNonTable($table, 'pkey')); + $this->connection->query('ALTER TABLE {' . $table . '} DROP CONSTRAINT ' . $this->ensureIdentifiersLength($table, '', 'pkey')); return TRUE; } @@ -461,7 +551,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema { throw new DatabaseSchemaObjectExistsException(t("Cannot add unique key @name to table @table: unique key already exists.", array('@table' => $table, '@name' => $name))); } - $this->connection->query('ALTER TABLE {' . $table . '} ADD CONSTRAINT "' . $this->prefixNonTable($table, $name, 'key') . '" UNIQUE (' . implode(',', $fields) . ')'); + $this->connection->query('ALTER TABLE {' . $table . '} ADD CONSTRAINT "' . $this->ensureIdentifiersLength($table, $name, 'key') . '" UNIQUE (' . implode(',', $fields) . ')'); } public function dropUniqueKey($table, $name) { @@ -469,7 +559,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema { return FALSE; } - $this->connection->query('ALTER TABLE {' . $table . '} DROP CONSTRAINT "' . $this->prefixNonTable($table, $name, 'key') . '"'); + $this->connection->query('ALTER TABLE {' . $table . '} DROP CONSTRAINT "' . $this->ensureIdentifiersLength($table, $name, 'key') . '"'); return TRUE; } @@ -489,7 +579,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema { return FALSE; } - $this->connection->query('DROP INDEX ' . $this->prefixNonTable($table, $name, 'idx')); + $this->connection->query('DROP INDEX ' . $this->ensureIdentifiersLength($table, $name, 'idx')); return TRUE; } @@ -580,7 +670,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema { } protected function _createIndexSql($table, $name, $fields) { - $query = 'CREATE INDEX "' . $this->prefixNonTable($table, $name, 'idx') . '" ON {' . $table . '} ('; + $query = 'CREATE INDEX "' . $this->ensureIdentifiersLength($table, $name, 'idx') . '" ON {' . $table . '} ('; $query .= $this->_createKeySql($fields) . ')'; return $query; } @@ -614,4 +704,36 @@ class DatabaseSchema_pgsql extends DatabaseSchema { return $this->connection->query('SELECT obj_description(oid, ?) FROM pg_class WHERE relname = ?', array('pg_class', $info['table']))->fetchField(); } } + + /** + * Calculates a base-64 encoded, PostgreSQL-safe sha-256 hash per PostgreSQL + * documentation: 4.1. Lexical Structure. + * + * @param $data + * String to be hashed. + * + * @return string + * A base-64 encoded sha-256 hash, with + and / replaced with _ and any = + * padding characters removed. + */ + protected function hashBase64($data) { + // Ensure lowercase as D7's pgsql driver does not quote identifiers + // consistently, and they are therefore folded to lowercase by PostgreSQL. + $hash = strtolower(base64_encode(hash('sha256', $data, TRUE))); + // Modify the hash so it's safe to use in PostgreSQL identifiers. + return strtr($hash, array('+' => '_', '/' => '_', '=' => '')); + } + + /** + * Build a condition to match a table name against a standard information_schema. + * + * In PostgreSQL "unquoted names are always folded to lower case." The pgsql + * driver does not quote table names, so they are therefore always lowercase. + * + * @see https://www.postgresql.org/docs/14/sql-syntax-lexical.html + */ + protected function buildTableNameCondition($table_name, $operator = '=', $add_prefix = TRUE) { + return parent::buildTableNameCondition(strtolower($table_name), $operator, $add_prefix); + } + } diff --git a/docroot/modules/aggregator/aggregator.info b/docroot/modules/aggregator/aggregator.info index a48bfa99..b88723f3 100644 --- a/docroot/modules/aggregator/aggregator.info +++ b/docroot/modules/aggregator/aggregator.info @@ -7,7 +7,7 @@ files[] = aggregator.test configure = admin/config/services/aggregator/settings stylesheets[all][] = aggregator.css -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/aggregator/tests/aggregator_test.info b/docroot/modules/aggregator/tests/aggregator_test.info index fe2c7d9d..604dcd99 100644 --- a/docroot/modules/aggregator/tests/aggregator_test.info +++ b/docroot/modules/aggregator/tests/aggregator_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/block/block.info b/docroot/modules/block/block.info index 9fd2569c..facd7575 100644 --- a/docroot/modules/block/block.info +++ b/docroot/modules/block/block.info @@ -6,7 +6,7 @@ core = 7.x files[] = block.test configure = admin/structure/block -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/block/tests/block_test.info b/docroot/modules/block/tests/block_test.info index 852632d8..a0b63661 100644 --- a/docroot/modules/block/tests/block_test.info +++ b/docroot/modules/block/tests/block_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/block/tests/themes/block_test_theme/block_test_theme.info b/docroot/modules/block/tests/themes/block_test_theme/block_test_theme.info index 42bd91b2..d06b4daa 100644 --- a/docroot/modules/block/tests/themes/block_test_theme/block_test_theme.info +++ b/docroot/modules/block/tests/themes/block_test_theme/block_test_theme.info @@ -13,7 +13,7 @@ regions[footer] = Footer regions[highlighted] = Highlighted regions[help] = Help -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/blog/blog.info b/docroot/modules/blog/blog.info index 05d8413e..47b7737f 100644 --- a/docroot/modules/blog/blog.info +++ b/docroot/modules/blog/blog.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x files[] = blog.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/book/book.info b/docroot/modules/book/book.info index 24c73e02..8ea95f5b 100644 --- a/docroot/modules/book/book.info +++ b/docroot/modules/book/book.info @@ -7,7 +7,7 @@ files[] = book.test configure = admin/content/book/settings stylesheets[all][] = book.css -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/color/color.info b/docroot/modules/color/color.info index 9ad03767..db77ad43 100644 --- a/docroot/modules/color/color.info +++ b/docroot/modules/color/color.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x files[] = color.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/comment/comment.info b/docroot/modules/comment/comment.info index 99d7746b..18167c51 100644 --- a/docroot/modules/comment/comment.info +++ b/docroot/modules/comment/comment.info @@ -9,7 +9,7 @@ files[] = comment.test configure = admin/content/comment stylesheets[all][] = comment.css -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/contact/contact.info b/docroot/modules/contact/contact.info index 1910bd1b..2a599e4e 100644 --- a/docroot/modules/contact/contact.info +++ b/docroot/modules/contact/contact.info @@ -6,7 +6,7 @@ core = 7.x files[] = contact.test configure = admin/structure/contact -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/contextual/contextual.info b/docroot/modules/contextual/contextual.info index 8f694a2a..32072469 100644 --- a/docroot/modules/contextual/contextual.info +++ b/docroot/modules/contextual/contextual.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x files[] = contextual.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/dashboard/dashboard.info b/docroot/modules/dashboard/dashboard.info index d0d446ec..e68a91f1 100644 --- a/docroot/modules/dashboard/dashboard.info +++ b/docroot/modules/dashboard/dashboard.info @@ -7,7 +7,7 @@ files[] = dashboard.test dependencies[] = block configure = admin/dashboard/customize -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/dblog/dblog.info b/docroot/modules/dblog/dblog.info index 4acbaf4c..b2808da2 100644 --- a/docroot/modules/dblog/dblog.info +++ b/docroot/modules/dblog/dblog.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x files[] = dblog.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/field/field.crud.inc b/docroot/modules/field/field.crud.inc index 7c0e3a15..3673128d 100644 --- a/docroot/modules/field/field.crud.inc +++ b/docroot/modules/field/field.crud.inc @@ -733,6 +733,7 @@ function field_read_instances($params = array(), $include_additional = array()) } $instances = array(); + $query->orderBy('fci.id'); $results = $query->execute(); foreach ($results as $record) { diff --git a/docroot/modules/field/field.info b/docroot/modules/field/field.info index 2e1de456..7a1254ac 100644 --- a/docroot/modules/field/field.info +++ b/docroot/modules/field/field.info @@ -11,7 +11,7 @@ dependencies[] = field_sql_storage required = TRUE stylesheets[all][] = theme/field.css -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/field/field.info.class.inc b/docroot/modules/field/field.info.class.inc index 772cd451..03dad677 100644 --- a/docroot/modules/field/field.info.class.inc +++ b/docroot/modules/field/field.info.class.inc @@ -138,7 +138,7 @@ class FieldInfo { $map = array(); - $query = db_query('SELECT fc.type, fci.field_name, fci.entity_type, fci.bundle FROM {field_config_instance} fci INNER JOIN {field_config} fc ON fc.id = fci.field_id WHERE fc.active = 1 AND fc.storage_active = 1 AND fc.deleted = 0 AND fci.deleted = 0'); + $query = db_query('SELECT fc.type, fci.field_name, fci.entity_type, fci.bundle FROM {field_config_instance} fci INNER JOIN {field_config} fc ON fc.id = fci.field_id WHERE fc.active = 1 AND fc.storage_active = 1 AND fc.deleted = 0 AND fci.deleted = 0 ORDER BY bundle, entity_type'); foreach ($query as $row) { $map[$row->field_name]['bundles'][$row->entity_type][] = $row->bundle; $map[$row->field_name]['type'] = $row->type; diff --git a/docroot/modules/field/modules/field_sql_storage/field_sql_storage.info b/docroot/modules/field/modules/field_sql_storage/field_sql_storage.info index 71e50cc1..339452f5 100644 --- a/docroot/modules/field/modules/field_sql_storage/field_sql_storage.info +++ b/docroot/modules/field/modules/field_sql_storage/field_sql_storage.info @@ -7,7 +7,7 @@ dependencies[] = field files[] = field_sql_storage.test required = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/field/modules/list/list.info b/docroot/modules/field/modules/list/list.info index b5cf9d50..b839984c 100644 --- a/docroot/modules/field/modules/list/list.info +++ b/docroot/modules/field/modules/list/list.info @@ -7,7 +7,7 @@ dependencies[] = field dependencies[] = options files[] = tests/list.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/field/modules/list/tests/list_test.info b/docroot/modules/field/modules/list/tests/list_test.info index 9e11e016..62a440d3 100644 --- a/docroot/modules/field/modules/list/tests/list_test.info +++ b/docroot/modules/field/modules/list/tests/list_test.info @@ -5,7 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/field/modules/number/number.info b/docroot/modules/field/modules/number/number.info index 6706715d..4f9039b8 100644 --- a/docroot/modules/field/modules/number/number.info +++ b/docroot/modules/field/modules/number/number.info @@ -6,7 +6,7 @@ core = 7.x dependencies[] = field files[] = number.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/field/modules/options/options.info b/docroot/modules/field/modules/options/options.info index c98fd445..56c4df08 100644 --- a/docroot/modules/field/modules/options/options.info +++ b/docroot/modules/field/modules/options/options.info @@ -6,7 +6,7 @@ core = 7.x dependencies[] = field files[] = options.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/field/modules/text/text.info b/docroot/modules/field/modules/text/text.info index 99f7a33b..81247f0b 100644 --- a/docroot/modules/field/modules/text/text.info +++ b/docroot/modules/field/modules/text/text.info @@ -7,7 +7,7 @@ dependencies[] = field files[] = text.test required = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/field/tests/field_test.info b/docroot/modules/field/tests/field_test.info index 41c49ef2..4684e0fc 100644 --- a/docroot/modules/field/tests/field_test.info +++ b/docroot/modules/field/tests/field_test.info @@ -6,7 +6,7 @@ files[] = field_test.entity.inc version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/field_ui/field_ui.info b/docroot/modules/field_ui/field_ui.info index e45642dd..4cf815ce 100644 --- a/docroot/modules/field_ui/field_ui.info +++ b/docroot/modules/field_ui/field_ui.info @@ -6,7 +6,7 @@ core = 7.x dependencies[] = field files[] = field_ui.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/file/file.field.inc b/docroot/modules/file/file.field.inc index 97303162..0ce6c172 100644 --- a/docroot/modules/file/file.field.inc +++ b/docroot/modules/file/file.field.inc @@ -943,7 +943,7 @@ function theme_file_upload_help($variables) { $descriptions = array(); - if (strlen($description)) { + if (!empty($description)) { $descriptions[] = $description; } if (isset($upload_validators['file_validate_size'])) { diff --git a/docroot/modules/file/file.info b/docroot/modules/file/file.info index 31dfd76b..097fe111 100644 --- a/docroot/modules/file/file.info +++ b/docroot/modules/file/file.info @@ -6,7 +6,7 @@ core = 7.x dependencies[] = field files[] = tests/file.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/file/tests/file.test b/docroot/modules/file/tests/file.test index 3f9c6de8..cd2271fb 100644 --- a/docroot/modules/file/tests/file.test +++ b/docroot/modules/file/tests/file.test @@ -749,6 +749,23 @@ class FileFieldWidgetTestCase extends FileFieldTestCase { foreach (array($field_name2, $field_name) as $each_field_name) { for ($delta = 0; $delta < 3; $delta++) { $edit = array('files[' . $each_field_name . '_' . LANGUAGE_NONE . '_' . $delta . ']' => drupal_realpath($test_file->uri)); + // drupalPost() takes a $submit parameter that is the value of the + // button whose click we want to emulate. Since we have multiple + // buttons with the value "Upload", and want to control which one we + // use, we change the value of the other ones to something else. + // Since non-clicked buttons aren't included in the submitted POST + // data, and since drupalPost() will result in $this being updated + // with a newly rebuilt form, this doesn't cause problems. Note that + // $buttons is an array of SimpleXMLElement objects passed by + // reference so modifications to each button will affect + // \DrupalWebTestCase::handleForm(). + $buttons = $this->xpath('//input[@type="submit" and @value="Upload"]'); + $button_name = $each_field_name . '_' . LANGUAGE_NONE . '_' . $delta . '_upload_button'; + foreach ($buttons as $button) { + if ($button['name'] != $button_name) { + $button['value'] = 'DUMMY'; + } + } // If the Upload button doesn't exist, drupalPost() will automatically // fail with an assertion message. $this->drupalPost(NULL, $edit, t('Upload')); @@ -786,13 +803,8 @@ class FileFieldWidgetTestCase extends FileFieldTestCase { $button_name = $current_field_name . '_' . LANGUAGE_NONE . '_' . $delta . '_remove_button'; switch ($type) { case 'nojs': - // drupalPost() takes a $submit parameter that is the value of the - // button whose click we want to emulate. Since we have multiple - // buttons with the value "Remove", and want to control which one we - // use, we change the value of the other ones to something else. - // Since non-clicked buttons aren't included in the submitted POST - // data, and since drupalPost() will result in $this being updated - // with a newly rebuilt form, this doesn't cause problems. + // Same workaround for multiple buttons with the value "Remove" as + // we did for the "Upload" buttons above. foreach ($buttons as $button) { if ($button['name'] != $button_name) { $button['value'] = 'DUMMY'; @@ -1933,3 +1945,26 @@ class FileScanDirectory extends FileFieldTestCase { } } + +/** + * Test theme implementations declared in file_theme(). + */ +class FileThemeImplementationsTestCase extends DrupalUnitTestCase { + + public static function getInfo() { + return array( + 'name' => 'Theme implementations declared in file_theme()', + 'description' => 'Unit tests theme functions in the file module.', + 'group' => 'File', + ); + } + + function testThemeFileUploadHelp() { + $variables = array( + 'description' => NULL, + 'upload_validators' => NULL, + ); + $this->assertEqual('', theme_file_upload_help($variables), 'Empty string returned by theme_file_upload_help() with NULL inputs.'); + } + +} diff --git a/docroot/modules/file/tests/file_module_test.info b/docroot/modules/file/tests/file_module_test.info index 9e9c94d4..6a4ca690 100644 --- a/docroot/modules/file/tests/file_module_test.info +++ b/docroot/modules/file/tests/file_module_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/filter/filter.info b/docroot/modules/filter/filter.info index 3d219aee..4a833629 100644 --- a/docroot/modules/filter/filter.info +++ b/docroot/modules/filter/filter.info @@ -7,7 +7,7 @@ files[] = filter.test required = TRUE configure = admin/config/content/formats -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/forum/forum.info b/docroot/modules/forum/forum.info index 9ca6ba5c..0f87116b 100644 --- a/docroot/modules/forum/forum.info +++ b/docroot/modules/forum/forum.info @@ -9,7 +9,7 @@ files[] = forum.test configure = admin/structure/forum stylesheets[all][] = forum.css -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/help/help.info b/docroot/modules/help/help.info index c5963231..67370b90 100644 --- a/docroot/modules/help/help.info +++ b/docroot/modules/help/help.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x files[] = help.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/image/image.info b/docroot/modules/image/image.info index 960338aa..39bf14d8 100644 --- a/docroot/modules/image/image.info +++ b/docroot/modules/image/image.info @@ -7,7 +7,7 @@ dependencies[] = file files[] = image.test configure = admin/config/media/image-styles -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/image/tests/image_module_test.info b/docroot/modules/image/tests/image_module_test.info index 3d2a8429..ddcf9de5 100644 --- a/docroot/modules/image/tests/image_module_test.info +++ b/docroot/modules/image/tests/image_module_test.info @@ -6,7 +6,7 @@ core = 7.x files[] = image_module_test.module hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/locale/locale.info b/docroot/modules/locale/locale.info index 38aca7df..7cbe44e1 100644 --- a/docroot/modules/locale/locale.info +++ b/docroot/modules/locale/locale.info @@ -6,7 +6,7 @@ core = 7.x files[] = locale.test configure = admin/config/regional/language -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/locale/tests/locale_test.info b/docroot/modules/locale/tests/locale_test.info index 5121ff28..2b4ef8c8 100644 --- a/docroot/modules/locale/tests/locale_test.info +++ b/docroot/modules/locale/tests/locale_test.info @@ -5,7 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/menu/menu.info b/docroot/modules/menu/menu.info index fbef0d99..a66bcce3 100644 --- a/docroot/modules/menu/menu.info +++ b/docroot/modules/menu/menu.info @@ -6,7 +6,7 @@ core = 7.x files[] = menu.test configure = admin/structure/menu -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/node/node.info b/docroot/modules/node/node.info index 0aaeb7fb..f02114b9 100644 --- a/docroot/modules/node/node.info +++ b/docroot/modules/node/node.info @@ -9,7 +9,7 @@ required = TRUE configure = admin/structure/types stylesheets[all][] = node.css -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/node/node.test b/docroot/modules/node/node.test index f0ff8e7d..3ff600f3 100644 --- a/docroot/modules/node/node.test +++ b/docroot/modules/node/node.test @@ -666,8 +666,17 @@ class NodeCreationTestCase extends DrupalWebTestCase { } // Check that the rollback error was logged. - $records = db_query("SELECT wid FROM {watchdog} WHERE variables LIKE '%Test exception for rollback.%'")->fetchAll(); - $this->assertTrue(count($records) > 0, 'Rollback explanatory error logged to watchdog.'); + // PostgreSQL doesn't support bytea LIKE queries, so we need to unserialize + // first to check for the rollback exception message. + $matches = array(); + $records = db_query("SELECT wid, variables FROM {watchdog}")->fetchAll(); + foreach ($records as $record) { + $variables = (array) unserialize($record->variables); + if (isset($variables['!message']) && $variables['!message'] === 'Test exception for rollback.') { + $matches[] = $record->wid; + } + } + $this->assertTrue(count($matches) > 0, 'Rollback explanatory error logged to watchdog.'); } /** diff --git a/docroot/modules/node/tests/node_access_test.info b/docroot/modules/node/tests/node_access_test.info index 4db1c1b4..b233946c 100644 --- a/docroot/modules/node/tests/node_access_test.info +++ b/docroot/modules/node/tests/node_access_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/node/tests/node_test.info b/docroot/modules/node/tests/node_test.info index efa1c912..2d7a06fd 100644 --- a/docroot/modules/node/tests/node_test.info +++ b/docroot/modules/node/tests/node_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/node/tests/node_test_exception.info b/docroot/modules/node/tests/node_test_exception.info index 7dc1faf1..d9b8ea4d 100644 --- a/docroot/modules/node/tests/node_test_exception.info +++ b/docroot/modules/node/tests/node_test_exception.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/openid/openid.info b/docroot/modules/openid/openid.info index ef8a2741..5b2074fe 100644 --- a/docroot/modules/openid/openid.info +++ b/docroot/modules/openid/openid.info @@ -5,7 +5,7 @@ package = Core core = 7.x files[] = openid.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/openid/tests/openid_test.info b/docroot/modules/openid/tests/openid_test.info index b2441201..07c91842 100644 --- a/docroot/modules/openid/tests/openid_test.info +++ b/docroot/modules/openid/tests/openid_test.info @@ -6,7 +6,7 @@ core = 7.x dependencies[] = openid hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/overlay/overlay.info b/docroot/modules/overlay/overlay.info index b7b83e57..c3396ab9 100644 --- a/docroot/modules/overlay/overlay.info +++ b/docroot/modules/overlay/overlay.info @@ -4,7 +4,7 @@ package = Core version = VERSION core = 7.x -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/path/path.info b/docroot/modules/path/path.info index 7d02eac0..1ccae758 100644 --- a/docroot/modules/path/path.info +++ b/docroot/modules/path/path.info @@ -6,7 +6,7 @@ core = 7.x files[] = path.test configure = admin/config/search/path -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/php/php.info b/docroot/modules/php/php.info index f9dc6150..385901d0 100644 --- a/docroot/modules/php/php.info +++ b/docroot/modules/php/php.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x files[] = php.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/poll/poll.info b/docroot/modules/poll/poll.info index 98c20054..9a5a8bcb 100644 --- a/docroot/modules/poll/poll.info +++ b/docroot/modules/poll/poll.info @@ -6,7 +6,7 @@ core = 7.x files[] = poll.test stylesheets[all][] = poll.css -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/poll/poll.test b/docroot/modules/poll/poll.test index e24032d5..1e15848b 100644 --- a/docroot/modules/poll/poll.test +++ b/docroot/modules/poll/poll.test @@ -216,7 +216,7 @@ class PollCreateTestCase extends PollTestCase { $vote_count = '2000'; $node->choice[] = array( - 'chid' => '', + 'chid' => NULL, 'chtext' => $new_option, 'chvotes' => (int) $vote_count, 'weight' => 1000, diff --git a/docroot/modules/profile/profile.info b/docroot/modules/profile/profile.info index 8515c1f5..1a94d101 100644 --- a/docroot/modules/profile/profile.info +++ b/docroot/modules/profile/profile.info @@ -11,7 +11,7 @@ configure = admin/config/people/profile ; See user_system_info_alter(). hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/rdf/rdf.info b/docroot/modules/rdf/rdf.info index 9d02a843..ac8a711e 100644 --- a/docroot/modules/rdf/rdf.info +++ b/docroot/modules/rdf/rdf.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x files[] = rdf.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/rdf/tests/rdf_test.info b/docroot/modules/rdf/tests/rdf_test.info index 442d9103..fd926c32 100644 --- a/docroot/modules/rdf/tests/rdf_test.info +++ b/docroot/modules/rdf/tests/rdf_test.info @@ -6,7 +6,7 @@ core = 7.x hidden = TRUE dependencies[] = blog -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/search/search.info b/docroot/modules/search/search.info index aed3c580..638a8218 100644 --- a/docroot/modules/search/search.info +++ b/docroot/modules/search/search.info @@ -8,7 +8,7 @@ files[] = search.test configure = admin/config/search/settings stylesheets[all][] = search.css -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/search/tests/search_embedded_form.info b/docroot/modules/search/tests/search_embedded_form.info index c7e9b787..e103f2c9 100644 --- a/docroot/modules/search/tests/search_embedded_form.info +++ b/docroot/modules/search/tests/search_embedded_form.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/search/tests/search_extra_type.info b/docroot/modules/search/tests/search_extra_type.info index 1f4930a7..a11d5cef 100644 --- a/docroot/modules/search/tests/search_extra_type.info +++ b/docroot/modules/search/tests/search_extra_type.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/search/tests/search_node_tags.info b/docroot/modules/search/tests/search_node_tags.info index 0987ea1d..77d7ece0 100644 --- a/docroot/modules/search/tests/search_node_tags.info +++ b/docroot/modules/search/tests/search_node_tags.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/shortcut/shortcut.info b/docroot/modules/shortcut/shortcut.info index da0eed5a..6f82297f 100644 --- a/docroot/modules/shortcut/shortcut.info +++ b/docroot/modules/shortcut/shortcut.info @@ -6,7 +6,7 @@ core = 7.x files[] = shortcut.test configure = admin/config/user-interface/shortcut -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/simpletest.info b/docroot/modules/simpletest/simpletest.info index 503c04be..3cf82f4c 100644 --- a/docroot/modules/simpletest/simpletest.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/actions_loop_test.info b/docroot/modules/simpletest/tests/actions_loop_test.info index 3a6f694b..64987213 100644 --- a/docroot/modules/simpletest/tests/actions_loop_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/ajax_forms_test.info b/docroot/modules/simpletest/tests/ajax_forms_test.info index ac284a47..006a2ef1 100644 --- a/docroot/modules/simpletest/tests/ajax_forms_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/ajax_test.info b/docroot/modules/simpletest/tests/ajax_test.info index fceafe62..b845c229 100644 --- a/docroot/modules/simpletest/tests/ajax_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/batch_test.info b/docroot/modules/simpletest/tests/batch_test.info index bc97706f..38898167 100644 --- a/docroot/modules/simpletest/tests/batch_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/boot_test_1.info b/docroot/modules/simpletest/tests/boot_test_1.info index b769527c..43360adb 100644 --- a/docroot/modules/simpletest/tests/boot_test_1.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/boot_test_2.info b/docroot/modules/simpletest/tests/boot_test_2.info index 77550f5a..fa7f99ff 100644 --- a/docroot/modules/simpletest/tests/boot_test_2.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/common.test b/docroot/modules/simpletest/tests/common.test index b22c4a6f..3b4d731d 100644 --- a/docroot/modules/simpletest/tests/common.test +++ b/docroot/modules/simpletest/tests/common.test @@ -480,6 +480,11 @@ class CommonXssUnitTest extends DrupalUnitTestCase { * Check that invalid multi-byte sequences are rejected. */ function testInvalidMultiByte() { + // Ignore PHP 8.0+ null deprecatations. + $text = check_plain(NULL); + $this->assertEqual($text, '', 'check_plain() casts null to string'); + $text = check_plain(FALSE); + $this->assertEqual($text, '', 'check_plain() casts boolean to string'); // Ignore PHP 5.3+ invalid multibyte sequence warning. $text = @check_plain("Foo\xC0barbaz"); $this->assertEqual($text, '', 'check_plain() rejects invalid sequence "Foo\xC0barbaz"'); diff --git a/docroot/modules/simpletest/tests/common_test.info b/docroot/modules/simpletest/tests/common_test.info index 24978b59..68b45d4f 100644 --- a/docroot/modules/simpletest/tests/common_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/common_test_cron_helper.info b/docroot/modules/simpletest/tests/common_test_cron_helper.info index 61a4a86f..ae7d4b4c 100644 --- a/docroot/modules/simpletest/tests/common_test_cron_helper.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/database_test.info b/docroot/modules/simpletest/tests/database_test.info index e36384ca..dc8f9f77 100644 --- a/docroot/modules/simpletest/tests/database_test.info +++ b/docroot/modules/simpletest/tests/database_test.info @@ -5,7 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/database_test.test b/docroot/modules/simpletest/tests/database_test.test index 1f4c2b07..efa6c886 100644 --- a/docroot/modules/simpletest/tests/database_test.test +++ b/docroot/modules/simpletest/tests/database_test.test @@ -868,14 +868,30 @@ class DatabaseUpdateTestCase extends DatabaseTestCase { ->fields(array('age' => 1)) ->execute(); - // Ensure that expressions are handled properly. This should set every - // record's age to a square of itself, which will change only three of the - // four records in the table since 1*1 = 1. That means only three records - // are modified, so we should get back 3, not 4, from execute(). + // Ensure that expressions are handled properly. This should set every + // record's age to a square of itself. The number of affected rows returned + // by db_update() will vary across different database engines and versions: + // - MySQL / InnoDB: changed rows only + // - MySQL / MyISAM: changed rows only + // - PostgreSQL: all rows matched by the query + // - SQLite: changed rows only (see workaround in UpdateQuery_sqlite) + // All database engines will change only three of the four records in the + // table since 1*1 = 1. However, the pgsql driver will return the number of + // rows matched rather than the number changed. + // @see https://www.drupal.org/project/drupal/issues/805858 + // @see https://www.drupal.org/project/drupal/issues/3264471 + $connection = Database::getConnection()->getConnectionOptions(); + $expected_rows = 3; + if ($connection['driver'] === 'pgsql') { + $expected_rows ++; + } $num_rows = db_update('test') ->expression('age', 'age * age') ->execute(); - $this->assertIdentical($num_rows, 3, 'Number of affected rows are returned.'); + $this->assertIdentical($num_rows, $expected_rows, 'Number of affected rows are returned.'); + + $saved_name = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => pow(26, 2)))->fetchField(); + $this->assertIdentical('Paul', $saved_name, 'Successfully updated values using an algebraic expression.'); } } @@ -1592,7 +1608,7 @@ class DatabaseSelectTestCase extends DatabaseTestCase { /** * Test that we can UNION multiple Select queries together. This is - * semantically equal to UNION DISTINCT, so we don't explicity test that. + * semantically equal to UNION DISTINCT, so we don't explicitly test that. */ function testUnion() { $query_1 = db_select('test', 't') @@ -1601,7 +1617,8 @@ class DatabaseSelectTestCase extends DatabaseTestCase { $query_2 = db_select('test', 't') ->fields('t', array('name')) - ->condition('age', 28); + ->condition('age', 28) + ->orderBy('name'); $query_1->union($query_2); @@ -4341,6 +4358,13 @@ class DatabaseReservedKeywordTestCase extends DatabaseTestCase { } else { $database = $connection['database']; + + if ($connection['driver'] === 'pgsql') { + // database.scheme.table for PostgreSQL + // @see https://www.postgresql.org/docs/14/ddl-schemas.html + $database .= '.public'; + } + // Test db_query with schema.{table} pattern db_query('SELECT * FROM ' . $database . '.{system} LIMIT 1')->fetchObject(); $this->assertTrue(isset($record->filename), 'Successfully queried the schema.{system} table.'); @@ -4464,6 +4488,13 @@ class DatabaseTablePrefixTestCase extends DatabaseTestCase { } $db_name = $connection_options['database']; + + if ($connection_options['driver'] === 'pgsql') { + // database.scheme.table for PostgreSQL + // @see https://www.postgresql.org/docs/14/ddl-schemas.html + $db_name .= '.public'; + } + // This prefix is usually something like simpletest12345 $test_prefix = $connection_options['prefix']['default']; diff --git a/docroot/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info b/docroot/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info index ebbe5f82..41b6b417 100644 --- a/docroot/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/docroot/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info index f8f6bba7..e30831f7 100644 --- a/docroot/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info b/docroot/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info index 90c677d3..fa9c8c1a 100644 --- a/docroot/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/entity_cache_test.info b/docroot/modules/simpletest/tests/entity_cache_test.info index c2f0cdfa..a0853db2 100644 --- a/docroot/modules/simpletest/tests/entity_cache_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/entity_cache_test_dependency.info b/docroot/modules/simpletest/tests/entity_cache_test_dependency.info index 531de165..dccda07a 100644 --- a/docroot/modules/simpletest/tests/entity_cache_test_dependency.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/entity_crud_hook_test.info b/docroot/modules/simpletest/tests/entity_crud_hook_test.info index e2d84786..431f94e3 100644 --- a/docroot/modules/simpletest/tests/entity_crud_hook_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/entity_query_access_test.info b/docroot/modules/simpletest/tests/entity_query_access_test.info index 949a3575..5ff93931 100644 --- a/docroot/modules/simpletest/tests/entity_query_access_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/error_test.info b/docroot/modules/simpletest/tests/error_test.info index f1a5c3a5..959b2c04 100644 --- a/docroot/modules/simpletest/tests/error_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/file_test.info b/docroot/modules/simpletest/tests/file_test.info index 649e7295..543d6fd4 100644 --- a/docroot/modules/simpletest/tests/file_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/filter_test.info b/docroot/modules/simpletest/tests/filter_test.info index b23292ca..732de492 100644 --- a/docroot/modules/simpletest/tests/filter_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/form_test.info b/docroot/modules/simpletest/tests/form_test.info index 566ace2e..0e22d615 100644 --- a/docroot/modules/simpletest/tests/form_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/image_test.info b/docroot/modules/simpletest/tests/image_test.info index 38e05b1a..863fca7f 100644 --- a/docroot/modules/simpletest/tests/image_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/menu_test.info b/docroot/modules/simpletest/tests/menu_test.info index 7d0dc5e3..eec44378 100644 --- a/docroot/modules/simpletest/tests/menu_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/module.test b/docroot/modules/simpletest/tests/module.test index eea3b51e..25dbb67b 100644 --- a/docroot/modules/simpletest/tests/module.test +++ b/docroot/modules/simpletest/tests/module.test @@ -110,6 +110,18 @@ class ModuleUnitTest extends DrupalWebTestCase { $this->assertEqual($static['test_hook']['module_test'], 'file', 'Include file detected.'); } + /** + * Test system_modules() with a module with a dependency with a null version. + */ + function testSystemModulesNullVersion() { + module_enable(array('system_requires_null_version_test'), FALSE); + $this->resetAll(); + $admin = $this->drupalCreateUser(array('administer modules')); + $this->drupalLogin($admin); + $this->drupalGet('admin/modules'); + $this->assertText('System null version test', 'Module admin UI listed dependency with null version successfully.'); + } + /** * Test that module_invoke() can load a hook defined in hook_hook_info(). */ diff --git a/docroot/modules/simpletest/tests/module_test.info b/docroot/modules/simpletest/tests/module_test.info index b86a8e49..27a0beb6 100644 --- a/docroot/modules/simpletest/tests/module_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/path_test.info b/docroot/modules/simpletest/tests/path_test.info index 456018c8..3be97b96 100644 --- a/docroot/modules/simpletest/tests/path_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/psr_0_test/psr_0_test.info b/docroot/modules/simpletest/tests/psr_0_test/psr_0_test.info index 580446f1..b9eb17ee 100644 --- a/docroot/modules/simpletest/tests/psr_0_test/psr_0_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/psr_4_test/psr_4_test.info b/docroot/modules/simpletest/tests/psr_4_test/psr_4_test.info index 6edb69d4..87a8f763 100644 --- a/docroot/modules/simpletest/tests/psr_4_test/psr_4_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/requirements1_test.info b/docroot/modules/simpletest/tests/requirements1_test.info index 945f8266..8d758316 100644 --- a/docroot/modules/simpletest/tests/requirements1_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/requirements2_test.info b/docroot/modules/simpletest/tests/requirements2_test.info index 38c08cb0..663d79f7 100644 --- a/docroot/modules/simpletest/tests/requirements2_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/session_test.info b/docroot/modules/simpletest/tests/session_test.info index a25775c5..e426ff26 100644 --- a/docroot/modules/simpletest/tests/session_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/system_dependencies_test.info b/docroot/modules/simpletest/tests/system_dependencies_test.info index 6abb54bf..d2a66985 100644 --- a/docroot/modules/simpletest/tests/system_dependencies_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info b/docroot/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info index 388c2f82..08cbfdfc 100644 --- a/docroot/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/system_incompatible_core_version_test.info b/docroot/modules/simpletest/tests/system_incompatible_core_version_test.info index 0ebb2762..f2d76d30 100644 --- a/docroot/modules/simpletest/tests/system_incompatible_core_version_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info b/docroot/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info index 2e4a894a..6299d539 100644 --- a/docroot/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/system_incompatible_module_version_test.info b/docroot/modules/simpletest/tests/system_incompatible_module_version_test.info index 9f2f90c5..33739a28 100644 --- a/docroot/modules/simpletest/tests/system_incompatible_module_version_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/system_null_version_test.info b/docroot/modules/simpletest/tests/system_null_version_test.info new file mode 100644 index 00000000..679510bd --- /dev/null +++ b/docroot/modules/simpletest/tests/system_null_version_test.info @@ -0,0 +1,10 @@ +name = "System null version test" +description = "Support module for testing with a null version." +package = Testing +core = 7.x +hidden = FALSE + +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" +project = "drupal" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/system_null_version_test.module b/docroot/modules/simpletest/tests/system_null_version_test.module new file mode 100644 index 00000000..b3d9bbc7 --- /dev/null +++ b/docroot/modules/simpletest/tests/system_null_version_test.module @@ -0,0 +1 @@ +fields('af', array('url', 'link')) ->fields('ai', array('link', 'guid')); + $query->orderBy('ai.iid'); $pre_update_data = $query->execute()->fetchAll(); $this->assertTrue($this->performUpgrade(), 'The update was completed successfully.'); diff --git a/docroot/modules/simpletest/tests/upgrade/upgrade.comment.test b/docroot/modules/simpletest/tests/upgrade/upgrade.comment.test index 40d893a8..84551c3c 100644 --- a/docroot/modules/simpletest/tests/upgrade/upgrade.comment.test +++ b/docroot/modules/simpletest/tests/upgrade/upgrade.comment.test @@ -27,6 +27,9 @@ class CommentUpgradePathTestCase extends UpgradePathTestCase { * Test a successful upgrade. */ public function testCommentUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); } } diff --git a/docroot/modules/simpletest/tests/upgrade/upgrade.filter.test b/docroot/modules/simpletest/tests/upgrade/upgrade.filter.test index 584f4d94..6d805122 100644 --- a/docroot/modules/simpletest/tests/upgrade/upgrade.filter.test +++ b/docroot/modules/simpletest/tests/upgrade/upgrade.filter.test @@ -28,6 +28,9 @@ class FilterFormatUpgradePathTestCase extends UpgradePathTestCase { * Test a successful upgrade. */ function testFilterFormatUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); $format = filter_format_load('1'); diff --git a/docroot/modules/simpletest/tests/upgrade/upgrade.forum.test b/docroot/modules/simpletest/tests/upgrade/upgrade.forum.test index b0bbd4ed..75514453 100644 --- a/docroot/modules/simpletest/tests/upgrade/upgrade.forum.test +++ b/docroot/modules/simpletest/tests/upgrade/upgrade.forum.test @@ -27,6 +27,9 @@ class ForumUpgradePathTestCase extends UpgradePathTestCase { * Test a successful upgrade (no negotiation). */ public function testForumUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); // Work around http://drupal.org/node/931512 diff --git a/docroot/modules/simpletest/tests/upgrade/upgrade.locale.test b/docroot/modules/simpletest/tests/upgrade/upgrade.locale.test index f7b0038d..a13499d0 100644 --- a/docroot/modules/simpletest/tests/upgrade/upgrade.locale.test +++ b/docroot/modules/simpletest/tests/upgrade/upgrade.locale.test @@ -27,6 +27,9 @@ class LocaleUpgradePathTestCase extends UpgradePathTestCase { * Test a successful upgrade (no negotiation). */ public function testLocaleUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); // The home page should be in French. @@ -43,6 +46,9 @@ class LocaleUpgradePathTestCase extends UpgradePathTestCase { * Test an upgrade with path-based negotiation. */ public function testLocaleUpgradePathDefault() { + if ($this->skipUpgradeTest) { + return; + } // LANGUAGE_NEGOTIATION_PATH_DEFAULT. $this->variable_set('language_negotiation', 1); @@ -66,6 +72,9 @@ class LocaleUpgradePathTestCase extends UpgradePathTestCase { * Test an upgrade with path-based (with fallback) negotiation. */ public function testLocaleUpgradePathFallback() { + if ($this->skipUpgradeTest) { + return; + } // LANGUAGE_NEGOTIATION_PATH. $this->variable_set('language_negotiation', 2); @@ -92,6 +101,9 @@ class LocaleUpgradePathTestCase extends UpgradePathTestCase { * Test an upgrade with domain-based negotiation. */ public function testLocaleUpgradeDomain() { + if ($this->skipUpgradeTest) { + return; + } // LANGUAGE_NEGOTIATION_DOMAIN. $this->variable_set('language_negotiation', 3); diff --git a/docroot/modules/simpletest/tests/upgrade/upgrade.menu.test b/docroot/modules/simpletest/tests/upgrade/upgrade.menu.test index d9ae6c1b..a9dfd4fa 100644 --- a/docroot/modules/simpletest/tests/upgrade/upgrade.menu.test +++ b/docroot/modules/simpletest/tests/upgrade/upgrade.menu.test @@ -27,6 +27,9 @@ class MenuUpgradePathTestCase extends UpgradePathTestCase { * Test a successful upgrade. */ public function testMenuUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); // Test the migration of "Default menu for content" setting to individual diff --git a/docroot/modules/simpletest/tests/upgrade/upgrade.node.test b/docroot/modules/simpletest/tests/upgrade/upgrade.node.test index 4ac14c57..7986bab6 100644 --- a/docroot/modules/simpletest/tests/upgrade/upgrade.node.test +++ b/docroot/modules/simpletest/tests/upgrade/upgrade.node.test @@ -26,6 +26,9 @@ class NodeBodyUpgradePathTestCase extends UpgradePathTestCase { * Test a successful upgrade. */ public function testNodeBodyUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); $instance = field_info_instance('node', 'body', 'story'); @@ -77,6 +80,9 @@ class DisabledNodeTypeTestCase extends UpgradePathTestCase { * Tests a successful upgrade. */ public function testDisabledNodeTypeUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); $this->assertTrue(field_info_instance('comment', 'comment_body', 'comment_node_broken'), 'Comment body field instance was created for comments attached to the disabled broken node type'); } @@ -114,6 +120,9 @@ class PollUpgradePathTestCase extends UpgradePathTestCase { * Test a successful upgrade. */ public function testPollUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); // Check modules page for poll diff --git a/docroot/modules/simpletest/tests/upgrade/upgrade.poll.test b/docroot/modules/simpletest/tests/upgrade/upgrade.poll.test index ac4ea436..85c4ffd7 100644 --- a/docroot/modules/simpletest/tests/upgrade/upgrade.poll.test +++ b/docroot/modules/simpletest/tests/upgrade/upgrade.poll.test @@ -32,6 +32,9 @@ class PollUpgradePathTestCase extends UpgradePathTestCase { * Test a successful upgrade. */ public function testPollUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); // Check modules page for poll diff --git a/docroot/modules/simpletest/tests/upgrade/upgrade.taxonomy.test b/docroot/modules/simpletest/tests/upgrade/upgrade.taxonomy.test index 51402ed7..bde2691f 100644 --- a/docroot/modules/simpletest/tests/upgrade/upgrade.taxonomy.test +++ b/docroot/modules/simpletest/tests/upgrade/upgrade.taxonomy.test @@ -46,6 +46,9 @@ class UpgradePathTaxonomyTestCase extends UpgradePathTestCase { * Basic tests for the taxonomy upgrade. */ public function testTaxonomyUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); // Visit the front page to assert for PHP warning and errors. diff --git a/docroot/modules/simpletest/tests/upgrade/upgrade.test b/docroot/modules/simpletest/tests/upgrade/upgrade.test index 784a0917..707431ea 100644 --- a/docroot/modules/simpletest/tests/upgrade/upgrade.test +++ b/docroot/modules/simpletest/tests/upgrade/upgrade.test @@ -37,6 +37,11 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase { */ var $pendingUpdates = TRUE; + /** + * Flag to indicate whether to skip upgrade tests. + */ + var $skipUpgradeTest = FALSE; + /** * Constructs an UpgradePathTestCase object. * @@ -46,6 +51,8 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase { */ function __construct($test_id = NULL) { parent::__construct($test_id); + $connection_info = Database::getConnectionInfo(); + $this->skipUpgradeTest = (bool) ($connection_info['default']['driver'] == 'pgsql'); $this->zlibInstalled = function_exists('gzopen'); } @@ -579,7 +586,24 @@ class BasicMinimalUpdatePath extends UpdatePathTestCase { $this->assertText(t('Custom date format added.')); // Verify that the unique key on {date_formats}.format still exists. - $this->assertTrue(db_index_exists('date_formats', 'formats'), 'Unique key on {date_formats} exists'); + try { + // The PostgreSQL driver appends suffixes to keys/indexes according to + // their types. A unique key is a key (not an index), so it has a _key + // suffix. It is not possible to call db_index_exists() as this function + // will check the index name with _idx suffix, so it will never succeed on + // PostgreSQL. An attempt to create a new unique key when it exists should + // fail and the thrown exception will confirm that the unique key exists. + // MySQL and SQLite are not affected by this change, as they do not append + // suffixes to keys/indexes names. + db_add_unique_key('date_formats', 'formats', array('formats')); + // This is executed if no exception has been thrown and the unique key + // did not already exist. + $this->fail('Unique key on {date_formats} does not exist'); + } + catch (DatabaseSchemaObjectExistsException $e) { + // Exception confirms that the unique key already existed. + $this->pass('Unique key on {date_formats} exists'); + } } } diff --git a/docroot/modules/simpletest/tests/upgrade/upgrade.translatable.test b/docroot/modules/simpletest/tests/upgrade/upgrade.translatable.test index 6fefb0ff..c4f7161a 100644 --- a/docroot/modules/simpletest/tests/upgrade/upgrade.translatable.test +++ b/docroot/modules/simpletest/tests/upgrade/upgrade.translatable.test @@ -28,6 +28,9 @@ class TranslatableUpgradePathTestCase extends UpgradePathTestCase { * Test a successful upgrade (no negotiation). */ public function testTranslatableUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); // The D6 database contains the english node "First translatable page" with diff --git a/docroot/modules/simpletest/tests/upgrade/upgrade.trigger.test b/docroot/modules/simpletest/tests/upgrade/upgrade.trigger.test index ef239414..79cb63e3 100644 --- a/docroot/modules/simpletest/tests/upgrade/upgrade.trigger.test +++ b/docroot/modules/simpletest/tests/upgrade/upgrade.trigger.test @@ -29,6 +29,9 @@ class UpgradePathTriggerTestCase extends UpgradePathTestCase { * Basic tests for the trigger upgrade. */ public function testTaxonomyUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); $this->drupalGet('admin/structure/trigger/node'); $this->assertRaw(''. t('Make post sticky') .''); diff --git a/docroot/modules/simpletest/tests/upgrade/upgrade.upload.test b/docroot/modules/simpletest/tests/upgrade/upgrade.upload.test index dfa94a00..6e0668cc 100644 --- a/docroot/modules/simpletest/tests/upgrade/upgrade.upload.test +++ b/docroot/modules/simpletest/tests/upgrade/upgrade.upload.test @@ -29,6 +29,9 @@ class UploadUpgradePathTestCase extends UpgradePathTestCase { * Test a successful upgrade. */ public function testUploadUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); $query = new EntityFieldQuery(); $query->entityCondition('entity_type', 'node'); diff --git a/docroot/modules/simpletest/tests/upgrade/upgrade.user.test b/docroot/modules/simpletest/tests/upgrade/upgrade.user.test index d33234e4..605a43dc 100644 --- a/docroot/modules/simpletest/tests/upgrade/upgrade.user.test +++ b/docroot/modules/simpletest/tests/upgrade/upgrade.user.test @@ -24,6 +24,9 @@ class UserUpgradePathPasswordTokenTestCase extends UpgradePathTestCase { * Test a successful upgrade. */ public function testUserUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); $this->assertEqual(variable_get('user_mail_register_no_approval_required_body'), ', [user:name], [site:name], [site:url], [site:url-brief], [user:mail], [date:medium], [site:login-url], [user:edit-url], [user:one-time-login-url].', 'Existing email templates have been modified (password token involved).'); // Check that a non-md5 hash was untouched. @@ -57,6 +60,9 @@ class UserUpgradePathNoPasswordTokenTestCase extends UpgradePathTestCase { * Test a successful upgrade. */ public function testUserUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); $this->assertEqual(variable_get('user_mail_register_no_approval_required_body'), '[user:name], [site:name], [site:url], [site:url-brief], [user:mail], [date:medium], [site:login-url], [user:edit-url], [user:one-time-login-url].', 'Existing email templates have been modified (password token not involved).'); } @@ -87,6 +93,9 @@ class UserUpgradePathDuplicatedPermissionTestCase extends UpgradePathTestCase { * Test a successful upgrade. */ public function testUserUpgrade() { + if ($this->skipUpgradeTest) { + return; + } $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); } } diff --git a/docroot/modules/simpletest/tests/url_alter_test.info b/docroot/modules/simpletest/tests/url_alter_test.info index 2396acc2..6567dc4f 100644 --- a/docroot/modules/simpletest/tests/url_alter_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/simpletest/tests/xmlrpc_test.info b/docroot/modules/simpletest/tests/xmlrpc_test.info index bc0d64e2..f6ad5645 100644 --- a/docroot/modules/simpletest/tests/xmlrpc_test.info +++ b/docroot/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 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/statistics/statistics.info b/docroot/modules/statistics/statistics.info index 91d3e05f..60f8dbc0 100644 --- a/docroot/modules/statistics/statistics.info +++ b/docroot/modules/statistics/statistics.info @@ -6,7 +6,7 @@ core = 7.x files[] = statistics.test configure = admin/config/system/statistics -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/syslog/syslog.info b/docroot/modules/syslog/syslog.info index d8cb4cdd..24d0d3b9 100644 --- a/docroot/modules/syslog/syslog.info +++ b/docroot/modules/syslog/syslog.info @@ -6,7 +6,7 @@ core = 7.x files[] = syslog.test configure = admin/config/development/logging -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/system/system.admin.inc b/docroot/modules/system/system.admin.inc index b7e6fc9e..40908c1a 100644 --- a/docroot/modules/system/system.admin.inc +++ b/docroot/modules/system/system.admin.inc @@ -839,7 +839,7 @@ function system_modules($form, $form_state = array()) { elseif (isset($visible_files[$requires])) { $requires_name = $files[$requires]->info['name']; // Disable this module if it is incompatible with the dependency's version. - if ($incompatible_version = drupal_check_incompatibility($v, str_replace(DRUPAL_CORE_COMPATIBILITY . '-', '', $files[$requires]->info['version']))) { + if ($incompatible_version = drupal_check_incompatibility($v, str_replace(DRUPAL_CORE_COMPATIBILITY . '-', '', (string) $files[$requires]->info['version']))) { $extra['requires'][$requires] = t('@module (incompatible with version @version)', array( '@module' => $requires_name . $incompatible_version, '@version' => $files[$requires]->info['version'], diff --git a/docroot/modules/system/system.info b/docroot/modules/system/system.info index 16d98903..68bd1f8b 100644 --- a/docroot/modules/system/system.info +++ b/docroot/modules/system/system.info @@ -12,7 +12,7 @@ files[] = system.test required = TRUE configure = admin/config/system -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/system/system.install b/docroot/modules/system/system.install index 4f3b2899..3714c8e5 100644 --- a/docroot/modules/system/system.install +++ b/docroot/modules/system/system.install @@ -489,7 +489,7 @@ function system_requirements($phase) { // Check for an incompatible version. $required_file = $files[$required_module]; $required_name = $required_file->info['name']; - $version = str_replace(DRUPAL_CORE_COMPATIBILITY . '-', '', $required_file->info['version']); + $version = str_replace(DRUPAL_CORE_COMPATIBILITY . '-', '', (string) $required_file->info['version']); $compatibility = drupal_check_incompatibility($requirement, $version); if ($compatibility) { $compatibility = rtrim(substr($compatibility, 2), ')'); diff --git a/docroot/modules/system/tests/cron_queue_test.info b/docroot/modules/system/tests/cron_queue_test.info index 23025c5c..06a7db25 100644 --- a/docroot/modules/system/tests/cron_queue_test.info +++ b/docroot/modules/system/tests/cron_queue_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/system/tests/system_cron_test.info b/docroot/modules/system/tests/system_cron_test.info index 243b7d32..2a95869a 100644 --- a/docroot/modules/system/tests/system_cron_test.info +++ b/docroot/modules/system/tests/system_cron_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/taxonomy/taxonomy.info b/docroot/modules/taxonomy/taxonomy.info index a5f7285e..16d9c5d9 100644 --- a/docroot/modules/taxonomy/taxonomy.info +++ b/docroot/modules/taxonomy/taxonomy.info @@ -8,7 +8,7 @@ files[] = taxonomy.module files[] = taxonomy.test configure = admin/structure/taxonomy -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/toolbar/toolbar.info b/docroot/modules/toolbar/toolbar.info index 86566299..3fabb0e6 100644 --- a/docroot/modules/toolbar/toolbar.info +++ b/docroot/modules/toolbar/toolbar.info @@ -4,7 +4,7 @@ core = 7.x package = Core version = VERSION -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/tracker/tracker.info b/docroot/modules/tracker/tracker.info index db8dd299..7a6eadf1 100644 --- a/docroot/modules/tracker/tracker.info +++ b/docroot/modules/tracker/tracker.info @@ -6,7 +6,7 @@ version = VERSION core = 7.x files[] = tracker.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/translation/tests/translation_test.info b/docroot/modules/translation/tests/translation_test.info index 8fca9378..381503ac 100644 --- a/docroot/modules/translation/tests/translation_test.info +++ b/docroot/modules/translation/tests/translation_test.info @@ -5,7 +5,7 @@ package = Testing version = VERSION hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/translation/translation.info b/docroot/modules/translation/translation.info index 629c15b2..f77f94b8 100644 --- a/docroot/modules/translation/translation.info +++ b/docroot/modules/translation/translation.info @@ -6,7 +6,7 @@ version = VERSION core = 7.x files[] = translation.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/trigger/tests/trigger_test.info b/docroot/modules/trigger/tests/trigger_test.info index 779f5260..781df5b2 100644 --- a/docroot/modules/trigger/tests/trigger_test.info +++ b/docroot/modules/trigger/tests/trigger_test.info @@ -4,7 +4,7 @@ package = Testing core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/trigger/trigger.info b/docroot/modules/trigger/trigger.info index 395222ea..a79a9454 100644 --- a/docroot/modules/trigger/trigger.info +++ b/docroot/modules/trigger/trigger.info @@ -6,7 +6,7 @@ core = 7.x files[] = trigger.test configure = admin/structure/trigger -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/update/tests/aaa_update_test.info b/docroot/modules/update/tests/aaa_update_test.info index 3ae551a5..ef7ada55 100644 --- a/docroot/modules/update/tests/aaa_update_test.info +++ b/docroot/modules/update/tests/aaa_update_test.info @@ -4,7 +4,7 @@ package = Testing core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/update/tests/bbb_update_test.info b/docroot/modules/update/tests/bbb_update_test.info index 47397a67..80046436 100644 --- a/docroot/modules/update/tests/bbb_update_test.info +++ b/docroot/modules/update/tests/bbb_update_test.info @@ -4,7 +4,7 @@ package = Testing core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/update/tests/ccc_update_test.info b/docroot/modules/update/tests/ccc_update_test.info index 69f2ead5..eaf0430a 100644 --- a/docroot/modules/update/tests/ccc_update_test.info +++ b/docroot/modules/update/tests/ccc_update_test.info @@ -4,7 +4,7 @@ package = Testing core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/update/tests/themes/update_test_admintheme/update_test_admintheme.info b/docroot/modules/update/tests/themes/update_test_admintheme/update_test_admintheme.info index 22150f29..57d692f4 100644 --- a/docroot/modules/update/tests/themes/update_test_admintheme/update_test_admintheme.info +++ b/docroot/modules/update/tests/themes/update_test_admintheme/update_test_admintheme.info @@ -3,7 +3,7 @@ description = Test theme which is used as admin theme. core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info b/docroot/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info index 9eceb01e..05c284f3 100644 --- a/docroot/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info +++ b/docroot/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info @@ -3,7 +3,7 @@ description = Test theme which acts as a base theme for other test subthemes. core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info b/docroot/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info index c87247b8..bec54650 100644 --- a/docroot/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info +++ b/docroot/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info @@ -4,7 +4,7 @@ core = 7.x base theme = update_test_basetheme hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/update/tests/update_test.info b/docroot/modules/update/tests/update_test.info index 6d30c017..71bb7747 100644 --- a/docroot/modules/update/tests/update_test.info +++ b/docroot/modules/update/tests/update_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/update/update.info b/docroot/modules/update/update.info index 20c78b17..3d99a694 100644 --- a/docroot/modules/update/update.info +++ b/docroot/modules/update/update.info @@ -6,7 +6,7 @@ core = 7.x files[] = update.test configure = admin/reports/updates/settings -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/user/tests/user_flood_test.info b/docroot/modules/user/tests/user_flood_test.info index f51b3b21..87125a69 100644 --- a/docroot/modules/user/tests/user_flood_test.info +++ b/docroot/modules/user/tests/user_flood_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/user/tests/user_form_test.info b/docroot/modules/user/tests/user_form_test.info index b0c0d406..5ed02caa 100644 --- a/docroot/modules/user/tests/user_form_test.info +++ b/docroot/modules/user/tests/user_form_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/user/tests/user_session_test.info b/docroot/modules/user/tests/user_session_test.info index 265f8a50..c6938fd5 100644 --- a/docroot/modules/user/tests/user_session_test.info +++ b/docroot/modules/user/tests/user_session_test.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/user/user.info b/docroot/modules/user/user.info index 0a6ebc3c..b2e327d6 100644 --- a/docroot/modules/user/user.info +++ b/docroot/modules/user/user.info @@ -9,7 +9,7 @@ required = TRUE configure = admin/config/people stylesheets[all][] = user.css -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/modules/user/user.install b/docroot/modules/user/user.install index f965179b..43afb19a 100644 --- a/docroot/modules/user/user.install +++ b/docroot/modules/user/user.install @@ -935,6 +935,15 @@ function user_update_7019() { * Add changed field to users table. */ function user_update_7020() { + // The "changed" column was renamed to "access" in system_update_136(), and + // the "changed" index on "access" column may persist on old MySQL databases. + if (db_index_exists('users', 'changed')) { + if (!db_index_exists('users', 'access')) { + db_add_index('users', 'access', array('access')); + } + db_drop_index('users', 'changed'); + } + $spec = array( 'type' => 'int', 'not null' => TRUE, @@ -946,12 +955,19 @@ function user_update_7020() { 'changed' => array('changed'), ), ); - db_add_field('users', 'changed', $spec, $keys); + // In some cases sites have added the changed field themselves e.g. via a + // contrib or custom module. Ensure the field uses core's new schema. + if (db_field_exists('users', 'changed')) { + db_change_field('users', 'changed', 'changed', $spec, $keys); + } + else { + db_add_field('users', 'changed', $spec, $keys); + // Set the initial value for existing users. + db_update('users') + ->expression('changed', 'created') + ->execute(); + } - // Set the initial value for existing users - db_update('users') - ->expression('changed', 'created') - ->execute(); } /** * @} End of "addtogroup updates-7.x-extra". diff --git a/docroot/profiles/minimal/minimal.info b/docroot/profiles/minimal/minimal.info index 7180b5dd..6dc96e5a 100644 --- a/docroot/profiles/minimal/minimal.info +++ b/docroot/profiles/minimal/minimal.info @@ -5,7 +5,7 @@ core = 7.x dependencies[] = block dependencies[] = dblog -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/profiles/standard/standard.info b/docroot/profiles/standard/standard.info index 718df3fc..9ed00b35 100644 --- a/docroot/profiles/standard/standard.info +++ b/docroot/profiles/standard/standard.info @@ -24,7 +24,7 @@ dependencies[] = field_ui dependencies[] = file dependencies[] = rdf -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/docroot/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info index 23d1532d..b1d08c8c 100644 --- a/docroot/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info +++ b/docroot/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info @@ -6,7 +6,7 @@ core = 7.x hidden = TRUE files[] = drupal_system_listing_compatible_test.test -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info b/docroot/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info index f57b1583..529cea00 100644 --- a/docroot/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info +++ b/docroot/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info @@ -8,7 +8,7 @@ version = VERSION core = 6.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/profiles/testing/testing.info b/docroot/profiles/testing/testing.info index 9aff350d..d96141b1 100644 --- a/docroot/profiles/testing/testing.info +++ b/docroot/profiles/testing/testing.info @@ -4,7 +4,7 @@ version = VERSION core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/themes/bartik/bartik.info b/docroot/themes/bartik/bartik.info index b08a555b..df362b71 100644 --- a/docroot/themes/bartik/bartik.info +++ b/docroot/themes/bartik/bartik.info @@ -34,7 +34,7 @@ regions[footer] = Footer settings[shortcut_module_link] = 0 -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/themes/garland/garland.info b/docroot/themes/garland/garland.info index 70c55a2f..24762e4f 100644 --- a/docroot/themes/garland/garland.info +++ b/docroot/themes/garland/garland.info @@ -7,7 +7,7 @@ stylesheets[all][] = style.css stylesheets[print][] = print.css settings[garland_width] = fluid -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/themes/seven/seven.info b/docroot/themes/seven/seven.info index 2318beaf..0bd47dcf 100644 --- a/docroot/themes/seven/seven.info +++ b/docroot/themes/seven/seven.info @@ -13,7 +13,7 @@ regions[page_bottom] = Page bottom regions[sidebar_first] = First sidebar regions_hidden[] = sidebar_first -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151" diff --git a/docroot/themes/stark/stark.info b/docroot/themes/stark/stark.info index 65b3f78d..e0d51a0d 100644 --- a/docroot/themes/stark/stark.info +++ b/docroot/themes/stark/stark.info @@ -5,7 +5,7 @@ version = VERSION core = 7.x stylesheets[all][] = layout.css -; Information added by Drupal.org packaging script on 2022-02-16 -version = "7.88" +; Information added by Drupal.org packaging script on 2022-03-02 +version = "7.89" project = "drupal" -datestamp = "1645030312" +datestamp = "1646219151"