opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.2.2. For more information, see https://www.drupal.org/project/drupal/releases/8.2.2

Browse source
This commit is contained in:
Pantheon Automation 2016-11-02 11:43:31 -07:00 • committed by Greg Anderson
parent 23ffed3665
commit 507b45a0ed
378 changed files with 11434 additions and 5542 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
View file

@ -290,7 +290,7 @@ class MigrateUpgradeForm extends ConfirmFormBase {
'source_module' => 'locale',
'destination_module' => 'locale',
],
'menu_links' => [
'd6_menu_links' => [
'source_module' => 'menu',
'destination_module' => 'menu_link_content',
],
@ -298,13 +298,17 @@ class MigrateUpgradeForm extends ConfirmFormBase {
'source_module' => 'menu',
'destination_module' => 'menu_ui',
],
'd7_menu_links' => [
'source_module' => 'menu',
'destination_module' => 'menu_link_content',
],
'd6_node' => [
'source_module' => 'node',
'destination_module' => 'node',
],
'd6_node_translation' => [
'source_module' => 'node',
'destination_module' => 'node',
'source_module' => 'translation',
'destination_module' => 'content_translation',
],
'd6_node_revision' => [
'source_module' => 'node',
@ -474,7 +478,11 @@ class MigrateUpgradeForm extends ConfirmFormBase {
'source_module' => 'system',
'destination_module' => 'system',
],
'menu' => [
'd6_menu' => [
'source_module' => 'menu',
'destination_module' => 'system',
],
'd7_menu' => [
'source_module' => 'menu',
'destination_module' => 'system',
],
@ -690,7 +698,7 @@ class MigrateUpgradeForm extends ConfirmFormBase {
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state) {
$step = $form_state->getValue('step', 'overview');
$step = $form_state->get('step') ?: 'overview';
switch ($step) {
case 'overview':
return $this->buildOverviewForm($form, $form_state);
@ -788,7 +796,7 @@ class MigrateUpgradeForm extends ConfirmFormBase {
* The current state of the form.
*/
public function submitOverviewForm(array &$form, FormStateInterface $form_state) {
$form_state->setValue('step', 'credentials');
$form_state->set('step', 'credentials');
$form_state->setRebuild();
}
@ -977,7 +985,7 @@ class MigrateUpgradeForm extends ConfirmFormBase {
*/
public function submitCredentialForm(array &$form, FormStateInterface $form_state) {
// Indicate the next step is confirmation.
$form_state->setValue('step', 'confirm');
$form_state->set('step', 'confirm');
$form_state->setRebuild();
}

12
core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
View file

@ -43,7 +43,7 @@ class MigrateUpgrade7Test extends MigrateUpgradeTestBase {
'configurable_language' => 4,
'contact_form' => 3,
'editor' => 2,
'field_config' => 44,
'field_config' => 45,
'field_storage_config' => 33,
'file' => 1,
'filter_format' => 7,
@ -56,14 +56,14 @@ class MigrateUpgrade7Test extends MigrateUpgradeTestBase {
'search_page' => 2,
'shortcut' => 6,
'shortcut_set' => 2,
'action' => 18,
'menu' => 10,
'action' => 16,
'menu' => 6,
'taxonomy_term' => 18,
'taxonomy_vocabulary' => 3,
'tour' => 4,
'user' => 3,
'user_role' => 4,
'menu_link_content' => 9,
'user' => 4,
'user_role' => 3,
'menu_link_content' => 7,
'view' => 12,
'date_format' => 11,
'entity_form_display' => 16,