diff --git a/core/includes/batch.inc b/core/includes/batch.inc index 0b07d8e..3bb90ab 100644 --- a/core/includes/batch.inc +++ b/core/includes/batch.inc @@ -480,18 +480,17 @@ function _batch_finished() { $queue->deleteQueue(); } } + // Clean-up the session. Not needed for CLI updates. + if (isset($_SESSION)) { + unset($_SESSION['batches'][$batch['id']]); + if (empty($_SESSION['batches'])) { + unset($_SESSION['batches']); + } + } } $_batch = $batch; $batch = NULL; - // Clean-up the session. Not needed for CLI updates. - if (isset($_SESSION)) { - unset($_SESSION['batches'][$batch['id']]); - if (empty($_SESSION['batches'])) { - unset($_SESSION['batches']); - } - } - // Redirect if needed. if ($_batch['progressive']) { // Revert the 'destination' that was saved in batch_process(). diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 95adc95..23135cf 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -2575,7 +2575,12 @@ function drupal_fast_404() { * Returns TRUE if a Drupal installation is currently being attempted. */ function drupal_installation_attempted() { - return defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'install'; + // This cannot rely on the MAINTENANCE_MODE constant, since that would prevent + // tests from using the non-interactive installer, in which case Drupal is + // only happens to be installed within the same request, but subsequently + // executed code does not involve the installer at all. + // @see install_drupal() + return isset($GLOBALS['install_state']) && empty($GLOBALS['install_state']['installation_finished']); } /** diff --git a/core/includes/cache.inc b/core/includes/cache.inc index 73bb05f..554fe95 100644 --- a/core/includes/cache.inc +++ b/core/includes/cache.inc @@ -24,13 +24,12 @@ * @see Drupal\Core\Cache\CacheBackendInterface */ function cache($bin = 'cache') { + $cache_objects = &drupal_static(__FUNCTION__, array()); + // Temporary backwards compatibiltiy layer, allow old style prefixed cache // bin names to be passed as arguments. $bin = str_replace('cache_', '', $bin); - // We do not use drupal_static() here because we do not want to change the - // storage of a cache bin mid-request. - static $cache_objects; if (!isset($cache_objects[$bin])) { $cache_backends = cache_get_backends(); $class = isset($cache_backends[$bin]) ? $cache_backends[$bin] : $cache_backends['cache']; diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 32ce838..5608216 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -94,19 +94,27 @@ function install_drupal($settings = array()) { throw $e; } } + // After execution, all tasks might be complete, in which case + // $install_state['installation_finished'] is TRUE. In case the last task + // has been processed, remove the global $install_state, so other code can + // reliably check whether it is running during the installer. + // @see drupal_installation_attempted() + $state = $install_state; + unset($install_state); + // All available tasks for this page request are now complete. Interactive // installations can send output to the browser or redirect the user to the // next page. - if ($install_state['interactive']) { - if ($install_state['parameters_changed']) { + if ($state['interactive']) { + if ($state['parameters_changed']) { // Redirect to the correct page if the URL parameters have changed. - install_goto(install_redirect_url($install_state)); + install_goto(install_redirect_url($state)); } elseif (isset($output)) { // Display a page only if some output is available. Otherwise it is // possible that we are printing a JSON page and theme output should // not be shown. - install_display_output($output, $install_state); + install_display_output($output, $state); } } } @@ -224,7 +232,9 @@ function install_state_defaults() { */ function install_begin_request(&$install_state) { // Add any installation parameters passed in via the URL. - $install_state['parameters'] += $_GET; + if ($install_state['interactive']) { + $install_state['parameters'] += $_GET; + } // Validate certain core settings that are used throughout the installation. if (!empty($install_state['parameters']['profile'])) { @@ -240,11 +250,10 @@ function install_begin_request(&$install_state) { if (!$install_state['interactive']) { drupal_override_server_variables($install_state['server']); } - // The user agent header is used to pass a database prefix in the request when // running tests. However, for security reasons, it is imperative that no // installation be permitted using such a prefix. - if (isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], "simpletest") !== FALSE) { + elseif (isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], "simpletest") !== FALSE) { header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden'); exit; } @@ -1331,7 +1340,7 @@ function install_select_language(&$install_state) { } // One language, but not an interactive installation. Assume the user // knows what he is doing. - $langcode = current($files); + $file = current($files); $install_state['parameters']['langcode'] = $file->langcode; return; } diff --git a/core/includes/session.inc b/core/includes/session.inc index b07997c..5761dc9 100644 --- a/core/includes/session.inc +++ b/core/includes/session.inc @@ -348,6 +348,12 @@ function drupal_session_started($set = NULL) { */ function drupal_session_regenerate() { global $user, $is_https; + + // Nothing to do if we are not allowed to change the session. + if (!drupal_save_session()) { + return; + } + if ($is_https && variable_get('https', FALSE)) { $insecure_session_name = substr(session_name(), 1); if (!isset($GLOBALS['lazy_session']) && isset($_COOKIE[$insecure_session_name])) { @@ -417,6 +423,11 @@ function drupal_session_regenerate() { function _drupal_session_destroy($sid) { global $user, $is_https; + // Nothing to do if we are not allowed to change the session. + if (!drupal_save_session()) { + return; + } + // Delete session data. db_delete('sessions') ->condition($is_https ? 'ssid' : 'sid', $sid) @@ -464,6 +475,11 @@ function _drupal_session_delete_cookie($name, $secure = NULL) { * User ID. */ function drupal_session_destroy_uid($uid) { + // Nothing to do if we are not allowed to change the session. + if (!drupal_save_session()) { + return; + } + db_delete('sessions') ->condition('uid', $uid) ->execute(); @@ -506,7 +522,10 @@ function _drupal_session_garbage_collection($lifetime) { * FALSE if writing session data has been disabled. Otherwise, TRUE. */ function drupal_save_session($status = NULL) { - $save_session = &drupal_static(__FUNCTION__, TRUE); + // PHP session ID, session, and cookie handling happens in the global scope. + // This value has to persist across calls to drupal_static_reset(), since a + // potentially wrong or disallowed session would be written otherwise. + static $save_session = TRUE; if (isset($status)) { $save_session = $status; } diff --git a/core/modules/block/block.install b/core/modules/block/block.install index 8fcecbe..d3dab51 100644 --- a/core/modules/block/block.install +++ b/core/modules/block/block.install @@ -74,7 +74,8 @@ function block_schema() { ), 'pages' => array( 'type' => 'text', - 'not null' => TRUE, + // @todo Block module saves empty strings instead of NULL. + 'not null' => FALSE, 'description' => 'Contents of the "Pages" block; contains either a list of paths on which to include/exclude the block or PHP code, depending on "visibility" setting.', ), 'title' => array( @@ -312,6 +313,17 @@ function block_update_8002() { } /** + * Make {block}.pages optional. + */ +function block_update_8003() { + db_change_field('block', 'pages', 'pages', array( + 'type' => 'text', + 'not null' => FALSE, + 'description' => 'Contents of the "Pages" block; contains either a list of paths on which to include/exclude the block or PHP code, depending on "visibility" setting.', + )); +} + +/** * @} End of "addtogroup updates-7.x-to-8.x". * The next series of updates should start at 9000. */ diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 3db5bbd..83c4483 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -3988,6 +3988,9 @@ function node_unpublish_by_keyword_action(Node $node, $context) { */ function node_requirements($phase) { $requirements = array(); + if ($phase !== 'runtime') { + return $requirements; + } // Ensure translations don't break at install time $t = get_t(); // Only show rebuild button if there are either 0, or 2 or more, rows diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php index 6517bd1..b24fb8f 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php @@ -150,15 +150,7 @@ abstract class TestBase { ); // Store assertion for display after the test has completed. - try { - $connection = Database::getConnection('default', 'simpletest_original_default'); - } - catch (ConnectionNotDefinedException $e) { - // If the test was not set up, the simpletest_original_default - // connection does not exist. - $connection = Database::getConnection('default', 'default'); - } - $connection + self::getDatabaseConnection() ->insert('simpletest') ->fields($assertion) ->execute(); @@ -212,7 +204,8 @@ abstract class TestBase { 'file' => $caller['file'], ); - return db_insert('simpletest') + return self::getDatabaseConnection() + ->insert('simpletest') ->fields($assertion) ->execute(); } @@ -228,11 +221,24 @@ abstract class TestBase { * @see Drupal\simpletest\TestBase::insertAssert() */ public static function deleteAssert($message_id) { - return (bool) db_delete('simpletest') + return (bool) self::getDatabaseConnection() + ->delete('simpletest') ->condition('message_id', $message_id) ->execute(); } + public static function getDatabaseConnection() { + try { + $connection = Database::getConnection('default', 'simpletest_original_default'); + } + catch (ConnectionNotDefinedException $e) { + // If the test was not set up, the simpletest_original_default + // connection does not exist. + $connection = Database::getConnection('default', 'default'); + } + return $connection; + } + /** * Cycles through backtrace until the first non-assertion method is found. * @@ -593,6 +599,14 @@ abstract class TestBase { ); } Database::addConnectionInfo('default', 'default', $connection_info['default']); + + // Additionally override global $databases, since the installer does not use + // the Database connection info. + // @see install_verify_database_settings() + // @see install_database_errors() + // @todo Fix installer to use Database connection info. + global $databases; + $databases['default']['default'] = $connection_info['default']; } /** @@ -622,7 +636,10 @@ abstract class TestBase { // Save further contextual information. $this->originalFileDirectory = variable_get('file_public_path', conf_path() . '/files'); $this->originalProfile = drupal_get_profile(); - $this->originalUser = $user; + $this->originalUser = clone $user; + + // Ensure that the current session is not changed by the new environment. + drupal_save_session(FALSE); // Save and clean the shutdown callbacks array because it is static cached // and will be changed by the test run. Otherwise it will contain callbacks @@ -692,6 +709,10 @@ abstract class TestBase { // Restore original database connection. Database::removeConnection('default'); Database::renameConnection('simpletest_original_default', 'default'); + // @see TestBase::changeDatabasePrefix() + global $databases; + $connection_info = Database::getConnectionInfo('default'); + $databases['default']['default'] = $connection_info['default']; // Reset all static variables. drupal_static_reset(); diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php index 0856611..5e7ae5a 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php @@ -581,6 +581,13 @@ abstract class WebTestBase extends TestBase { global $user, $conf; $language_interface = drupal_container()->get(LANGUAGE_TYPE_INTERFACE); + // When running tests through the Simpletest UI (vs. on the command line), + // Simpletest's batch conflicts with the installer's batch. Batch API does + // not support the concept of nested batches (in which the nested is not + // progressive), so we need to temporarily pretend there was no batch. + // Backup the currently running Simpletest batch. + $this->originalBatch = batch_get(); + // Create the database prefix for this test. $this->prepareDatabasePrefix(); @@ -597,18 +604,77 @@ abstract class WebTestBase extends TestBase { // write back to persistent caches when they are destructed. $this->changeDatabasePrefix(); - // Preset the 'install_profile' system variable, so the first call into - // system_rebuild_module_data() (in drupal_install_system()) will register - // the test's profile as a module. Without this, the installation profile of - // the parent site (executing the test) is registered, and the test - // profile's hook_install() and other hook implementations are never invoked. - $conf['install_profile'] = $this->profile; + // Set the 'simpletest_parent_profile' variable to add the parent profile's + // search path to the child site's search paths. + // @see drupal_system_listing() + $conf['simpletest_parent_profile'] = $this->originalProfile; - // Perform the actual Drupal installation. - include_once DRUPAL_ROOT . '/core/includes/install.inc'; - drupal_install_system(); + // Set installer parameters. + // @see install.php, install.core.inc + $connection_info = Database::getConnectionInfo('default'); + $this->root_user = (object) array( + 'name' => 'admin', + 'mail' => 'admin@example.com', + 'pass_raw' => $this->randomName(), + ); + $settings = array( + 'interactive' => FALSE, + 'parameters' => array( + 'profile' => $this->profile, + 'langcode' => 'en', + ), + 'forms' => array( + 'install_settings_form' => array( + 'driver' => $connection_info['default']['driver'], + 'username' => $connection_info['default']['username'], + 'host' => $connection_info['default']['host'], + 'port' => $connection_info['default']['port'], + 'password' => $connection_info['default']['password'], + 'database' => $connection_info['default']['database'], + 'prefix' => $connection_info['default']['prefix'], + ), + 'install_configure_form' => array( + 'site_name' => 'Drupal', + 'site_mail' => 'simpletest@example.com', + 'account' => array( + 'name' => $this->root_user->name, + 'mail' => $this->root_user->mail, + 'pass' => array( + 'pass1' => $this->root_user->pass_raw, + 'pass2' => $this->root_user->pass_raw, + ), + ), + // form_type_checkboxes_value() requires NULL instead of FALSE values + // for programmatic form submissions to disable a checkbox. + 'update_status_module' => array( + 1 => NULL, + 2 => NULL, + ), + ), + ), + ); - $this->preloadRegistry(); + // Replace the global $user session with an anonymous user to resemble a + // regular installation. + $user = drupal_anonymous_user(); + + // Reset the static batch to remove Simpletest's batch operations. + $batch = &batch_get(); + $batch = array(); + + // Execute the non-interactive installer. + require_once DRUPAL_ROOT . '/core/includes/install.core.inc'; + install_drupal($settings); + // Ensure that the session is not changed by the new environment. + drupal_save_session(FALSE); + + // Restore the original Simpletest batch. + $batch = &batch_get(); + $batch = $this->originalBatch; + + // Revert install_begin_request() cache and lock service overrides. + unset($conf['cache_classes']); + unset($conf['lock_backend']); // Set path variables. variable_set('file_public_path', $this->public_files_directory); @@ -618,16 +684,8 @@ abstract class WebTestBase extends TestBase { // Set the 'simpletest_parent_profile' variable to add the parent profile's // search path to the child site's search paths. // @see drupal_system_listing() - // @todo This may need to be primed like 'install_profile' above. variable_set('simpletest_parent_profile', $this->originalProfile); - // Include the testing profile. - variable_set('install_profile', $this->profile); - $profile_details = install_profile_info($this->profile, 'en'); - - // Install the modules specified by the testing profile. - module_enable($profile_details['dependencies'], FALSE); - // Install modules needed for this test. This could have been passed in as // either a single array argument or a variable number of string arguments. // @todo Remove this compatibility layer in Drupal 8, and only accept @@ -641,36 +699,9 @@ abstract class WebTestBase extends TestBase { $this->assertTrue($success, t('Enabled modules: %modules', array('%modules' => implode(', ', $modules)))); } - // Run the profile tasks. - $install_profile_module_exists = db_query("SELECT 1 FROM {system} WHERE type = 'module' AND name = :name", array( - ':name' => $this->profile, - ))->fetchField(); - if ($install_profile_module_exists) { - module_enable(array($this->profile), FALSE); - } - // Reset/rebuild all data structures after enabling the modules. $this->resetAll(); - // Run cron once in that environment, as install.php does at the end of - // the installation process. - drupal_cron_run(); - - // Ensure that the session is not written to the new environment and replace - // the global $user session with uid 1 from the new test site. - drupal_save_session(FALSE); - // Login as uid 1. - $user = user_load(1); - - // Restore necessary variables. - variable_set('install_task', 'done'); - config('system.site')->set('mail', 'simpletest@example.com')->save(); - variable_set('date_default_timezone', date_default_timezone_get()); - - // Set up English language. - unset($conf['language_default']); - $language_interface = language_default(); - // Use the test mail class instead of the default mail handler class. variable_set('mail_system', array('default-system' => 'Drupal\Core\Mail\VariableLog')); @@ -679,42 +710,6 @@ abstract class WebTestBase extends TestBase { } /** - * Preload the registry from the testing site. - * - * This method is called by Drupal\simpletest\WebTestBase::setUp(), and preloads - * the registry from the testing site to cut down on the time it takes to - * set up a clean environment for the current test run. - */ - protected function preloadRegistry() { - // Use two separate queries, each with their own connections: copy the - // {registry} and {registry_file} tables over from the parent installation - // to the child installation. - $original_connection = Database::getConnection('default', 'simpletest_original_default'); - $test_connection = Database::getConnection(); - - foreach (array('registry', 'registry_file') as $table) { - // Find the records from the parent database. - $source_query = $original_connection - ->select($table, array(), array('fetch' => PDO::FETCH_ASSOC)) - ->fields($table); - - $dest_query = $test_connection->insert($table); - - $first = TRUE; - foreach ($source_query->execute() as $row) { - if ($first) { - $dest_query->fields(array_keys($row)); - $first = FALSE; - } - // Insert the records into the child database. - $dest_query->values($row); - } - - $dest_query->execute(); - } - } - - /** * Reset all data structures after having enabled new modules. * * This method is called by Drupal\simpletest\WebTestBase::setUp() after enabling