' . 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' => Url::fromRoute('help.page', ['name' => 'migrate']), - ':migrate_drupal' => Url::fromRoute('help.page', ['name' => 'migrate_drupal']), + ':migrate' => Url::fromRoute('help.page', ['name' => 'migrate'])->toString(), + ':migrate_drupal' => Url::fromRoute('help.page', ['name' => 'migrate_drupal'])->toString(), ':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 674bcdd..bc0d9e3 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_version_requirement: ^9.1 +core_version_requirement: ^9.1 || ^10 package: Commerce (contrib) dependencies: - commerce:commerce diff --git a/modules/commerce/tests/src/Kernel/Migrate/commerce1/Commerce1TestBase.php b/modules/commerce/tests/src/Kernel/Migrate/commerce1/Commerce1TestBase.php index e3c4db3..3680770 100644 --- a/modules/commerce/tests/src/Kernel/Migrate/commerce1/Commerce1TestBase.php +++ b/modules/commerce/tests/src/Kernel/Migrate/commerce1/Commerce1TestBase.php @@ -4,7 +4,7 @@ namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\commerce1; use Drupal\Core\StreamWrapper\PublicStream; use Drupal\Core\StreamWrapper\StreamWrapperInterface; -use Drupal\Tests\commerce_cart\Traits\CartManagerTestTrait; +use Drupal\Tests\commerce_cart\Kernel\CartKernelTestBase; use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase; /** @@ -12,8 +12,6 @@ use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase; */ abstract class Commerce1TestBase extends MigrateDrupal7TestBase { - use CartManagerTestTrait; - /** * {@inheritdoc} */ @@ -131,7 +129,6 @@ abstract class Commerce1TestBase extends MigrateDrupal7TestBase { $address->locality = 'Wellington'; $store->setAddress($address); $store->save(); - $this->installCommerceCart(); $this->migrateProfiles(); $this->executeMigrations([ diff --git a/modules/commerce/tests/src/Kernel/Plugin/migrate/source/commerce1/SourceTestBase.php b/modules/commerce/tests/src/Kernel/Plugin/migrate/source/commerce1/SourceTestBase.php index 6ddc525..38f9ec8 100644 --- a/modules/commerce/tests/src/Kernel/Plugin/migrate/source/commerce1/SourceTestBase.php +++ b/modules/commerce/tests/src/Kernel/Plugin/migrate/source/commerce1/SourceTestBase.php @@ -64,7 +64,6 @@ abstract class SourceTestBase extends MigrateSqlSourceTestBase { /** @var \Drupal\commerce_store\Entity\StoreInterface $store */ $store = $store_storage->create($store_values); $store->save(); - $store_storage->markAsDefault($store); } } diff --git a/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/CommerceOrderItemDiscountAdjustmentTest.php b/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/CommerceOrderItemDiscountAdjustmentTest.php index a5c2eb3..2ec2054 100644 --- a/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/CommerceOrderItemDiscountAdjustmentTest.php +++ b/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/CommerceOrderItemDiscountAdjustmentTest.php @@ -33,18 +33,13 @@ class CommerceOrderItemDiscountAdjustmentTest extends MigrateProcessTestCase { $plugin_manager = $this->createMock('Drupal\migrate\Plugin\MigrationPluginManagerInterface'); $entity_type_manager = $this->createMock('Drupal\Core\Entity\EntityTypeManagerInterface'); $this->rounder = $this->createMock('\Drupal\commerce_price\RounderInterface'); - $this->row->expects($this->at(0)) + $this->row->expects($this->atLeast(2)) ->method('getSourceProperty') - ->with('order_components/0/data/components') - ->will($this->returnValue($components)); - - $this->row->expects($this->at(1)) - ->method('getSourceProperty') - ->with('shipping') - ->will($this->returnValue($shipping)); + ->withConsecutive(['order_components/0/data/components'], ['shipping']) + ->willReturnOnConsecutiveCalls($components, $shipping); $price = new Price('10', 'NZD'); - $this->rounder->expects($this->at(0)) + $this->rounder->expects($this->atLeastOnce()) ->method('round') ->with($price) ->will($this->returnValue($price)); diff --git a/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/OrderItemDiscountAdjustmentTest.php b/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/OrderItemDiscountAdjustmentTest.php index ccaf72e..27340f6 100644 --- a/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/OrderItemDiscountAdjustmentTest.php +++ b/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/OrderItemDiscountAdjustmentTest.php @@ -11,6 +11,7 @@ use Drupal\migrate\MigrateSkipRowException; use Drupal\migrate\Plugin\Migration; use Drupal\migrate\Plugin\MigrationPluginManager; use Drupal\migrate\Row; +use Prophecy\PhpUnit\ProphecyTrait; /** * Tests the order item discount adjustment plugin. @@ -22,6 +23,7 @@ use Drupal\migrate\Row; */ class OrderItemDiscountAdjustmentTest extends MigrateProcessTestCase { + use ProphecyTrait; /** * The mocked migration. * diff --git a/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/ResolveProductVariationTypeTest.php b/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/ResolveProductVariationTypeTest.php index 378e035..b59c682 100644 --- a/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/ResolveProductVariationTypeTest.php +++ b/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/ResolveProductVariationTypeTest.php @@ -5,6 +5,7 @@ namespace Drupal\Tests\commerce_migrate_commerce\Unit\Plugin\migrate\process\com use Drupal\commerce_migrate_commerce\Plugin\migrate\process\commerce1\ResolveProductVariationType; use Drupal\migrate\Row; use Drupal\Tests\migrate\Unit\process\MigrateProcessTestCase; +use Prophecy\PhpUnit\ProphecyTrait; /** * Tests the resolve target type process plugin. @@ -16,6 +17,7 @@ use Drupal\Tests\migrate\Unit\process\MigrateProcessTestCase; */ class ResolveProductVariationTypeTest extends MigrateProcessTestCase { + use ProphecyTrait; /** * Tests valid values. * diff --git a/modules/csv_example/commerce_migrate_csv_example.info.yml b/modules/csv_example/commerce_migrate_csv_example.info.yml index a58c378..48a1fd1 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_version_requirement: ^9.1 +core_version_requirement: ^9.1 || ^10 package: Commerce (contrib) dependencies: - commerce:commerce diff --git a/modules/csv_example/tests/src/Unit/Plugin/migrate/process/ProductVariationFileTest.php b/modules/csv_example/tests/src/Unit/Plugin/migrate/process/ProductVariationFileTest.php index fbe7f97..8e1ef38 100644 --- a/modules/csv_example/tests/src/Unit/Plugin/migrate/process/ProductVariationFileTest.php +++ b/modules/csv_example/tests/src/Unit/Plugin/migrate/process/ProductVariationFileTest.php @@ -2,6 +2,7 @@ namespace Drupal\Tests\commerce_migrate_csv_example\Unit\Plugin\migrate\process; +use Prophecy\PhpUnit\ProphecyTrait; use Drupal\Tests\migrate\Unit\process\MigrateProcessTestCase; use Drupal\commerce_migrate_csv_example\Plugin\migrate\process\ProductVariationFile; use Drupal\migrate\MigrateExecutableInterface; @@ -19,6 +20,7 @@ use Drupal\migrate\Row; */ class ProductVariationFileTest extends MigrateProcessTestCase { + use ProphecyTrait; /** * Tests Product variation file process plugin. */ diff --git a/modules/magento/commerce_migrate_magento.info.yml b/modules/magento/commerce_migrate_magento.info.yml index 2f89ff8..d7d0ac9 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_version_requirement: ^9.1 +core_version_requirement: ^9.1 || ^10 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 d6b2a88..d81bcd1 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_version_requirement: ^9.1 +core_version_requirement: ^9.1 || ^10 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 90eb19a..5cd6c25 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_version_requirement: ^9.1 +core_version_requirement: ^9.1 || ^10 package: Commerce (contrib) dependencies: - commerce:commerce 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/Unit/Plugin/migrate/process/OrderItemAdjustmentTest.php b/modules/ubercart/tests/src/Unit/Plugin/migrate/process/OrderItemAdjustmentTest.php index 5238c0f..db2f94a 100644 --- a/modules/ubercart/tests/src/Unit/Plugin/migrate/process/OrderItemAdjustmentTest.php +++ b/modules/ubercart/tests/src/Unit/Plugin/migrate/process/OrderItemAdjustmentTest.php @@ -2,6 +2,7 @@ namespace Drupal\Tests\commerce_migrate_ubercart\Unit\Plugin\migrate\process; +use Prophecy\PhpUnit\ProphecyTrait; use Drupal\commerce_migrate_ubercart\Plugin\migrate\process\OrderItemAdjustment; use Drupal\commerce_price\Price; use Drupal\commerce_price\Rounder; @@ -21,6 +22,7 @@ use Drupal\Tests\migrate\Unit\process\MigrateProcessTestCase; */ class OrderItemAdjustmentTest extends MigrateProcessTestCase { + use ProphecyTrait; /** * The mocked migration. * diff --git a/modules/woocommerce/commerce_migrate_woocommerce.info.yml b/modules/woocommerce/commerce_migrate_woocommerce.info.yml index 091a73d..ee81229 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_version_requirement: ^9.1 +core_version_requirement: ^9.1 || ^10 package: Commerce (contrib) dependencies: - commerce:commerce diff --git a/tests/src/Kernel/CommerceMigrateTestTrait.php b/tests/src/Kernel/CommerceMigrateTestTrait.php index c8d5c62..288590a 100644 --- a/tests/src/Kernel/CommerceMigrateTestTrait.php +++ b/tests/src/Kernel/CommerceMigrateTestTrait.php @@ -854,7 +854,6 @@ trait CommerceMigrateTestTrait { /** @var \Drupal\commerce_store\Entity\StoreInterface $store */ $store = $store_storage->create($store_values); $store->save(); - $store_storage->markAsDefault($store); } /** diff --git a/tests/src/Kernel/CsvTestBase.php b/tests/src/Kernel/CsvTestBase.php index fafc836..e798dce 100644 --- a/tests/src/Kernel/CsvTestBase.php +++ b/tests/src/Kernel/CsvTestBase.php @@ -245,7 +245,6 @@ abstract class CsvTestBase extends MigrateTestBase { /** @var \Drupal\commerce_store\Entity\StoreInterface $store */ $store = $store_storage->create($store_values); $store->save(); - $store_storage->markAsDefault($store); } } diff --git a/tests/src/Kernel/Plugin/migrate/process/CommerceReferenceRevisionTest.php b/tests/src/Kernel/Plugin/migrate/process/CommerceReferenceRevisionTest.php index 0c541a0..c40d988 100644 --- a/tests/src/Kernel/Plugin/migrate/process/CommerceReferenceRevisionTest.php +++ b/tests/src/Kernel/Plugin/migrate/process/CommerceReferenceRevisionTest.php @@ -2,6 +2,7 @@ namespace Drupal\Tests\commerce_migrate\Kernel\Plugin\migrate\process; +use Prophecy\PhpUnit\ProphecyTrait; use Drupal\commerce_migrate\Plugin\migrate\process\CommerceReferenceRevision; use Drupal\migrate\MigrateLookupInterface; use Drupal\migrate\MigrateStub; @@ -19,6 +20,7 @@ use Drupal\Tests\migrate\Unit\process\MigrateProcessTestCase; */ class CommerceReferenceRevisionTest extends MigrateProcessTestCase { + use ProphecyTrait; /** * Tests a successful lookup. *