diff -u b/core/includes/bootstrap.inc b/core/includes/bootstrap.inc --- b/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -2079,7 +2079,7 @@ static $stored_phase = -1; // When not recursing, store the phase name so it's not forgotten during - // recursion. Addionally, ensure that $final_phase is never rolled back to an + // recursion. Additionally, ensure that $final_phase is never rolled back to an // earlier bootstrap state. if ($new_phase && $phase > $final_phase) { $final_phase = $phase; diff -u b/core/includes/module.inc b/core/includes/module.inc --- b/core/includes/module.inc +++ b/core/includes/module.inc @@ -269,8 +269,8 @@ * The name of the extension. * @param string $filename * The filename of the extension. - * @param boolean $load - * Whether to call drupal_load() for the extension. + * @param bool $load + * (optional) Call drupal_load() for the extension. Defaults to FALSE. */ function _system_list_warm($type, $name, $filename, $load = FALSE) { drupal_classloader_register($name, dirname($filename)); @@ -1223,7 +1223,7 @@ } /** - * Helper function Drupal\Core\Config\Config::save() to sort module data. + * Helper function for Drupal\Core\Config\Config::save() to sort module data. * * @param array $data * An array of module configuration data. diff -u b/core/lib/Drupal/Core/Config/Config.php b/core/lib/Drupal/Core/Config/Config.php --- b/core/lib/Drupal/Core/Config/Config.php +++ b/core/lib/Drupal/Core/Config/Config.php @@ -310,8 +310,9 @@ * Saves the configuration object. * * @param mixed $sorter - * A callable which sorts the data before save. FALSE to disable sorting. - * Defaults to Drupal\Core\Config\Config::sortByKey(). + * (optional) A callable which sorts the data before save. FALSE to disable + * sorting. Defaults to NULL thereby using + * Drupal\Core\Config\Config::sortByKey(). */ public function save($sorter = NULL) { if ($sorter !== FALSE) { diff -u b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php --- b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php +++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php @@ -9,8 +9,10 @@ /** * @param string $collection - * @param string $class_name - * @return Drupal\Core\KeyValueStore\KeyValueStoreInterface + * The name of the collection holding key and value pairs. + * + * @return Drupal\Core\KeyValueStore\DatabaseStorage + * A key/value store implementation for the given $collection. */ static function get($collection) { return new DatabaseStorage($collection); diff -u b/core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php --- b/core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php @@ -43,7 +43,7 @@ $this->drupalGet('database_test/db_query_temporary'); $data = json_decode($this->drupalGetContent()); if ($data) { - $this->assertEqual($this->countTableRows("filter"), $data->row_count, t('The temporary table contains the correct amount of rows.')); + $this->assertEqual($this->countTableRows("filter"), $data->row_count, 'The temporary table contains the correct amount of rows.'); $this->assertFalse(db_table_exists($data->table_name), t('The temporary table is, indeed, temporary.')); } else { only in patch2: unchanged: --- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleCompareTest.php +++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleCompareTest.php @@ -47,6 +47,8 @@ class LocaleCompareTest extends WebTestBase { // modules not hidden. locale_test_system_info_alter() modifies the project // info of the locale_test and locale_test_disabled modules. variable_set('locale_translation_test_system_info_alter', TRUE); + // Reset system lists to reflect changes. + system_list_reset(); // Check if interface translation data is collected from hook_info. drupal_static_reset('locale_translation_project_list'); @@ -75,6 +77,8 @@ class LocaleCompareTest extends WebTestBase { // Return the locale test modules back to their hidden state. variable_del('locale_translation_test_system_info_alter'); + // Reset system lists to reflect changes. + system_list_reset(); } }