diff -u b/core/modules/update/update.authorize.inc b/core/modules/update/update.authorize.inc --- b/core/modules/update/update.authorize.inc +++ b/core/modules/update/update.authorize.inc @@ -130,15 +130,13 @@ $context['results']['tasks'] = array(); } - /** - * The batch API uses a session, and since all the arguments are serialized - * and unserialized between requests, although the FileTransfer object - * itself will be reconstructed, the connection pointer itself will be lost. - * However, the FileTransfer object will still have the connection variable, - * even though the connection itself is now gone. So, although it's ugly, we - * have to unset the connection variable at this point so that the - * FileTransfer object will re-initiate the actual connection. - */ + // The batch API uses a session, and since all the arguments are serialized + // and unserialized between requests, although the FileTransfer object itself + // will be reconstructed, the connection pointer itself will be lost. However, + // the FileTransfer object will still have the connection variable, even + // though the connection itself is now gone. So, although it's ugly, we have + // to unset the connection variable at this point so that the FileTransfer + // object will re-initiate the actual connection. unset($filetransfer->connection); if (!empty($context['results']['log'][$project]['#abort'])) { diff -u b/core/modules/update/update.compare.inc b/core/modules/update/update.compare.inc --- b/core/modules/update/update.compare.inc +++ b/core/modules/update/update.compare.inc @@ -390,14 +390,14 @@ * then the latest release from the previous patch level is recommended. For * example: * - * 1.6-bugfix <-- recommended version because 1.6 already exists. - * 1.6 + * - 1.6-bugfix <-- recommended version because 1.6 already exists. + * - 1.6 * * or * - * 1.6-beta - * 1.5 <-- recommended version because no 1.6 exists. - * 1.4 + * - 1.6-beta + * - 1.5 <-- recommended version because no 1.6 exists. + * - 1.4 * * It also looks for the latest release from the same major version, even a beta * release, to display to the user as the "Latest version" option. Additionally, diff -u b/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc --- b/core/modules/update/update.manager.inc +++ b/core/modules/update/update.manager.inc @@ -2,7 +2,7 @@ /** * @file - * Administrative screens and processing functions for the update manager. + * Administrative screens and processing functions of the Update Manager module. * * This allows site administrators with the 'administer software updates' * permission to either upgrade existing projects, or download and install new @@ -40,9 +40,9 @@ use Drupal\Core\FileTransfer\Local; /** - * @defgroup update_manager_update Update manager: update + * @defgroup update_manager_update Update Manager: update * @{ - * Update manager for updating existing code. + * Update Manager for updating existing code. * * Provides a user interface to update existing code. */ @@ -474,9 +474,9 @@ */ /** - * @defgroup update_manager_install Update manager: install + * @defgroup update_manager_install Update Manager: install * @{ - * Update manager for installing new code. + * Update Manager for installing new code. * * Provides a user interface to install new code. */ @@ -746,9 +746,9 @@ */ /** - * @defgroup update_manager_file Update manager: file management + * @defgroup update_manager_file Update Manager: file management * @{ - * Update manager file management functions. + * Update Manager file management functions. * * These functions are used by the update manager to copy, extract, and verify * archive files. @@ -765,7 +765,7 @@ * @return Archiver * The Archiver object used to extract the archive. * - * @throws Exception on failure. + * @throws Exception */ function update_manager_archive_extract($file, $directory) { $archiver = archiver_get_archiver($file); @@ -807,14 +807,13 @@ * @return array * An array of error messages to display if the archive was invalid. If there * are no errors, it will be an empty array. - * */ function update_manager_archive_verify($project, $archive_file, $directory) { return module_invoke_all('verify_update_archive', $project, $archive_file, $directory); } /** - * Copies a file from $url to the temporary directory for updates. + * Copies a file from the specified URL to the temporary directory for updates. * * Returns the local path if the file has already been downloaded. * diff -u b/core/modules/update/update.module b/core/modules/update/update.module --- b/core/modules/update/update.module +++ b/core/modules/update/update.module @@ -249,7 +249,7 @@ } /** - * Access callback: Determines if current user can access updater menu items. + * Access callback: Resolves if the current user can access updater menu items. * * It both enforces the 'administer software updates' permission and the global * kill switch for the authorize.php script. @@ -355,7 +355,7 @@ } /** - * Prints a warning message when there is no data about available updates. + * Returns a warning message when there is no data about available updates. */ function _update_no_data() { $destination = drupal_get_destination(); diff -u b/core/modules/update/update.test b/core/modules/update/update.test --- b/core/modules/update/update.test +++ b/core/modules/update/update.test @@ -2,21 +2,20 @@ /** * @file - * Tests for the Update Manager module. + * This file contains tests for the Update Manager module. * - * This file contains tests for the Update Manager module. The overarching - * methodology of these tests is we need to compare a given state of installed - * modules and themes (e.g., version, project grouping, timestamps, etc) against - * a current state of what the release history XML files we fetch say is - * available. We have dummy XML files (in the 'tests' subdirectory) that - * describe various scenarios of what's available for different test projects, - * and we have dummy .info file data (specified via hook_system_info_alter() in - * the update_test helper module) describing what's currently installed. Each - * test case defines a set of projects to install, their current state (via the - * 'update_test_system_info' variable) and the desired available update data - * (via the 'update_test_xml_map' variable), and then performs a series of - * assertions that the report matches our expectations given the specific - * initial state and availability scenario. + * The overarching methodology of these tests is we need to compare a given + * state of installed modules and themes (e.g., version, project grouping, + * timestamps, etc) against a current state of what the release history XML + * files we fetch say is available. We have dummy XML files (in the 'tests' + * subdirectory) that describe various scenarios of what's available for + * different test projects, and we have dummy .info file data (specified via + * hook_system_info_alter() in the update_test helper module) describing what's + * currently installed. Each test case defines a set of projects to install, + * their current state (via the 'update_test_system_info' variable) and the + * desired available update data (via the 'update_test_xml_map' variable), and + * then performs a series of assertions that the report matches our expectations + * given the specific initial state and availability scenario. */ /** @@ -37,7 +36,8 @@ * @see update_test_mock_page() */ protected function refreshUpdateStatus($xml_map, $url = 'update-test') { - // Tell update module to fetch from the URL provided by update_test module. + // Tell the Update Manager module to fetch from the URL provided by + // update_test module. variable_set('update_fetch_url', url($url, array('absolute' => TRUE))); // Save the map for update_test_mock_page() to use. variable_set('update_test_xml_map', $xml_map); @@ -64,7 +64,7 @@ public static function getInfo() { return array( 'name' => 'Update core functionality', - 'description' => 'Tests the update module through a series of functional tests using mock XML data.', + 'description' => 'Tests the Update Manager module through a series of functional tests using mock XML data.', 'group' => 'Update', ); } @@ -76,7 +76,7 @@ } /** - * Tests the update module when no updates are available. + * Tests the Update Manager module when no updates are available. */ function testNoUpdatesAvailable() { $this->setSystemInfo7_0(); @@ -88,7 +88,7 @@ } /** - * Tests the update module when one normal update ("7.1") is available. + * Tests the Update Manager module when one normal update is available. */ function testNormalUpdateAvailable() { $this->setSystemInfo7_0(); @@ -103,7 +103,7 @@ } /** - * Tests the update module when a security update ("7.2") is available. + * Tests the Update Manager module when a security update is available. */ function testSecurityUpdateAvailable() { $this->setSystemInfo7_0(); @@ -281,7 +281,7 @@ public static function getInfo() { return array( 'name' => 'Update contrib functionality', - 'description' => 'Tests how the update module handles contributed modules and themes in a series of functional tests using mock XML data.', + 'description' => 'Tests how the Update Manager module handles contributed modules and themes in a series of functional tests using mock XML data.', 'group' => 'Update', ); } @@ -648,7 +648,7 @@ public static function getInfo() { return array( 'name' => 'Upload and extract module functionality', - 'description' => 'Tests the update module\'s upload and extraction functionality.', + 'description' => 'Tests the Update Manager module\'s upload and extraction functionality.', 'group' => 'Update', ); } only in patch2: unchanged: --- a/core/modules/update/update-rtl.css +++ b/core/modules/update/update-rtl.css @@ -1,3 +1,7 @@ +/** + * @file + * RTL styles used by the Update Manager module. + */ .update .project { padding-right: .25em; only in patch2: unchanged: --- a/core/modules/update/update.css +++ b/core/modules/update/update.css @@ -1,3 +1,7 @@ +/** + * @file + * Styles used by the Update Manager module. + */ .update .project { font-weight: bold;