diff -u b/modules/ubercart/src/Plugin/migrate/source/Currency.php b/modules/ubercart/src/Plugin/migrate/source/Currency.php --- b/modules/ubercart/src/Plugin/migrate/source/Currency.php +++ b/modules/ubercart/src/Plugin/migrate/source/Currency.php @@ -16,7 +16,8 @@ * Gets the ubercart currency data. * * @MigrateSource( - * id = "ubercart_currency" + * id = "ubercart_currency", + * source_provider = "uc_store" * ) */ class Currency extends Variable { diff -u b/modules/ubercart/src/Plugin/migrate/source/Store.php b/modules/ubercart/src/Plugin/migrate/source/Store.php --- b/modules/ubercart/src/Plugin/migrate/source/Store.php +++ b/modules/ubercart/src/Plugin/migrate/source/Store.php @@ -9,7 +9,8 @@ * Gets the ubercart store data. * * @MigrateSource( - * id = "ubercart_store" + * id = "ubercart_store", + * source_provider = "uc_store" * ) */ class Store extends Variable { diff -u b/modules/ubercart/src/Plugin/migrate/source/d6/Order.php b/modules/ubercart/src/Plugin/migrate/source/d6/Order.php --- b/modules/ubercart/src/Plugin/migrate/source/d6/Order.php +++ b/modules/ubercart/src/Plugin/migrate/source/d6/Order.php @@ -9,7 +9,8 @@ * Provides migration source for orders. * * @MigrateSource( - * id = "d6_ubercart_order" + * id = "d6_ubercart_order", + * source_provider = "uc_order" * ) */ class Order extends SqlBase { diff -u b/modules/ubercart/src/Plugin/migrate/source/d6/OrderProduct.php b/modules/ubercart/src/Plugin/migrate/source/d6/OrderProduct.php --- b/modules/ubercart/src/Plugin/migrate/source/d6/OrderProduct.php +++ b/modules/ubercart/src/Plugin/migrate/source/d6/OrderProduct.php @@ -6,8 +6,11 @@ use Drupal\migrate\Row; /** + * Drupal 6 ubercart order product source. + * * @MigrateSource( - * id = "d6_ubercart_order_product" + * id = "d6_ubercart_order_product", + * source_provider = "uc_order" * ) */ class OrderProduct extends SqlBase { @@ -17,7 +20,15 @@ */ public function query() { $query = $this->select('uc_order_products', 'uop') - ->fields('uop', ['order_product_id', 'order_id', 'nid', 'title', 'qty', 'price', 'data']); + ->fields('uop', [ + 'order_product_id', + 'order_id', + 'nid', + 'title', + 'qty', + 'price', + 'data', + ]); $query->innerJoin('uc_orders', 'uo', 'uop.order_id = uo.order_id'); $query->fields('uo', ['created', 'modified', 'currency']); diff -u b/modules/ubercart/src/Plugin/migrate/source/d6/Product.php b/modules/ubercart/src/Plugin/migrate/source/d6/Product.php --- b/modules/ubercart/src/Plugin/migrate/source/d6/Product.php +++ b/modules/ubercart/src/Plugin/migrate/source/d6/Product.php @@ -2,15 +2,15 @@ namespace Drupal\commerce_migrate_ubercart\Plugin\migrate\source\d6; -use Drupal\Core\State\StateInterface; -use Drupal\migrate\MigrateException; use Drupal\migrate\Plugin\migrate\source\SqlBase; -use Drupal\migrate\Plugin\MigrationInterface; use Drupal\migrate\Row; /** + * Drupal 6 ubercart product source. + * * @MigrateSource( - * id = "d6_ubercart_product" + * id = "d6_ubercart_product", + * source_provider = "uc_product" * ) */ class Product extends SqlBase { diff -u b/modules/ubercart/src/Plugin/migrate/source/d6/ProductVariation.php b/modules/ubercart/src/Plugin/migrate/source/d6/ProductVariation.php --- b/modules/ubercart/src/Plugin/migrate/source/d6/ProductVariation.php +++ b/modules/ubercart/src/Plugin/migrate/source/d6/ProductVariation.php @@ -6,8 +6,11 @@ use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase; /** + * Drupal 6 ubercart product variation sourcee. + * * @MigrateSource( - * id = "d6_ubercart_product_variation" + * id = "d6_ubercart_product_variation", + * source_provider = "uc_product" * ) */ class ProductVariation extends DrupalSqlBase { diff -u b/modules/ubercart/tests/src/Kernel/Migrate/d6/CurrencyTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/CurrencyTest.php --- b/modules/ubercart/tests/src/Kernel/Migrate/d6/CurrencyTest.php +++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/CurrencyTest.php @@ -8,6 +8,7 @@ * Tests currency migration. * * @group commerce_migrate + * @group commerce_migrate_ubercart6 */ class CurrencyTest extends Ubercart6TestBase { diff -u b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php --- b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php +++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php @@ -8,7 +8,8 @@ /** * Tests billing profile migration. * - * @group commerce_migrate_ubercart + * @group commerce_migrate + * @group commerce_migrate_ubercart6 */ class MigrateProfileBillingTest extends Ubercart6TestBase { diff -u b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderItemTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderItemTest.php --- b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderItemTest.php +++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderItemTest.php @@ -9,6 +9,7 @@ * Tests order item migration. * * @group commerce_migrate + * @group commerce_migrate_ubercart6 */ class OrderItemTest extends Ubercart6TestBase { diff -u b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderTest.php --- b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderTest.php +++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderTest.php @@ -1,14 +1,15 @@ executeMigration('ubercart_currency'); - } - - /** - * Test currency migration from Drupal 7 to 8. - */ - public function testCurrency() { - /** @var \Drupal\commerce_price\Entity\CurrencyInterface $currency */ - $this->assertCurrencyEntity('USD', 'USD', 'US Dollar', '840', 2, '$'); - } - - /** - * @param string $id - * The currency id. - * @param $expected_currency_code - * @param $expected_name - * @param $expected_numeric_code - * @param $expected_fraction_digits - * @param $expected_symbol - */ - public function assertCurrencyEntity($id, $expected_currency_code, $expected_name, $expected_numeric_code, $expected_fraction_digits, $expected_symbol) { - /** @var \Drupal\commerce_price\Entity\CurrencyInterface $currency */ - $currency = Currency::load($id); - $this->assertInstanceOf(CurrencyInterface::class, $currency); - $this->assertSame($expected_currency_code, $currency->getCurrencyCode()); - $this->assertSame($expected_name, $currency->getName()); - $this->assertSame($expected_fraction_digits, $currency->getFractionDigits()); - $this->assertSame($expected_numeric_code, $currency->getNumericCode()); - $this->assertSame($expected_symbol, $currency->getSymbol()); - } - -} diff -u b/modules/ubercart/tests/src/Kernel/Migrate/d7/StoreTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d7/StoreTest.php --- b/modules/ubercart/tests/src/Kernel/Migrate/d7/StoreTest.php +++ b/modules/ubercart/tests/src/Kernel/Migrate/d7/StoreTest.php @@ -9,6 +9,7 @@ * Tests store migration. * * @group commerce_migrate + * @group commerce_migrate_ubercart7 */ class StoreTest extends Ubercart7TestBase { @@ -23,7 +24,7 @@ 'd7_user_role', 'd7_user', 'ubercart_currency', - 'd7_ubercart_store' + 'd7_ubercart_store', ]); } only in patch2: unchanged: --- a/modules/ubercart/src/Plugin/migrate/source/d6/BillingProfile.php +++ b/modules/ubercart/src/Plugin/migrate/source/d6/BillingProfile.php @@ -9,7 +9,8 @@ use Drupal\migrate\Row; * Drupal 6 ubercart billing profile source. * * @MigrateSource( - * id = "d6_ubercart_billing_profile" + * id = "d6_ubercart_billing_profile", + * source_provider = "uc_order" * ) */ class BillingProfile extends SqlBase {