From ac1758697335c3d9e5950c9ad65dd43aa345f0b5 Mon Sep 17 00:00:00 2001
From: webchick <drupal@webchick.net>
Date: Tue, 18 Aug 2015 14:25:32 -0400
Subject: [PATCH] Issue #2409441 by phenaproxima, quietone, oadaeh, mikeryan:
 Migration path for Text 7.x

---
 core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php | 5 ++++-
 .../migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php      | 2 +-
 .../{d6_text_settings.yml => text_settings.yml}             | 5 +++--
 .../src/Tests/Migrate/{d6 => }/MigrateTextConfigsTest.php   | 6 +++---
 4 files changed, 11 insertions(+), 7 deletions(-)
 rename core/modules/text/migration_templates/{d6_text_settings.yml => text_settings.yml} (72%)
 rename core/modules/text/src/Tests/Migrate/{d6 => }/MigrateTextConfigsTest.php (84%)

diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
index 64e34d1e2b9..0591deb9bab 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
@@ -358,6 +358,9 @@ class Variable extends DrupalDumpBase {
     ))->values(array(
       'name' => 'syslog_identity',
       'value' => 's:6:"drupal";',
+    ))->values(array(
+      'name' => 'teaser_length',
+      'value' => 'i:1024;',
     ))->values(array(
       'name' => 'theme_default',
       'value' => 's:6:"bartik";',
@@ -476,4 +479,4 @@ class Variable extends DrupalDumpBase {
   }
 
 }
-#a571d354b6652603b017f9647ce0975e
+#dbc0f593050ff48cc18dfa4fed47daaf
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
index 9f3482ce734..b6ae809f6a4 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
@@ -133,7 +133,7 @@ class MigrateDrupal6Test extends MigrateFullDrupalTestBase {
     'd6_taxonomy_vocabulary',
     'd6_term_node_revision:*',
     'd6_term_node:*',
-    'd6_text_settings',
+    'text_settings',
     'd6_update_settings',
     'd6_upload_entity_display',
     'd6_upload_entity_form_display',
diff --git a/core/modules/text/migration_templates/d6_text_settings.yml b/core/modules/text/migration_templates/text_settings.yml
similarity index 72%
rename from core/modules/text/migration_templates/d6_text_settings.yml
rename to core/modules/text/migration_templates/text_settings.yml
index 8f6fff30b55..45d426da353 100644
--- a/core/modules/text/migration_templates/d6_text_settings.yml
+++ b/core/modules/text/migration_templates/text_settings.yml
@@ -1,7 +1,8 @@
-id: d6_text_settings
-label: Drupal 6 teaser length configuration
+id: text_settings
+label: Drupal teaser length configuration
 migration_tags:
   - Drupal 6
+  - Drupal 7
 source:
   plugin: variable
   variables:
diff --git a/core/modules/text/src/Tests/Migrate/d6/MigrateTextConfigsTest.php b/core/modules/text/src/Tests/Migrate/MigrateTextConfigsTest.php
similarity index 84%
rename from core/modules/text/src/Tests/Migrate/d6/MigrateTextConfigsTest.php
rename to core/modules/text/src/Tests/Migrate/MigrateTextConfigsTest.php
index 440ffc018b0..0fbc1e9c921 100644
--- a/core/modules/text/src/Tests/Migrate/d6/MigrateTextConfigsTest.php
+++ b/core/modules/text/src/Tests/Migrate/MigrateTextConfigsTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\text\Tests\Migrate\d6\MigrateTextConfigsTest.
+ * Contains \Drupal\text\Tests\Migrate\MigrateTextConfigsTest.
  */
 
-namespace Drupal\text\Tests\Migrate\d6;
+namespace Drupal\text\Tests\Migrate;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
@@ -31,7 +31,7 @@ class MigrateTextConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->executeMigration('d6_text_settings');
+    $this->executeMigration('text_settings');
   }
 
   /**