diff --git a/composer.json b/composer.json index 5518eab..e92aff3 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ }, "require-dev": { "drupal/coder": "^8", - "drupal/migrate_plus": "5.x-dev", + "drupal/migrate_plus": "^6.0", "drupal/migrate_source_csv": "^3.4", "drupal/commerce_shipping": "^2.0", "drupal/paragraphs": "^1.0" diff --git a/modules/ubercart/src/Plugin/migrate/destination/CommercePayment.php b/modules/ubercart/src/Plugin/migrate/destination/CommercePayment.php index fc8f518..76eeab1 100644 --- a/modules/ubercart/src/Plugin/migrate/destination/CommercePayment.php +++ b/modules/ubercart/src/Plugin/migrate/destination/CommercePayment.php @@ -91,6 +91,7 @@ class CommercePayment extends EntityContentBase { $order_id = $row->getSourceProperty('order_id'); $query = $this->entityTypeManager->getStorage('commerce_payment')->getQuery(); $ids = $query + ->accessCheck(FALSE) ->condition('order_id', $order_id) ->sort('payment_id') ->execute(); diff --git a/modules/ubercart/tests/src/Functional/MigrateUpdateTest.php b/modules/ubercart/tests/src/Functional/MigrateUpdateTest.php index 96c5ae5..571d7de 100644 --- a/modules/ubercart/tests/src/Functional/MigrateUpdateTest.php +++ b/modules/ubercart/tests/src/Functional/MigrateUpdateTest.php @@ -16,6 +16,16 @@ class MigrateUpdateTest extends UpdatePathTestBase { */ protected $defaultTheme = 'stark'; + /** + * {@inheritdoc} + */ + protected function setUp(): void { + if (explode('.', \Drupal::VERSION)[0] != '9') { + $this->markTestSkipped(); + } + parent::setUp(); + } + /** * {@inheritdoc} */ diff --git a/modules/ubercart/tests/src/Kernel/Migrate/uc6/NodeTest.php b/modules/ubercart/tests/src/Kernel/Migrate/uc6/NodeTest.php index be3596b..b0f739c 100644 --- a/modules/ubercart/tests/src/Kernel/Migrate/uc6/NodeTest.php +++ b/modules/ubercart/tests/src/Kernel/Migrate/uc6/NodeTest.php @@ -31,8 +31,6 @@ class NodeTest extends Ubercart6TestBase { 'migrate_plus', 'path', 'path_alias', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/modules/ubercart/tests/src/Kernel/Migrate/uc6/ProductTest.php b/modules/ubercart/tests/src/Kernel/Migrate/uc6/ProductTest.php index 4c2397f..69515d2 100644 --- a/modules/ubercart/tests/src/Kernel/Migrate/uc6/ProductTest.php +++ b/modules/ubercart/tests/src/Kernel/Migrate/uc6/ProductTest.php @@ -31,8 +31,6 @@ class ProductTest extends Ubercart6TestBase { 'migrate_plus', 'path', 'path_alias', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/modules/ubercart/tests/src/Kernel/Migrate/uc6/ProductVariationTest.php b/modules/ubercart/tests/src/Kernel/Migrate/uc6/ProductVariationTest.php index f1cef37..5046c68 100644 --- a/modules/ubercart/tests/src/Kernel/Migrate/uc6/ProductVariationTest.php +++ b/modules/ubercart/tests/src/Kernel/Migrate/uc6/ProductVariationTest.php @@ -30,8 +30,6 @@ class ProductVariationTest extends Ubercart6TestBase { 'migrate_plus', 'path', 'path_alias', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/tests/src/Kernel/CommerceMigrateTestTrait.php b/tests/src/Kernel/CommerceMigrateTestTrait.php index dac064d..072e308 100644 --- a/tests/src/Kernel/CommerceMigrateTestTrait.php +++ b/tests/src/Kernel/CommerceMigrateTestTrait.php @@ -231,7 +231,7 @@ trait CommerceMigrateTestTrait { $this->assertSame($order['number'], $order_instance->getOrderNumber()); $this->assertSame($order['store_id'], $order_instance->getStoreId()); $this->assertSame($order['created_time'], $order_instance->getCreatedTime()); - $this->assertSame($order['changed_time'], $order_instance->getChangedTime()); + $this->assertSame($order['changed_time'], (string) $order_instance->getChangedTime()); $this->assertSame($order['completed_time'], $order_instance->getCompletedTime()); $this->assertSame($order['email'], $order_instance->getEmail()); $this->assertInstanceOf(Profile::class, $order_instance->getBillingProfile()); @@ -310,7 +310,7 @@ trait CommerceMigrateTestTrait { $actual = OrderItem::load($order_item['id']); $this->assertInstanceOf(OrderItem::class, $actual); $this->assertSame($order_item['created'], $actual->getCreatedTime()); - $this->assertSame($order_item['changed'], $actual->getChangedTime()); + $this->assertSame($order_item['changed'], (string) $actual->getChangedTime()); $formatted_number = $this->formatNumber($order_item['quantity'], $actual->getQuantity(), '%01.2f'); $this->assertSame($formatted_number['expected'], $formatted_number['actual']); $this->assertEquals($order_item['title'], $actual->getTitle()); @@ -567,7 +567,7 @@ trait CommerceMigrateTestTrait { $this->assertSame($product_variation['created_time'], $variation->getCreatedTime()); } if ($product_variation['changed_time'] != NULL) { - $this->assertSame($product_variation['changed_time'], $variation->getChangedTime()); + $this->assertSame($product_variation['changed_time'], (string) $variation->getChangedTime()); } } @@ -651,7 +651,7 @@ trait CommerceMigrateTestTrait { $this->assertSame($created_time, ($profile->getCreatedTime())); } if ($changed_time != NULL) { - $this->assertSame($changed_time, $profile->getChangedTime()); + $this->assertSame($changed_time, (string) $profile->getChangedTime()); } }