' . t('The Commerce Migrate module provides a framework based on the Migrate module and the Migrate Drupal module to facilitate migration from Commerce web sites to Drupal 8 Commerce. It does not provide a user interface. For more information, see the online documentation for the Commerce Migrate Drupal module.', [ - ':migrate' => \Drupal::url('help.page', ['name' => 'migrate']), - ':migrate_drupal' => \Drupal::url('help.page', ['name' => 'migrate_drupal']), + ':migrate' => Url::fromRoute('help.page', ['name' => 'migrate']), + ':migrate_drupal' => Url::fromRoute('help.page', ['name' => 'migrate_drupal']), ':commerce_migrate' => 'https://www.drupal.org/docs/8/modules/commerce-migrate', ]) . '
'; return $output; diff --git a/modules/commerce/commerce_migrate_commerce.info.yml b/modules/commerce/commerce_migrate_commerce.info.yml index 2290aca..2482064 100644 --- a/modules/commerce/commerce_migrate_commerce.info.yml +++ b/modules/commerce/commerce_migrate_commerce.info.yml @@ -1,7 +1,7 @@ name: Commerce Migrate Commerce type: module description: Provides migrations for Commerce -core: 8.x +core_version_requirement: ^8.8 || ^9 package: Commerce (contrib) dependencies: - commerce:commerce diff --git a/modules/commerce/tests/src/Kernel/Migrate/commerce1/OrderTest.php b/modules/commerce/tests/src/Kernel/Migrate/commerce1/OrderTest.php index 0ae3406..cca8003 100644 --- a/modules/commerce/tests/src/Kernel/Migrate/commerce1/OrderTest.php +++ b/modules/commerce/tests/src/Kernel/Migrate/commerce1/OrderTest.php @@ -193,7 +193,7 @@ class OrderTest extends Commerce1TestBase { $profile = $order->getBillingProfile(); $this->assertInstanceOf(Profile::class, $profile); $this->assertEquals($profile->bundle(), 'customer'); - $this->assertEquals($profile->isActive(), TRUE); + $this->assertEquals($profile->isPublished(), TRUE); // Test store. $this->assertEquals(\Drupal::service('commerce_store.default_store_resolver') diff --git a/modules/csv_example/commerce_migrate_csv_example.info.yml b/modules/csv_example/commerce_migrate_csv_example.info.yml index 0db1f0a..578b980 100644 --- a/modules/csv_example/commerce_migrate_csv_example.info.yml +++ b/modules/csv_example/commerce_migrate_csv_example.info.yml @@ -1,7 +1,7 @@ name: Commerce Migrate CSV example type: module description: 'Import products from an example CSV file' -core: 8.x +core_version_requirement: ^8.8 || ^9 package: Commerce (contrib) dependencies: - commerce:commerce diff --git a/modules/magento/commerce_migrate_magento.info.yml b/modules/magento/commerce_migrate_magento.info.yml index b7d142d..13ee129 100644 --- a/modules/magento/commerce_migrate_magento.info.yml +++ b/modules/magento/commerce_migrate_magento.info.yml @@ -1,7 +1,7 @@ name: Commerce Migrate Magento type: module description: Provides migrations for Commerce -core: 8.x +core_version_requirement: ^8.8 || ^9 package: Commerce (contrib) dependencies: - commerce:commerce diff --git a/modules/shopify/commerce_migrate_shopify.info.yml b/modules/shopify/commerce_migrate_shopify.info.yml index f3e3d77..9c2d55b 100644 --- a/modules/shopify/commerce_migrate_shopify.info.yml +++ b/modules/shopify/commerce_migrate_shopify.info.yml @@ -1,7 +1,7 @@ name: Commerce Migrate Shopify type: module description: Provides migrations for Shopfiy. -core: 8.x +core_version_requirement: ^8.8 || ^9 package: Commerce (contrib) dependencies: - commerce:commerce diff --git a/modules/ubercart/commerce_migrate_ubercart.info.yml b/modules/ubercart/commerce_migrate_ubercart.info.yml index 9e943c7..3b54c7b 100644 --- a/modules/ubercart/commerce_migrate_ubercart.info.yml +++ b/modules/ubercart/commerce_migrate_ubercart.info.yml @@ -1,7 +1,7 @@ name: Commerce Migrate Ubercart type: module description: Provides migrations for Ubercart. -core: 8.x +core_version_requirement: ^8.8 || ^9 package: Commerce (contrib) dependencies: - commerce:commerce diff --git a/modules/ubercart/src/Plugin/migrate/source/Currency.php b/modules/ubercart/src/Plugin/migrate/source/Currency.php index df62eeb..8fb6d3b 100644 --- a/modules/ubercart/src/Plugin/migrate/source/Currency.php +++ b/modules/ubercart/src/Plugin/migrate/source/Currency.php @@ -21,13 +21,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface; */ class Currency extends Variable { - /** - * The entity type manager. - * - * @var \Drupal\Core\Entity\EntityTypeManagerInterface - */ - protected $entityTypeManager; - /** * The language manager. * @@ -48,7 +41,6 @@ class Currency extends Variable { public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, StateInterface $state, EntityTypeManagerInterface $entity_type_manager, LanguageManagerInterface $language_manager) { parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $state, $entity_type_manager); $this->languageManager = $language_manager; - $this->entityTypeManager = $entity_type_manager; $this->variables = $this->configuration['variables']; } diff --git a/modules/ubercart/tests/modules/plugins_alter_connection_test/plugins_alter_connection_test.info.yml b/modules/ubercart/tests/modules/plugins_alter_connection_test/plugins_alter_connection_test.info.yml index 6fd2380..1d6f4da 100644 --- a/modules/ubercart/tests/modules/plugins_alter_connection_test/plugins_alter_connection_test.info.yml +++ b/modules/ubercart/tests/modules/plugins_alter_connection_test/plugins_alter_connection_test.info.yml @@ -2,4 +2,4 @@ name: 'Plugin alter Connection test' type: module description: 'Test connection in commerce_migrate_ubercart.module plugins alter' package: Testing -core: 8.x +core_version_requirement: ^8.8 || ^9 diff --git a/modules/ubercart/tests/src/Kernel/Migrate/uc6/PaymentTest.php b/modules/ubercart/tests/src/Kernel/Migrate/uc6/PaymentTest.php index f9ae7cf..2c5d1df 100644 --- a/modules/ubercart/tests/src/Kernel/Migrate/uc6/PaymentTest.php +++ b/modules/ubercart/tests/src/Kernel/Migrate/uc6/PaymentTest.php @@ -129,7 +129,7 @@ class PaymentTest extends Ubercart6TestBase { // Check that we've reported the refund in excess of payments. $messages = []; - foreach ($migration->getIdMap()->getMessageIterator() as $message_row) { + foreach ($migration->getIdMap()->getMessages() as $message_row) { $messages[] = $message_row->message; } $this->assertCount(1, $messages); diff --git a/modules/ubercart/tests/src/Kernel/Migrate/uc7/PaymentTest.php b/modules/ubercart/tests/src/Kernel/Migrate/uc7/PaymentTest.php index 0d455a5..7dec200 100644 --- a/modules/ubercart/tests/src/Kernel/Migrate/uc7/PaymentTest.php +++ b/modules/ubercart/tests/src/Kernel/Migrate/uc7/PaymentTest.php @@ -130,7 +130,7 @@ class PaymentTest extends Ubercart7TestBase { // Check that we've reported the refund in excess of payments. $messages = []; - foreach ($migration->getIdMap()->getMessageIterator() as $message_row) { + foreach ($migration->getIdMap()->getMessages() as $message_row) { $messages[] = $message_row->message; } $this->assertCount(1, $messages); diff --git a/modules/woocommerce/commerce_migrate_woocommerce.info.yml b/modules/woocommerce/commerce_migrate_woocommerce.info.yml index 88b8ef4..34a0afb 100644 --- a/modules/woocommerce/commerce_migrate_woocommerce.info.yml +++ b/modules/woocommerce/commerce_migrate_woocommerce.info.yml @@ -1,7 +1,7 @@ name: Commerce Migrate WooCommerce type: module description: Provides migrations for WooCommerce -core: 8.x +core_version_requirement: ^8.8 || ^9 package: Commerce (contrib) dependencies: - commerce:commerce diff --git a/tests/src/Kernel/CommerceMigrateTestTrait.php b/tests/src/Kernel/CommerceMigrateTestTrait.php index f44afb8..e1f1e00 100644 --- a/tests/src/Kernel/CommerceMigrateTestTrait.php +++ b/tests/src/Kernel/CommerceMigrateTestTrait.php @@ -645,7 +645,7 @@ trait CommerceMigrateTestTrait { $this->assertSame($type, $profile->bundle()); $this->assertSame($owner_id, $profile->getOwnerId()); $this->assertSame($langcode, $profile->language()->getId()); - $this->assertSame($is_active, $profile->isActive()); + $this->assertSame($is_active, $profile->isPublished()); $this->assertSame($is_default, $profile->isDefault()); if ($created_time != NULL) { $this->assertSame($created_time, ($profile->getCreatedTime()));