diff --git a/core/lib/Drupal/Core/Extension/Extension.php b/core/lib/Drupal/Core/Extension/Extension.php index 3c765fe..17d8b09 100644 --- a/core/lib/Drupal/Core/Extension/Extension.php +++ b/core/lib/Drupal/Core/Extension/Extension.php @@ -166,8 +166,9 @@ public function __call($method, array $args) { * Serializes the Extension object in the most optimized way. */ public function serialize() { + // Don't serialize the app root, since this could change if the install is + // moved. $data = array( - 'root' => $this->root, 'type' => $this->type, 'pathname' => $this->pathname, 'filename' => $this->filename, @@ -188,7 +189,8 @@ public function serialize() { */ public function unserialize($data) { $data = unserialize($data); - $this->root = $data['root']; + // Get the app root from the container. + $this->root = DRUPAL_ROOT; $this->type = $data['type']; $this->pathname = $data['pathname']; $this->filename = $data['filename']; diff --git a/core/lib/Drupal/Core/Update/UpdateKernel.php b/core/lib/Drupal/Core/Update/UpdateKernel.php index 6c5de73..de7da1b 100755 --- a/core/lib/Drupal/Core/Update/UpdateKernel.php +++ b/core/lib/Drupal/Core/Update/UpdateKernel.php @@ -10,10 +10,13 @@ use Drupal\Core\DrupalKernel; use Drupal\Core\Session\AnonymousUserSession; use Drupal\Core\Site\Settings; +use Drupal\system\Tests\Routing\MockRouteProvider; use Symfony\Cmf\Component\Routing\RouteObjectInterface; use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; +use Symfony\Component\Routing\Route; +use Symfony\Component\Routing\RouteCollection; /** * Defines a kernel which is used primarily to run the update of Drupal. diff --git a/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php b/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php index 4aa0ac0..0362390 100644 --- a/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php +++ b/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php @@ -32,6 +32,8 @@ protected function setDatabaseDumpFiles() { $this->databaseDumpFiles = [ __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz', __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.block-context-manager-2354889.php', + __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.language-enabled.php', + __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.block-test-enabled.php', ]; } diff --git a/core/modules/system/src/Controller/DbUpdateController.php b/core/modules/system/src/Controller/DbUpdateController.php index 28ab72b..e66a1a5 100644 --- a/core/modules/system/src/Controller/DbUpdateController.php +++ b/core/modules/system/src/Controller/DbUpdateController.php @@ -228,7 +228,8 @@ protected function info(Request $request) { '#type' => 'link', '#title' => $this->t('Continue'), '#attributes' => array('class' => array('button', 'button--primary')), - '#url' => Url::fromUri($request->getUriForPath('/selection')), + // @todo Revisit once https://www.drupal.org/node/2548095 is in. + '#url' => Url::fromUri('base://selection'), ); return $build; } @@ -484,6 +485,9 @@ protected function results(Request $request) { */ public function requirements($severity, array $requirements, Request $request) { $options = $severity == REQUIREMENT_WARNING ? array('continue' => 1) : array(); + // @todo Revisit once https://www.drupal.org/node/2548095 is in. Something + // like Url::fromRoute('system.db_update')->setOptions ... should then be + // possible. $try_again_url = Url::fromUri($request->getUriForPath(''))->setOptions(['query' => $options])->toString(TRUE)->getGeneratedUrl(); $build['status_report'] = array( @@ -580,7 +584,8 @@ protected function triggerBatch(Request $request) { ); batch_set($batch); - return batch_process(Url::fromUri($request->getUriForPath('/results')), Url::fromUri($request->getUriForPath('/start'))); + // @todo Revisit once https://www.drupal.org/node/2548095 is in. + return batch_process(Url::fromUri('base://results'), Url::fromUri('base://start')); } /** diff --git a/core/modules/system/src/Tests/Update/UpdatePathTestBase.php b/core/modules/system/src/Tests/Update/UpdatePathTestBase.php index c5197a2..fc8d4c3 100644 --- a/core/modules/system/src/Tests/Update/UpdatePathTestBase.php +++ b/core/modules/system/src/Tests/Update/UpdatePathTestBase.php @@ -179,16 +179,15 @@ protected function setUp() { // Add the config directories to settings.php. drupal_install_config_directories(); - // Install any additional modules. - $this->installModulesFromClassProperty($container); - // Restore the original Simpletest batch. $this->restoreBatch(); - // Rebuild and reset. - $this->rebuildAll(); + // Set the container. parent::rebuildAll() would normally do this, but this + // not safe to do here, because the database has not been updated yet. + $this->container = \Drupal::getContainer(); // Replace User 1 with the user created here. + // @todo: do this without saving the user account. /** @var \Drupal\user\UserInterface $account */ $account = User::load(1); $account->setPassword($this->rootUser->pass_raw); @@ -267,25 +266,4 @@ protected function runUpdates() { $this->assertFalse(\Drupal::service('entity.definition_update_manager')->needsUpdates(), 'After all updates ran, entity schema is up to date.'); } - /** - * {@inheritdoc} - */ - protected function rebuildAll() { - // We know the rebuild causes notices, so don't exit on failure. - $die_on_fail = $this->dieOnFail; - $this->dieOnFail = FALSE; - parent::rebuildAll(); - - // Remove the notices we get due to the menu link rebuild prior to running - // the system updates for the schema change. - foreach ($this->assertions as $key => $assertion) { - if ($assertion['message_group'] == 'Notice' && basename($assertion['file']) == 'MenuTreeStorage.php' && strpos($assertion['message'], 'unserialize(): Error at offset 0') !== FALSE) { - unset($this->assertions[$key]); - $this->deleteAssert($assertion['message_id']); - $this->results['#exception']--; - } - } - $this->dieOnFail = $die_on_fail; - } - } diff --git a/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php b/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php index 30ed37d..623a400 100644 --- a/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php +++ b/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php @@ -18,6 +18,7 @@ class UpdatePathTestBaseFilledTest extends UpdatePathTestBaseTest { * {@inheritdoc} */ protected function setDatabaseDumpFiles() { + parent::setDatabaseDumpFiles(); $this->databaseDumpFiles[0] = __DIR__ . '/../../../tests/fixtures/update/drupal-8.filled.standard.php.gz'; } diff --git a/core/modules/system/src/Tests/Update/UpdatePathTestBaseTest.php b/core/modules/system/src/Tests/Update/UpdatePathTestBaseTest.php index 28e003a..65e0b21 100644 --- a/core/modules/system/src/Tests/Update/UpdatePathTestBaseTest.php +++ b/core/modules/system/src/Tests/Update/UpdatePathTestBaseTest.php @@ -25,7 +25,10 @@ class UpdatePathTestBaseTest extends UpdatePathTestBase { * {@inheritdoc} */ protected function setDatabaseDumpFiles() { - $this->databaseDumpFiles = [__DIR__ . '/../../../tests/fixtures/update/drupal-8.bare.standard.php.gz']; + $this->databaseDumpFiles = [ + __DIR__ . '/../../../tests/fixtures/update/drupal-8.bare.standard.php.gz', + __DIR__ . '/../../../tests/fixtures/update/drupal-8.update-test-schema-enabled.php', + ]; } /** diff --git a/core/modules/system/system.module b/core/modules/system/system.module index b1bdee7..923e722 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -241,7 +241,7 @@ function system_theme_suggestions_html(array $variables) { $path_args = ['']; } else { - $path_args = explode('/', Url::fromRoute('')->getInternalPath()); + $path_args = explode('/', ltrim(\Drupal::service('path.current')->getPath(), '/')); } return theme_get_suggestions($path_args, 'html'); } diff --git a/core/modules/system/tests/fixtures/update/drupal-8.block-test-enabled.php b/core/modules/system/tests/fixtures/update/drupal-8.block-test-enabled.php new file mode 100644 index 0000000..990278d --- /dev/null +++ b/core/modules/system/tests/fixtures/update/drupal-8.block-test-enabled.php @@ -0,0 +1,49 @@ +insert('key_value') + ->fields([ + 'collection' => 'system.schema', + 'name' => 'block_test', + 'value' => 'i:8000;', + ]) + ->execute(); + +// Update core.extension. +$extensions = $connection->select('config') + ->fields('config', ['data']) + ->condition('collection', '') + ->condition('name', 'core.extension') + ->execute() + ->fetchField(); +$extensions = unserialize($extensions); +$extensions['module']['block_test'] = 8000; +$connection->update('config') + ->fields([ + 'data' => serialize($extensions), + ]) + ->condition('collection', '') + ->condition('name', 'core.extension') + ->execute(); + +// Install the block configuration. +$config = file_get_contents(__DIR__ . '/../../../../block/tests/modules/block_test/config/install/block.block.test_block.yml'); +$config = Yaml::parse($config); +$connection->insert('config') + ->fields(['data', 'name', 'collection']) + ->values([ + 'name' => 'block.block.test_block', + 'data' => serialize($config), + 'collection' => '', + ]) + ->execute(); diff --git a/core/modules/system/tests/fixtures/update/drupal-8.language-enabled.php b/core/modules/system/tests/fixtures/update/drupal-8.language-enabled.php new file mode 100644 index 0000000..6be5c24 Binary files /dev/null and b/core/modules/system/tests/fixtures/update/drupal-8.language-enabled.php differ diff --git a/core/modules/system/tests/fixtures/update/drupal-8.update-test-schema-enabled.php b/core/modules/system/tests/fixtures/update/drupal-8.update-test-schema-enabled.php new file mode 100644 index 0000000..7250741 --- /dev/null +++ b/core/modules/system/tests/fixtures/update/drupal-8.update-test-schema-enabled.php @@ -0,0 +1,54 @@ +schema()->createTable('update_test_schema_table', array( + 'fields' => array( + 'a' => array( + 'type' => 'int', + 'not null' => TRUE, + 'size' => 'normal', + ), + 'b' => array( + 'type' => 'blob', + 'not null' => FALSE, + 'size' => 'normal', + ), + ), +)); + +// Set the schema version. +$connection->merge('key_value') + ->condition('collection', 'system.schema') + ->condition('name', 'update_test_schema') + ->fields([ + 'collection' => 'system.schema', + 'name' => 'update_test_schema', + 'value' => 'i:8000;', + ]) + ->execute(); + +// Update core.extension. +$extensions = $connection->select('config') + ->fields('config', ['data']) + ->condition('collection', '') + ->condition('name', 'core.extension') + ->execute() + ->fetchField(); +$extensions = unserialize($extensions); +$extensions['module']['update_test_schema'] = 8000; +$connection->update('config') + ->fields([ + 'data' => serialize($extensions), + ]) + ->condition('collection', '') + ->condition('name', 'core.extension') + ->execute();