diff --git a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6DumpBase.php b/core/modules/migrate_drupal/src/Tests/Dump/DrupalDumpBase.php similarity index 93% rename from core/modules/migrate_drupal/src/Tests/Dump/Drupal6DumpBase.php rename to core/modules/migrate_drupal/src/Tests/Dump/DrupalDumpBase.php index 6b97f39..6b62d77 100644 --- a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6DumpBase.php +++ b/core/modules/migrate_drupal/src/Tests/Dump/DrupalDumpBase.php @@ -2,7 +2,7 @@ /** * @file - * Contains \Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase. + * Contains \Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase. */ namespace Drupal\migrate_drupal\Tests\Dump; @@ -12,7 +12,7 @@ /** * Base class for the dump classes. */ -class Drupal6DumpBase { +class DrupalDumpBase { /** * The database connection. diff --git a/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php index 956a4e6..8cab8a5 100644 --- a/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php +++ b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php @@ -9,11 +9,12 @@ use Drupal\migrate\MigrateExecutable; use Drupal\simpletest\TestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Test helper for running a complete Drupal migration. */ -abstract class MigrateFullDrupalTestBase extends MigrateDrupalTestBase { +abstract class MigrateFullDrupalTestBase extends MigrateDrupal6TestBase { /** * Get the dump classes required for this migration test. diff --git a/core/modules/migrate_drupal/src/Tests/Table/Access.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Access.php similarity index 89% rename from core/modules/migrate_drupal/src/Tests/Table/Access.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Access.php index 5f2ef93..4806137 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Access.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Access.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the access table. */ -class Access extends Drupal6DumpBase { +class Access extends DrupalDumpBase { public function load() { $this->createTable("access", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Actions.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Actions.php similarity index 96% rename from core/modules/migrate_drupal/src/Tests/Table/Actions.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Actions.php index 3573edf..f4ca80c 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Actions.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Actions.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the actions table. */ -class Actions extends Drupal6DumpBase { +class Actions extends DrupalDumpBase { public function load() { $this->createTable("actions", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/ActionsAid.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ActionsAid.php similarity index 83% rename from core/modules/migrate_drupal/src/Tests/Table/ActionsAid.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/ActionsAid.php index 750f1a3..fe8ac79 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/ActionsAid.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ActionsAid.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the actions_aid table. */ -class ActionsAid extends Drupal6DumpBase { +class ActionsAid extends DrupalDumpBase { public function load() { $this->createTable("actions_aid", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/AggregatorCategory.php b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorCategory.php similarity index 88% rename from core/modules/migrate_drupal/src/Tests/Table/AggregatorCategory.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorCategory.php index 924885e..8a9bf23 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/AggregatorCategory.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorCategory.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the aggregator_category table. */ -class AggregatorCategory extends Drupal6DumpBase { +class AggregatorCategory extends DrupalDumpBase { public function load() { $this->createTable("aggregator_category", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/AggregatorFeed.php b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorFeed.php similarity index 95% rename from core/modules/migrate_drupal/src/Tests/Table/AggregatorFeed.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorFeed.php index 20d06e5..0df9d0a 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/AggregatorFeed.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorFeed.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the aggregator_feed table. */ -class AggregatorFeed extends Drupal6DumpBase { +class AggregatorFeed extends DrupalDumpBase { public function load() { $this->createTable("aggregator_feed", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/AggregatorItem.php b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorItem.php similarity index 93% rename from core/modules/migrate_drupal/src/Tests/Table/AggregatorItem.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorItem.php index ec8e640..d818fc8 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/AggregatorItem.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorItem.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the aggregator_item table. */ -class AggregatorItem extends Drupal6DumpBase { +class AggregatorItem extends DrupalDumpBase { public function load() { $this->createTable("aggregator_item", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Authmap.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Authmap.php similarity index 89% rename from core/modules/migrate_drupal/src/Tests/Table/Authmap.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Authmap.php index d9b591b..0c1944b 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Authmap.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Authmap.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the authmap table. */ -class Authmap extends Drupal6DumpBase { +class Authmap extends DrupalDumpBase { public function load() { $this->createTable("authmap", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Batch.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Batch.php similarity index 88% rename from core/modules/migrate_drupal/src/Tests/Table/Batch.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Batch.php index 8e85e2d..da7cec7 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Batch.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Batch.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the batch table. */ -class Batch extends Drupal6DumpBase { +class Batch extends DrupalDumpBase { public function load() { $this->createTable("batch", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Blocks.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Blocks.php similarity index 98% rename from core/modules/migrate_drupal/src/Tests/Table/Blocks.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Blocks.php index 634644b..8bc1172 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Blocks.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Blocks.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the blocks table. */ -class Blocks extends Drupal6DumpBase { +class Blocks extends DrupalDumpBase { public function load() { $this->createTable("blocks", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/BlocksRoles.php b/core/modules/migrate_drupal/src/Tests/Table/d6/BlocksRoles.php similarity index 87% rename from core/modules/migrate_drupal/src/Tests/Table/BlocksRoles.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/BlocksRoles.php index e69bcb7..468d572 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/BlocksRoles.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/BlocksRoles.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the blocks_roles table. */ -class BlocksRoles extends Drupal6DumpBase { +class BlocksRoles extends DrupalDumpBase { public function load() { $this->createTable("blocks_roles", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Book.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Book.php similarity index 91% rename from core/modules/migrate_drupal/src/Tests/Table/Book.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Book.php index 696efc2..cf28c04 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Book.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Book.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the book table. */ -class Book extends Drupal6DumpBase { +class Book extends DrupalDumpBase { public function load() { $this->createTable("book", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Boxes.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Boxes.php similarity index 91% rename from core/modules/migrate_drupal/src/Tests/Table/Boxes.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Boxes.php index a3fd609..38ffabb 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Boxes.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Boxes.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the boxes table. */ -class Boxes extends Drupal6DumpBase { +class Boxes extends DrupalDumpBase { public function load() { $this->createTable("boxes", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Comments.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Comments.php similarity index 96% rename from core/modules/migrate_drupal/src/Tests/Table/Comments.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Comments.php index 566ffa6..3c2e9f2 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Comments.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Comments.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the comments table. */ -class Comments extends Drupal6DumpBase { +class Comments extends DrupalDumpBase { public function load() { $this->createTable("comments", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Config.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Config.php similarity index 89% rename from core/modules/migrate_drupal/src/Tests/Table/Config.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Config.php index 5c3c2ff..3584bbf 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Config.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Config.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the config table. */ -class Config extends Drupal6DumpBase { +class Config extends DrupalDumpBase { public function load() { $this->createTable("config", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Contact.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Contact.php similarity index 93% rename from core/modules/migrate_drupal/src/Tests/Table/Contact.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Contact.php index b2928a4..590af51 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Contact.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Contact.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the contact table. */ -class Contact extends Drupal6DumpBase { +class Contact extends DrupalDumpBase { public function load() { $this->createTable("contact", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldImage.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldImage.php similarity index 93% rename from core/modules/migrate_drupal/src/Tests/Table/ContentFieldImage.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldImage.php index b0e756d..b8539ba 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldImage.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldImage.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the content_field_image table. */ -class ContentFieldImage extends Drupal6DumpBase { +class ContentFieldImage extends DrupalDumpBase { public function load() { $this->createTable("content_field_image", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldMultivalue.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldMultivalue.php similarity index 91% rename from core/modules/migrate_drupal/src/Tests/Table/ContentFieldMultivalue.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldMultivalue.php index 911398d..0af6c22 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldMultivalue.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldMultivalue.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the content_field_multivalue table. */ -class ContentFieldMultivalue extends Drupal6DumpBase { +class ContentFieldMultivalue extends DrupalDumpBase { public function load() { $this->createTable("content_field_multivalue", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTest.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTest.php similarity index 92% rename from core/modules/migrate_drupal/src/Tests/Table/ContentFieldTest.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTest.php index c6d34f2..6271368 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTest.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTest.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the content_field_test table. */ -class ContentFieldTest extends Drupal6DumpBase { +class ContentFieldTest extends DrupalDumpBase { public function load() { $this->createTable("content_field_test", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTestTwo.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTestTwo.php similarity index 92% rename from core/modules/migrate_drupal/src/Tests/Table/ContentFieldTestTwo.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTestTwo.php index 2889e10..dec08d6 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTestTwo.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTestTwo.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the content_field_test_two table. */ -class ContentFieldTestTwo extends Drupal6DumpBase { +class ContentFieldTestTwo extends DrupalDumpBase { public function load() { $this->createTable("content_field_test_two", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentGroup.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroup.php similarity index 91% rename from core/modules/migrate_drupal/src/Tests/Table/ContentGroup.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroup.php index f84ffdc..e404f61 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/ContentGroup.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroup.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the content_group table. */ -class ContentGroup extends Drupal6DumpBase { +class ContentGroup extends DrupalDumpBase { public function load() { $this->createTable("content_group", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentGroupFields.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroupFields.php similarity index 88% rename from core/modules/migrate_drupal/src/Tests/Table/ContentGroupFields.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroupFields.php index d4873cb..1ea0f9f 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/ContentGroupFields.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroupFields.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the content_group_fields table. */ -class ContentGroupFields extends Drupal6DumpBase { +class ContentGroupFields extends DrupalDumpBase { public function load() { $this->createTable("content_group_fields", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentNodeField.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeField.php similarity index 98% rename from core/modules/migrate_drupal/src/Tests/Table/ContentNodeField.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeField.php index cc5608e..ea76345 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/ContentNodeField.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeField.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the content_node_field table. */ -class ContentNodeField extends Drupal6DumpBase { +class ContentNodeField extends DrupalDumpBase { public function load() { $this->createTable("content_node_field", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentNodeFieldInstance.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeFieldInstance.php similarity index 99% rename from core/modules/migrate_drupal/src/Tests/Table/ContentNodeFieldInstance.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeFieldInstance.php index b41a9ef..1c0e592 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/ContentNodeFieldInstance.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeFieldInstance.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the content_node_field_instance table. */ -class ContentNodeFieldInstance extends Drupal6DumpBase { +class ContentNodeFieldInstance extends DrupalDumpBase { public function load() { $this->createTable("content_node_field_instance", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentTypePage.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypePage.php similarity index 89% rename from core/modules/migrate_drupal/src/Tests/Table/ContentTypePage.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypePage.php index 0f360be..8b0f5c8 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/ContentTypePage.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypePage.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the content_type_page table. */ -class ContentTypePage extends Drupal6DumpBase { +class ContentTypePage extends DrupalDumpBase { public function load() { $this->createTable("content_type_page", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeStory.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeStory.php similarity index 98% rename from core/modules/migrate_drupal/src/Tests/Table/ContentTypeStory.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeStory.php index 98faa2a..74c784c 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeStory.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeStory.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the content_type_story table. */ -class ContentTypeStory extends Drupal6DumpBase { +class ContentTypeStory extends DrupalDumpBase { public function load() { $this->createTable("content_type_story", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPage.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPage.php similarity index 89% rename from core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPage.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPage.php index 0242458..f86a57e 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPage.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPage.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the content_type_test_page table. */ -class ContentTypeTestPage extends Drupal6DumpBase { +class ContentTypeTestPage extends DrupalDumpBase { public function load() { $this->createTable("content_type_test_page", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPlanet.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPlanet.php similarity index 90% rename from core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPlanet.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPlanet.php index 55a559f..4a01882 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPlanet.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPlanet.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the content_type_test_planet table. */ -class ContentTypeTestPlanet extends Drupal6DumpBase { +class ContentTypeTestPlanet extends DrupalDumpBase { public function load() { $this->createTable("content_type_test_planet", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/DateFormatLocale.php b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatLocale.php similarity index 87% rename from core/modules/migrate_drupal/src/Tests/Table/DateFormatLocale.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatLocale.php index a964c6a..af34df7 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/DateFormatLocale.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatLocale.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the date_format_locale table. */ -class DateFormatLocale extends Drupal6DumpBase { +class DateFormatLocale extends DrupalDumpBase { public function load() { $this->createTable("date_format_locale", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/DateFormatTypes.php b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatTypes.php similarity index 89% rename from core/modules/migrate_drupal/src/Tests/Table/DateFormatTypes.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatTypes.php index 3e6c46b..173dac2 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/DateFormatTypes.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatTypes.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the date_format_types table. */ -class DateFormatTypes extends Drupal6DumpBase { +class DateFormatTypes extends DrupalDumpBase { public function load() { $this->createTable("date_format_types", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/DateFormats.php b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormats.php similarity index 97% rename from core/modules/migrate_drupal/src/Tests/Table/DateFormats.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/DateFormats.php index 81e8def..e60336b 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/DateFormats.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormats.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the date_formats table. */ -class DateFormats extends Drupal6DumpBase { +class DateFormats extends DrupalDumpBase { public function load() { $this->createTable("date_formats", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Event.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Event.php similarity index 93% rename from core/modules/migrate_drupal/src/Tests/Table/Event.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Event.php index d33928f..090338e 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Event.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Event.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the event table. */ -class Event extends Drupal6DumpBase { +class Event extends DrupalDumpBase { public function load() { $this->createTable("event", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/EventTimezones.php b/core/modules/migrate_drupal/src/Tests/Table/d6/EventTimezones.php similarity index 99% rename from core/modules/migrate_drupal/src/Tests/Table/EventTimezones.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/EventTimezones.php index 1878bbf..9680017 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/EventTimezones.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/EventTimezones.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the event_timezones table. */ -class EventTimezones extends Drupal6DumpBase { +class EventTimezones extends DrupalDumpBase { public function load() { $this->createTable("event_timezones", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Files.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Files.php similarity index 96% rename from core/modules/migrate_drupal/src/Tests/Table/Files.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Files.php index f809a25..3b42917 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Files.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Files.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the files table. */ -class Files extends Drupal6DumpBase { +class Files extends DrupalDumpBase { public function load() { $this->createTable("files", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/FilterFormats.php b/core/modules/migrate_drupal/src/Tests/Table/d6/FilterFormats.php similarity index 91% rename from core/modules/migrate_drupal/src/Tests/Table/FilterFormats.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/FilterFormats.php index 8f8b11a..38d04f7 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/FilterFormats.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/FilterFormats.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the filter_formats table. */ -class FilterFormats extends Drupal6DumpBase { +class FilterFormats extends DrupalDumpBase { public function load() { $this->createTable("filter_formats", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Filters.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Filters.php similarity index 95% rename from core/modules/migrate_drupal/src/Tests/Table/Filters.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Filters.php index a09a871..a93b41d 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Filters.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Filters.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the filters table. */ -class Filters extends Drupal6DumpBase { +class Filters extends DrupalDumpBase { public function load() { $this->createTable("filters", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Flood.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Flood.php similarity index 89% rename from core/modules/migrate_drupal/src/Tests/Table/Flood.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Flood.php index 6ff2903..f25b591 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Flood.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Flood.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the flood table. */ -class Flood extends Drupal6DumpBase { +class Flood extends DrupalDumpBase { public function load() { $this->createTable("flood", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/History.php b/core/modules/migrate_drupal/src/Tests/Table/d6/History.php similarity index 88% rename from core/modules/migrate_drupal/src/Tests/Table/History.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/History.php index f054018..9261e40 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/History.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/History.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the history table. */ -class History extends Drupal6DumpBase { +class History extends DrupalDumpBase { public function load() { $this->createTable("history", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/MenuCustom.php b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuCustom.php similarity index 93% rename from core/modules/migrate_drupal/src/Tests/Table/MenuCustom.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/MenuCustom.php index 932ac4d..661d701 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/MenuCustom.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuCustom.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the menu_custom table. */ -class MenuCustom extends Drupal6DumpBase { +class MenuCustom extends DrupalDumpBase { public function load() { $this->createTable("menu_custom", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/MenuLinks.php b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuLinks.php similarity index 99% rename from core/modules/migrate_drupal/src/Tests/Table/MenuLinks.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/MenuLinks.php index 2fb6ee0..8764063 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/MenuLinks.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuLinks.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the menu_links table. */ -class MenuLinks extends Drupal6DumpBase { +class MenuLinks extends DrupalDumpBase { public function load() { $this->createTable("menu_links", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Node.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Node.php similarity index 97% rename from core/modules/migrate_drupal/src/Tests/Table/Node.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Node.php index 4da6aee..068edbd 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Node.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Node.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the node table. */ -class Node extends Drupal6DumpBase { +class Node extends DrupalDumpBase { public function load() { $this->createTable("node", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/NodeAccess.php b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeAccess.php similarity index 93% rename from core/modules/migrate_drupal/src/Tests/Table/NodeAccess.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/NodeAccess.php index 753348e..5b231ec 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/NodeAccess.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeAccess.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the node_access table. */ -class NodeAccess extends Drupal6DumpBase { +class NodeAccess extends DrupalDumpBase { public function load() { $this->createTable("node_access", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/NodeCommentStatistics.php b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCommentStatistics.php similarity index 92% rename from core/modules/migrate_drupal/src/Tests/Table/NodeCommentStatistics.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/NodeCommentStatistics.php index 2f6aa57..df80f70 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/NodeCommentStatistics.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCommentStatistics.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the node_comment_statistics table. */ -class NodeCommentStatistics extends Drupal6DumpBase { +class NodeCommentStatistics extends DrupalDumpBase { public function load() { $this->createTable("node_comment_statistics", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/NodeCounter.php b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCounter.php similarity index 90% rename from core/modules/migrate_drupal/src/Tests/Table/NodeCounter.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/NodeCounter.php index 9ad22c2..c5356f7 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/NodeCounter.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCounter.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the node_counter table. */ -class NodeCounter extends Drupal6DumpBase { +class NodeCounter extends DrupalDumpBase { public function load() { $this->createTable("node_counter", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/NodeRevisions.php b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeRevisions.php similarity index 97% rename from core/modules/migrate_drupal/src/Tests/Table/NodeRevisions.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/NodeRevisions.php index ef5345f..472a182 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/NodeRevisions.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeRevisions.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the node_revisions table. */ -class NodeRevisions extends Drupal6DumpBase { +class NodeRevisions extends DrupalDumpBase { public function load() { $this->createTable("node_revisions", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/NodeType.php b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeType.php similarity index 98% rename from core/modules/migrate_drupal/src/Tests/Table/NodeType.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/NodeType.php index e049273..89884e8 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/NodeType.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeType.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the node_type table. */ -class NodeType extends Drupal6DumpBase { +class NodeType extends DrupalDumpBase { public function load() { $this->createTable("node_type", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Permission.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Permission.php similarity index 94% rename from core/modules/migrate_drupal/src/Tests/Table/Permission.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Permission.php index b771262..547e0bf 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Permission.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Permission.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the permission table. */ -class Permission extends Drupal6DumpBase { +class Permission extends DrupalDumpBase { public function load() { $this->createTable("permission", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/ProfileFields.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileFields.php similarity index 97% rename from core/modules/migrate_drupal/src/Tests/Table/ProfileFields.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/ProfileFields.php index 56152ef..7ff0a4c 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/ProfileFields.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileFields.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the profile_fields table. */ -class ProfileFields extends Drupal6DumpBase { +class ProfileFields extends DrupalDumpBase { public function load() { $this->createTable("profile_fields", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/ProfileValues.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileValues.php similarity index 97% rename from core/modules/migrate_drupal/src/Tests/Table/ProfileValues.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/ProfileValues.php index 859d57e..d2085ad 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/ProfileValues.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileValues.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the profile_values table. */ -class ProfileValues extends Drupal6DumpBase { +class ProfileValues extends DrupalDumpBase { public function load() { $this->createTable("profile_values", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Role.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Role.php similarity index 90% rename from core/modules/migrate_drupal/src/Tests/Table/Role.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Role.php index b3c1877..7edfaa6 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Role.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Role.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the role table. */ -class Role extends Drupal6DumpBase { +class Role extends DrupalDumpBase { public function load() { $this->createTable("role", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Semaphore.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Semaphore.php similarity index 87% rename from core/modules/migrate_drupal/src/Tests/Table/Semaphore.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Semaphore.php index 4c80ef9..308fd67 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Semaphore.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Semaphore.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the semaphore table. */ -class Semaphore extends Drupal6DumpBase { +class Semaphore extends DrupalDumpBase { public function load() { $this->createTable("semaphore", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/System.php b/core/modules/migrate_drupal/src/Tests/Table/d6/System.php similarity index 99% rename from core/modules/migrate_drupal/src/Tests/Table/System.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/System.php index 08e638d..ae42df9 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/System.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/System.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the system table. */ -class System extends Drupal6DumpBase { +class System extends DrupalDumpBase { public function load() { $this->createTable("system", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/TermData.php b/core/modules/migrate_drupal/src/Tests/Table/d6/TermData.php similarity index 94% rename from core/modules/migrate_drupal/src/Tests/Table/TermData.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/TermData.php index 106e581..7a8e167 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/TermData.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/TermData.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the term_data table. */ -class TermData extends Drupal6DumpBase { +class TermData extends DrupalDumpBase { public function load() { $this->createTable("term_data", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/TermHierarchy.php b/core/modules/migrate_drupal/src/Tests/Table/d6/TermHierarchy.php similarity index 90% rename from core/modules/migrate_drupal/src/Tests/Table/TermHierarchy.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/TermHierarchy.php index 0ca4f63..b9823e8 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/TermHierarchy.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/TermHierarchy.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the term_hierarchy table. */ -class TermHierarchy extends Drupal6DumpBase { +class TermHierarchy extends DrupalDumpBase { public function load() { $this->createTable("term_hierarchy", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/TermNode.php b/core/modules/migrate_drupal/src/Tests/Table/d6/TermNode.php similarity index 91% rename from core/modules/migrate_drupal/src/Tests/Table/TermNode.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/TermNode.php index d8d1675..e489409 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/TermNode.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/TermNode.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the term_node table. */ -class TermNode extends Drupal6DumpBase { +class TermNode extends DrupalDumpBase { public function load() { $this->createTable("term_node", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/TermRelation.php b/core/modules/migrate_drupal/src/Tests/Table/d6/TermRelation.php similarity index 88% rename from core/modules/migrate_drupal/src/Tests/Table/TermRelation.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/TermRelation.php index 8f7c5e0..decb3ee 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/TermRelation.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/TermRelation.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the term_relation table. */ -class TermRelation extends Drupal6DumpBase { +class TermRelation extends DrupalDumpBase { public function load() { $this->createTable("term_relation", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/TermSynonym.php b/core/modules/migrate_drupal/src/Tests/Table/d6/TermSynonym.php similarity index 87% rename from core/modules/migrate_drupal/src/Tests/Table/TermSynonym.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/TermSynonym.php index cfa58bf..d6eabd4 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/TermSynonym.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/TermSynonym.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the term_synonym table. */ -class TermSynonym extends Drupal6DumpBase { +class TermSynonym extends DrupalDumpBase { public function load() { $this->createTable("term_synonym", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Upload.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Upload.php similarity index 94% rename from core/modules/migrate_drupal/src/Tests/Table/Upload.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Upload.php index f7ec4fa..17605e7 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Upload.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Upload.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the upload table. */ -class Upload extends Drupal6DumpBase { +class Upload extends DrupalDumpBase { public function load() { $this->createTable("upload", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/UrlAlias.php b/core/modules/migrate_drupal/src/Tests/Table/d6/UrlAlias.php similarity index 91% rename from core/modules/migrate_drupal/src/Tests/Table/UrlAlias.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/UrlAlias.php index 80b8acf..1faf0f0 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/UrlAlias.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/UrlAlias.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the url_alias table. */ -class UrlAlias extends Drupal6DumpBase { +class UrlAlias extends DrupalDumpBase { public function load() { $this->createTable("url_alias", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Users.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Users.php similarity index 98% rename from core/modules/migrate_drupal/src/Tests/Table/Users.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Users.php index 87c0028..36f8272 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Users.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Users.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the users table. */ -class Users extends Drupal6DumpBase { +class Users extends DrupalDumpBase { public function load() { $this->createTable("users", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/UsersRoles.php b/core/modules/migrate_drupal/src/Tests/Table/d6/UsersRoles.php similarity index 91% rename from core/modules/migrate_drupal/src/Tests/Table/UsersRoles.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/UsersRoles.php index 494749e..cf1e9b1 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/UsersRoles.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/UsersRoles.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the users_roles table. */ -class UsersRoles extends Drupal6DumpBase { +class UsersRoles extends DrupalDumpBase { public function load() { $this->createTable("users_roles", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Variable.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Variable.php similarity index 99% rename from core/modules/migrate_drupal/src/Tests/Table/Variable.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Variable.php index b848e70..a376f81 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Variable.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Variable.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the variable table. */ -class Variable extends Drupal6DumpBase { +class Variable extends DrupalDumpBase { public function load() { $this->createTable("variable", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/Vocabulary.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Vocabulary.php similarity index 96% rename from core/modules/migrate_drupal/src/Tests/Table/Vocabulary.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/Vocabulary.php index 3936d1c..68b4f1c 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/Vocabulary.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Vocabulary.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the vocabulary table. */ -class Vocabulary extends Drupal6DumpBase { +class Vocabulary extends DrupalDumpBase { public function load() { $this->createTable("vocabulary", array( diff --git a/core/modules/migrate_drupal/src/Tests/Table/VocabularyNodeTypes.php b/core/modules/migrate_drupal/src/Tests/Table/d6/VocabularyNodeTypes.php similarity index 89% rename from core/modules/migrate_drupal/src/Tests/Table/VocabularyNodeTypes.php rename to core/modules/migrate_drupal/src/Tests/Table/d6/VocabularyNodeTypes.php index a52778d..1da665e 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/VocabularyNodeTypes.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/VocabularyNodeTypes.php @@ -10,14 +10,14 @@ * @see https://www.drupal.org/sandbox/benjy/2405029 */ -namespace Drupal\migrate_drupal\Tests\Table; +namespace Drupal\migrate_drupal\Tests\Table\d6; -use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase; +use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase; /** * Generated file to represent the vocabulary_node_types table. */ -class VocabularyNodeTypes extends Drupal6DumpBase { +class VocabularyNodeTypes extends DrupalDumpBase { public function load() { $this->createTable("vocabulary_node_types", array( diff --git a/core/modules/migrate_drupal/src/Tests/d6.gz b/core/modules/migrate_drupal/src/Tests/d6.gz index b245ec9..769ef2d 100644 --- a/core/modules/migrate_drupal/src/Tests/d6.gz +++ b/core/modules/migrate_drupal/src/Tests/d6.gz @@ -1,4 +1,4 @@ -YTsȑ0_;D#yfhcvY7n@@':wX$BUVޕur⼿_b6wڭvq^iC{ݱs'N~f-٥#/_zd/?ɍ8iGOjΧ7||W?]7>/=v~~w?ݫo?~`}{<.7Ev}?}ߏް.Ŷٳպl6vOˇ67 fj}옯[%7oۛKV ?y_ه_>t;6v;ׇ|=& 8W0qXEdh?^'޽qKލ?vG; +Tsȑ0_;D#yfhcvY7n@@':wX$BUVޕur⼿_b6wڭvq^iC{ݱs'N~f-٥#/_zd/?ɍ8iGOjΧ7||W?]7>/=v~~w?ݫo?~`}{<.7Ev}?}ߏް.Ŷٳպl6vOˇ67 fj}옯[%7oۛKV ?y_ه_>t;6v;ׇ|=& 8W0qXEdh?^'޽qKލ?vG; ?BIq/xOB߼#@p~?? ʎwDLKӹk_x3lM ,i ~x9B_2.~E' 1 4U_3=DgtW}o`Ed?FDzTD ~l^(mx4cI~`شZ6vʙp荚? 0&5OGI0B{LG9Ejؚ*yG*OѳQ<1bԥώ [ 'zϏUAF_S(iܩO ao{Ϟ;speETiѭx:',|{NzFesČ:贂FЩއ=}V57k,=fY"s%H0)!󂿸\5-;/rxq4_;E㧹׊=.z  !y-Ds:Xh`S4&Z6vco$'^'IUr^q٨[Y6bw}iAOlG}oIؾh*o7)׾_hsMD|=d~K0;oݥKk0:s޾>}Ĩ.?`~);Z$2;pr$5S 5yS2H2?FSYp{,̟Ǭ3'Gq4N0Է!:;`qwAGbobca5XWiHfha ,[uOW7^wtfnƫٳѾįU`#'!X7r7YoX/ ϟb}sf|}g{c?9(zӗ0cqp4盿O}5wd8ItQC}X̆~L0y2bϧum3Z(Gcyfj? NO>1UL &;҈vb(3Dj] @@ -744,4 +744,4 @@ Qu^v[5x) +|ACb9IB#mw:c) P& TG@xջ7qi:) |@8/逊BvWscEV ̗j>eՎ.BX#Vh%1+4H-~h2ZMژ !d?]8UQN&TF ǞaTZ#k+[f36wN2iK/wU-)^Qd33;wh_MNx-9b>*\.`Na#zE0NjKDHt}diHY%uFDUL -h0~csFOlyK"寧#)m{u~q|f/J?_/KaSRUyfwo`֛ǗLH.WOONgg/#x7]_*⭐32H[1Q4;MslFyzny:! \ No newline at end of file +h0~csFOlyK"寧#)m{u~q|f/J?_/KaSRUyfwo`֛ǗLH.WOONgg/#x7]_*⭐32H[1Q4;MsFy~5:! \ No newline at end of file diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php index 843033f..aa75355 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php @@ -9,14 +9,14 @@ use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upgrade variables to action.settings.yml. * * @group migrate_drupal */ -class MigrateActionConfigsTest extends MigrateDrupalTestBase { +class MigrateActionConfigsTest extends MigrateDrupal6TestBase { use SchemaCheckTestTrait; diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php index cff9377..95c4224 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php @@ -9,14 +9,14 @@ use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upgrade variables to aggregator.settings.yml. * * @group migrate_drupal */ -class MigrateAggregatorConfigsTest extends MigrateDrupalTestBase { +class MigrateAggregatorConfigsTest extends MigrateDrupal6TestBase { use SchemaCheckTestTrait; diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorFeedTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorFeedTest.php index 214b0e8..9978263 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorFeedTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorFeedTest.php @@ -9,14 +9,14 @@ use Drupal\aggregator\Entity\Feed; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upgrade variables to aggregator_feed entities. * * @group migrate_drupal */ -class MigrateAggregatorFeedTest extends MigrateDrupalTestBase { +class MigrateAggregatorFeedTest extends MigrateDrupal6TestBase { static $modules = array('aggregator'); diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorItemTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorItemTest.php index 672711c..06cb890 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorItemTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorItemTest.php @@ -10,14 +10,14 @@ use Drupal\aggregator\Entity\Item; use Drupal\Core\Language\LanguageInterface; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upgrade aggregator items. * * @group migrate_drupal */ -class MigrateAggregatorItemTest extends MigrateDrupalTestBase { +class MigrateAggregatorItemTest extends MigrateDrupal6TestBase { static $modules = array('aggregator'); diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php index f44346e..f065d16 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php @@ -12,14 +12,14 @@ use Drupal\Core\Language\LanguageInterface; use Drupal\field\Entity\FieldStorageConfig; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upgrade custom blocks. * * @group migrate_drupal */ -class MigrateBlockContentTest extends MigrateDrupalTestBase { +class MigrateBlockContentTest extends MigrateDrupal6TestBase { static $modules = array('block', 'block_content'); diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php index abd0d69..24e73f4 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php @@ -8,7 +8,7 @@ namespace Drupal\migrate_drupal\Tests\d6; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; use Drupal\block\Entity\Block; /** @@ -16,7 +16,7 @@ * * @group migrate_drupal */ -class MigrateBlockTest extends MigrateDrupalTestBase { +class MigrateBlockTest extends MigrateDrupal6TestBase { /** * Modules to enable. diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php index c33b1f0..1a7381c 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php @@ -10,14 +10,14 @@ use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateMessage; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upgrade variables to book.settings.yml. * * @group migrate_drupal */ -class MigrateBookConfigsTest extends MigrateDrupalTestBase { +class MigrateBookConfigsTest extends MigrateDrupal6TestBase { use SchemaCheckTestTrait; diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateBookTest.php index fe55e14..f43366b 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateBookTest.php @@ -8,7 +8,7 @@ namespace Drupal\migrate_drupal\Tests\d6; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; use Drupal\node\Entity\Node; /** @@ -16,7 +16,7 @@ * * @group migrate_drupal */ -class MigrateBookTest extends MigrateDrupalTestBase { +class MigrateBookTest extends MigrateDrupal6TestBase { public static $modules = array('book'); diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php index c1e9273..4b97a7b 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php @@ -10,14 +10,14 @@ use Drupal\comment\Entity\Comment; use Drupal\Core\Language\LanguageInterface; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upgrade comments. * * @group migrate_drupal */ -class MigrateCommentTest extends MigrateDrupalTestBase { +class MigrateCommentTest extends MigrateDrupal6TestBase { static $modules = array('node', 'comment'); diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTypeTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTypeTest.php index 45da40b..aad88cf 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTypeTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTypeTest.php @@ -8,14 +8,14 @@ namespace Drupal\migrate_drupal\Tests\d6; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upgrade comment type. * * @group migrate_drupal */ -class MigrateCommentTypeTest extends MigrateDrupalTestBase { +class MigrateCommentTypeTest extends MigrateDrupal6TestBase { static $modules = array('node', 'comment'); diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php index 46b4a3c..cafd55d 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php @@ -8,12 +8,12 @@ namespace Drupal\migrate_drupal\Tests\d6; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Base class for Drupal 6 comment variables to Drupal 8 entity display tests. */ -abstract class MigrateCommentVariableDisplayBase extends MigrateDrupalTestBase { +abstract class MigrateCommentVariableDisplayBase extends MigrateDrupal6TestBase { /** * The ID of migration to run. diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php index 8d6f970..5546a53 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php @@ -8,14 +8,14 @@ namespace Drupal\migrate_drupal\Tests\d6; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upgrade comment subject variable to core.entity_form_display.comment.*.default.yml * * @group migrate_drupal */ -class MigrateCommentVariableEntityFormDisplaySubjectTest extends MigrateDrupalTestBase { +class MigrateCommentVariableEntityFormDisplaySubjectTest extends MigrateDrupal6TestBase { /** * Modules to enable. diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableFieldTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableFieldTest.php index 8a9b30b..0267dd4 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableFieldTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableFieldTest.php @@ -9,14 +9,14 @@ use Drupal\field\Entity\FieldStorageConfig; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upgrade comment variables to field.storage.node.comment.yml. * * @group migrate_drupal */ -class MigrateCommentVariableFieldTest extends MigrateDrupalTestBase { +class MigrateCommentVariableFieldTest extends MigrateDrupal6TestBase { static $modules = array('comment', 'node'); diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php index 9ca6577..f94283e 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php @@ -8,14 +8,14 @@ namespace Drupal\migrate_drupal\Tests\d6; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upgrade comment variables to field.instance.node.*.comment.yml. * * @group migrate_drupal */ -class MigrateCommentVariableInstanceTest extends MigrateDrupalTestBase { +class MigrateCommentVariableInstanceTest extends MigrateDrupal6TestBase { static $modules = array('comment', 'node'); diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactCategoryTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateContactCategoryTest.php index 3d690d9..44492cd 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactCategoryTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateContactCategoryTest.php @@ -10,14 +10,14 @@ use Drupal\contact\Entity\ContactForm; use Drupal\migrate\MigrateExecutable; use Drupal\migrate\MigrateMessage; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Migrate contact categories to contact.form.*.yml. * * @group migrate_drupal */ -class MigrateContactCategoryTest extends MigrateDrupalTestBase { +class MigrateContactCategoryTest extends MigrateDrupal6TestBase { /** * Modules to enable. diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php index e856b76..94ebdec 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php @@ -10,14 +10,14 @@ use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateMessage; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upgrade variables to contact.settings.yml. * * @group migrate_drupal */ -class MigrateContactConfigsTest extends MigrateDrupalTestBase { +class MigrateContactConfigsTest extends MigrateDrupal6TestBase { use SchemaCheckTestTrait; diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDateFormatTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDateFormatTest.php index b1c967e..f179352 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDateFormatTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDateFormatTest.php @@ -5,7 +5,7 @@ use Drupal\Core\Datetime\DrupalDateTime; use Drupal\migrate\MigrateMessage; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; use Drupal\Core\Database\Database; /** @@ -13,7 +13,7 @@ * * @group migrate_drupal */ -class MigrateDateFormatTest extends MigrateDrupalTestBase { +class MigrateDateFormatTest extends MigrateDrupal6TestBase { /** * {@inheritdoc} diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDblogConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDblogConfigsTest.php index 2f9c644..1395889 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDblogConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDblogConfigsTest.php @@ -10,14 +10,14 @@ use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateMessage; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upgrade variables to dblog.settings.yml. * * @group migrate_drupal */ -class MigrateDblogConfigsTest extends MigrateDrupalTestBase { +class MigrateDblogConfigsTest extends MigrateDrupal6TestBase { use SchemaCheckTestTrait; diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php new file mode 100644 index 0000000..7dffa29 --- /dev/null +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php @@ -0,0 +1,25 @@ +createTable("{{TABLE}}", {{TABLE_DEFINITION}});