diff --git a/core/includes/update.inc b/core/includes/update.inc
index 2719634..777ebdb 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -627,8 +627,6 @@ function update_prepare_d8_language() {
* made which make it impossible to continue using the prior version.
*/
function update_fix_d8_requirements() {
- global $conf;
-
if (drupal_get_installed_schema_version('system') < 8000 && !update_variable_get('update_d8_requirements', FALSE)) {
// Make sure that file.module is enabled as it is required for the user
@@ -683,7 +681,7 @@ function update_fix_d8_requirements() {
* @param array $modules
* List of modules to enable. Dependencies are not checked and must be
* ensured by the caller.
- * @param bool $update_schema_version
+ * @param int $schema_version
* (optional) The schema version the module should be set to. Defaults to 0
* which works well for completely new modules.
*
@@ -956,7 +954,7 @@ function update_finished($success, $results, $operations) {
/**
* Returns a list of all the pending database updates.
*
- * @return
+ * @return array
* An associative array keyed by module name which contains all information
* about database updates that need to be run, and any updates that are not
* going to proceed due to missing requirements. The system module will
@@ -976,36 +974,38 @@ function update_get_update_list() {
$ret = array('system' => array());
$modules = drupal_get_installed_schema_version(NULL, FALSE, TRUE);
- foreach ($modules as $module => $schema_version) {
- // Skip uninstalled and incompatible modules.
- if ($schema_version == SCHEMA_UNINSTALLED || update_check_incompatibility($module)) {
- continue;
- }
- // Otherwise, get the list of updates defined by this module.
- $updates = drupal_get_schema_versions($module);
- if ($updates !== FALSE) {
- // module_invoke returns NULL for nonexisting hooks, so if no updates
- // are removed, it will == 0.
- $last_removed = module_invoke($module, 'update_last_removed');
- if ($schema_version < $last_removed) {
- $ret[$module]['warning'] = '' . $module . ' module can not be updated. Its schema version is ' . $schema_version . '. Updates up to and including ' . $last_removed . ' have been removed in this release. In order to update ' . $module . ' module, you will first need to upgrade to the last version in which these updates were available.';
+ if (is_array($modules)) {
+ foreach ($modules as $module => $schema_version) {
+ // Skip uninstalled and incompatible modules.
+ if ($schema_version == SCHEMA_UNINSTALLED || update_check_incompatibility($module)) {
continue;
}
+ // Otherwise, get the list of updates defined by this module.
+ $updates = drupal_get_schema_versions($module);
+ if ($updates !== FALSE) {
+ // module_invoke returns NULL for nonexisting hooks, so if no updates
+ // are removed, it will == 0.
+ $last_removed = module_invoke($module, 'update_last_removed');
+ if ($schema_version < $last_removed) {
+ $ret[$module]['warning'] = '' . $module . ' module can not be updated. Its schema version is ' . $schema_version . '. Updates up to and including ' . $last_removed . ' have been removed in this release. In order to update ' . $module . ' module, you will first need to upgrade to the last version in which these updates were available.';
+ continue;
+ }
- $updates = drupal_map_assoc($updates);
- foreach (array_keys($updates) as $update) {
- if ($update > $schema_version) {
- // The description for an update comes from its Doxygen.
- $func = new ReflectionFunction($module . '_update_' . $update);
- $description = str_replace(array("\n", '*', '/'), '', $func->getDocComment());
- $ret[$module]['pending'][$update] = "$update - $description";
- if (!isset($ret[$module]['start'])) {
- $ret[$module]['start'] = $update;
+ $updates = drupal_map_assoc($updates);
+ foreach (array_keys($updates) as $update) {
+ if ($update > $schema_version) {
+ // The description for an update comes from its Doxygen.
+ $func = new ReflectionFunction($module . '_update_' . $update);
+ $description = str_replace(array("\n", '*', '/'), '', $func->getDocComment());
+ $ret[$module]['pending'][$update] = "$update - $description";
+ if (!isset($ret[$module]['start'])) {
+ $ret[$module]['start'] = $update;
+ }
}
}
- }
- if (!isset($ret[$module]['start']) && isset($ret[$module]['pending'])) {
- $ret[$module]['start'] = $schema_version;
+ if (!isset($ret[$module]['start']) && isset($ret[$module]['pending'])) {
+ $ret[$module]['start'] = $schema_version;
+ }
}
}
}
@@ -1097,11 +1097,11 @@ function update_resolve_dependencies($starting_updates) {
/**
* Returns an organized list of update functions for a set of modules.
*
- * @param $starting_updates
+ * @param array $starting_updates
* An array whose keys contain the names of modules and whose values contain
* the number of the first requested update for that module.
*
- * @return
+ * @return array
* An array containing all the update functions that should be run for each
* module, including the provided starting update and all subsequent updates
* that are available. The keys of the array contain the module names, and
@@ -1153,11 +1153,11 @@ function update_get_update_function_list($starting_updates) {
* modules which implement hook_update_dependencies(), and builds them into the
* graph as well.
*
- * @param $update_functions
+ * @param array $update_functions
* An organized array of update functions, in the format returned by
* update_get_update_function_list().
*
- * @return
+ * @return array
* A multidimensional array representing the dependency graph, suitable for
* passing in to Drupal\Component\Graph\Graph::searchAndSort(), but with extra
* information about each update function also included. Each array key
@@ -1216,16 +1216,16 @@ function update_build_dependency_graph($update_functions) {
/**
* Determines if a module update is missing or unavailable.
*
- * @param $module
+ * @param string $module
* The name of the module.
- * @param $number
+ * @param int $number
* The number of the update within that module.
- * @param $update_functions
+ * @param array $update_functions
* An organized array of update functions, in the format returned by
* update_get_update_function_list(). This should represent all module
* updates that are requested to run at the time this function is called.
*
- * @return
+ * @return bool
* TRUE if the provided module update is not installed or is not in the
* provided list of updates to run; FALSE otherwise.
*/
@@ -1236,12 +1236,12 @@ function update_is_missing($module, $number, $update_functions) {
/**
* Determines if a module update has already been performed.
*
- * @param $module
+ * @param string $module
* The name of the module.
- * @param $number
+ * @param int $number
* The number of the update within that module.
*
- * @return
+ * @return bool
* TRUE if the database schema indicates that the update has already been
* performed; FALSE otherwise.
*/
@@ -1257,7 +1257,7 @@ function update_already_performed($module, $number) {
* that it be installed. This allows the update system to properly perform
* updates even on modules that are currently disabled.
*
- * @return
+ * @return array
* An array of return values obtained by merging the results of the
* hook_update_dependencies() implementations in all installed modules.
*
@@ -1407,6 +1407,7 @@ function update_variable_del($name) {
* @endcode
* This would migrate the value contained in variable name 'old_variable' into
* the data key 'new_config.sub_key' of the configuration object $config_name.
+ * @throws ConfigException
*/
function update_variables_to_config($config_name, array $variable_map) {
// Build the new configuration object.