diff --git a/modules/commerce/src/Plugin/migrate/process/commerce1/OrderItemDiscountAdjustment.php b/modules/commerce/src/Plugin/migrate/process/commerce1/OrderItemDiscountAdjustment.php index 48f8668..6bcafb5 100644 --- a/modules/commerce/src/Plugin/migrate/process/commerce1/OrderItemDiscountAdjustment.php +++ b/modules/commerce/src/Plugin/migrate/process/commerce1/OrderItemDiscountAdjustment.php @@ -121,7 +121,7 @@ class OrderItemDiscountAdjustment extends CommercePrice implements ContainerFact $order_names = []; foreach ($order_components as $order_component) { $order_names[] = $order_component['name']; - }; + } $shipping = $row->getSourceProperty('shipping'); $not_shipping = []; @@ -130,7 +130,7 @@ class OrderItemDiscountAdjustment extends CommercePrice implements ContainerFact foreach ($shipping as $shipping_item) { $data = unserialize($shipping_item['data']); $shipping_names[] = $data['shipping_service']['price_component']; - }; + } $not_shipping = array_diff($order_names, $shipping_names); } diff --git a/modules/commerce/tests/src/Functional/commerce1/MigrateUpgradeAddToCartTest.php b/modules/commerce/tests/src/Functional/commerce1/MigrateUpgradeAddToCartTest.php index 9a4689b..8811f3c 100644 --- a/modules/commerce/tests/src/Functional/commerce1/MigrateUpgradeAddToCartTest.php +++ b/modules/commerce/tests/src/Functional/commerce1/MigrateUpgradeAddToCartTest.php @@ -81,7 +81,7 @@ class MigrateUpgradeAddToCartTest extends MigrateUpgradeTestBase { ], ], ]); - $this->loadFixture(drupal_get_path('module', 'commerce_migrate_commerce') . '/tests/fixtures/ck2.php'); + $this->loadFixture(\Drupal::service('extension.list.module')->getPath('commerce_migrate_commerce') . '/tests/fixtures/ck2.php'); } /** @@ -110,7 +110,7 @@ class MigrateUpgradeAddToCartTest extends MigrateUpgradeTestBase { // Add to cart. \Drupal::service('commerce_cart.cart_provider')->createCart('default'); $this->drupalGet('/product/15'); - $this->drupalPostForm(NULL, [], 'Add to cart'); + $this->submitForm([], 'Add to cart'); $session->pageTextContains('Tote Bag 1 added to your cart.'); } diff --git a/modules/commerce/tests/src/Functional/commerce1/MigrateUpgradeCommerce1Test.php b/modules/commerce/tests/src/Functional/commerce1/MigrateUpgradeCommerce1Test.php index ed6a03d..4fa9d7a 100644 --- a/modules/commerce/tests/src/Functional/commerce1/MigrateUpgradeCommerce1Test.php +++ b/modules/commerce/tests/src/Functional/commerce1/MigrateUpgradeCommerce1Test.php @@ -89,7 +89,7 @@ class MigrateUpgradeCommerce1Test extends MigrateUpgradeTestBase { ], ], ]); - $this->loadFixture(drupal_get_path('module', 'commerce_migrate_commerce') . '/tests/fixtures/ck2.php'); + $this->loadFixture(\Drupal::service('extension.list.module')->getPath('commerce_migrate_commerce') . '/tests/fixtures/ck2.php'); } /** @@ -215,7 +215,7 @@ class MigrateUpgradeCommerce1Test extends MigrateUpgradeTestBase { if (Comparator::greaterThanOrEqualTo(\Drupal::VERSION, '9.4.0-alpha1')) { $entity_counts['block'] = 28; $entity_counts['date_format'] = 12; - }; + } return $entity_counts; } diff --git a/modules/commerce/tests/src/Functional/commerce1/MigrateUpgradeReviewPageTest.php b/modules/commerce/tests/src/Functional/commerce1/MigrateUpgradeReviewPageTest.php index 1b72e98..3455331 100644 --- a/modules/commerce/tests/src/Functional/commerce1/MigrateUpgradeReviewPageTest.php +++ b/modules/commerce/tests/src/Functional/commerce1/MigrateUpgradeReviewPageTest.php @@ -57,7 +57,7 @@ class MigrateUpgradeReviewPageTest extends MigrateUpgradeReviewPageTestBase { ], ], ]); - $this->loadFixture(drupal_get_path('module', 'commerce_migrate_commerce') . '/tests/fixtures/ck2.php'); + $this->loadFixture(\Drupal::service('extension.list.module')->getPath('commerce_migrate_commerce') . '/tests/fixtures/ck2.php'); } /** @@ -76,7 +76,7 @@ class MigrateUpgradeReviewPageTest extends MigrateUpgradeReviewPageTestBase { ]; if (Comparator::greaterThanOrEqualTo(\Drupal::VERSION, '9.4.0-alpha1')) { $available_paths = array_diff($available_paths, ['Color']); - }; + } return $available_paths; } diff --git a/modules/commerce/tests/src/Kernel/Plugin/process/CommerceOrderItemDiscountAdjustmentTest.php b/modules/commerce/tests/src/Kernel/Plugin/process/CommerceOrderItemDiscountAdjustmentTest.php index 2d70a48..038a2d7 100644 --- a/modules/commerce/tests/src/Kernel/Plugin/process/CommerceOrderItemDiscountAdjustmentTest.php +++ b/modules/commerce/tests/src/Kernel/Plugin/process/CommerceOrderItemDiscountAdjustmentTest.php @@ -34,7 +34,7 @@ class CommerceOrderItemDiscountAdjustmentTest extends KernelTestBase { /** * {@inheritdoc} */ - public static $modules = [ + protected static $modules = [ 'commerce', 'commerce_price', 'system', @@ -44,17 +44,11 @@ class CommerceOrderItemDiscountAdjustmentTest extends KernelTestBase { /** * {@inheritdoc} */ - public function setUp() { + public function setUp(): void { parent::setUp(); - $migration = $this->getMockBuilder('Drupal\migrate\Plugin\MigrationInterface') - ->disableOriginalConstructor() - ->getMock(); - $plugin_manager = $this->getMockBuilder('Drupal\migrate\Plugin\MigrationPluginManagerInterface') - ->disableOriginalConstructor() - ->getMock(); - $this->migrateExecutable = $this->getMockBuilder('Drupal\migrate\MigrateExecutable') - ->disableOriginalConstructor() - ->getMock(); + $migration = $this->createMock('Drupal\migrate\Plugin\MigrationInterface'); + $plugin_manager = $this->createMock('Drupal\migrate\Plugin\MigrationPluginManagerInterface'); + $this->migrateExecutable = $this->createMock('Drupal\migrate\MigrateExecutable'); $entity_type_manager = \Drupal::service('entity_type.manager'); $rounder = new Rounder($entity_type_manager); $this->plugin = new OrderItemDiscountAdjustment([], 'map', [], $migration, $plugin_manager, $entity_type_manager, $rounder); diff --git a/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/CommerceFieldNameTest.php b/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/CommerceFieldNameTest.php index 004ed2d..0fc804d 100644 --- a/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/CommerceFieldNameTest.php +++ b/modules/commerce/tests/src/Unit/Plugin/migrate/process/commerce1/CommerceFieldNameTest.php @@ -34,18 +34,10 @@ class CommerceFieldNameTest extends MigrateProcessTestCase { */ protected function setUp(): void { parent::setUp(); - $migration_plugin_manager = $this->getMockBuilder('Drupal\migrate\Plugin\MigrationPluginManagerInterface') - ->disableOriginalConstructor() - ->getMock(); - $this->processPluginManager = $this->getMockBuilder('Drupal\migrate\Plugin\MigratePluginManagerInterface') - ->disableOriginalConstructor() - ->getMock(); - $this->makeEntityUnique = $this->getMockBuilder('Drupal\migrate\Plugin\migrate\process\MakeUniqueEntityField') - ->disableOriginalConstructor() - ->getMock(); - $this->migrateExecutable = $this->getMockBuilder('Drupal\migrate\MigrateExecutable') - ->disableOriginalConstructor() - ->getMock(); + $migration_plugin_manager = $this->createMock('Drupal\migrate\Plugin\MigrationPluginManagerInterface'); + $this->processPluginManager = $this->createMock('Drupal\migrate\Plugin\MigratePluginManagerInterface'); + $this->makeEntityUnique = $this->createMock('Drupal\migrate\Plugin\migrate\process\MakeUniqueEntityField'); + $this->migrateExecutable = $this->createMock('Drupal\migrate\MigrateExecutable'); $this->plugin = new CommerceFieldName([], 'test', [], $migration_plugin_manager, $this->processPluginManager); } 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 fa8236b..a5c2eb3 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 @@ -29,18 +29,10 @@ class CommerceOrderItemDiscountAdjustmentTest extends MigrateProcessTestCase { */ public function testOrderItemDiscountAdjustment($value = NULL, $components = NULL, $shipping = NULL, $expected = NULL) { $configuration = []; - $migration = $this->getMockBuilder('Drupal\migrate\Plugin\MigrationInterface') - ->disableOriginalConstructor() - ->getMock(); - $plugin_manager = $this->getMockBuilder('Drupal\migrate\Plugin\MigrationPluginManagerInterface') - ->disableOriginalConstructor() - ->getMock(); - $entity_type_manager = $this->getMockBuilder('Drupal\Core\Entity\EntityTypeManagerInterface') - ->disableOriginalConstructor() - ->getMock(); - $this->rounder = $this->getMockBuilder('\Drupal\commerce_price\RounderInterface') - ->disableOriginalConstructor() - ->getMock(); + $migration = $this->createMock('Drupal\migrate\Plugin\MigrationInterface'); + $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)) ->method('getSourceProperty') ->with('order_components/0/data/components') 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 b8712bd..e4ba89e 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 @@ -2,6 +2,7 @@ namespace Drupal\Tests\commerce_migrate_commerce\Unit\Plugin\migrate\process\commerce1; +use Prophecy\PhpUnit\ProphecyTrait; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Tests\migrate\Unit\process\MigrateProcessTestCase; use Drupal\commerce_migrate_commerce\Plugin\migrate\process\commerce1\OrderItemDiscountAdjustment; @@ -22,6 +23,7 @@ use Drupal\migrate\Row; */ class OrderItemDiscountAdjustmentTest extends MigrateProcessTestCase { + use ProphecyTrait; /** * The mocked migration. * @@ -77,10 +79,7 @@ class OrderItemDiscountAdjustmentTest extends MigrateProcessTestCase { $row->getSourceProperty('max_line_item_id') ->willReturn(1); - $mock = $this->getMockBuilder('\Drupal\Tests\commerce_migrate_commerce\Unit\Plugin\migrate\process\commerce1\TestOrderItemDiscountAdjustment') - ->disableOriginalConstructor() - ->setMethods(['getAdjustment']) - ->getMock(); + $mock = $this->createMock('\Drupal\Tests\commerce_migrate_commerce\Unit\Plugin\migrate\process\commerce1\TestOrderItemDiscountAdjustment'); $mock->expects($this->any())->method('getAdjustment') ->willReturn($getadj); $mock->setRounder($this->rounder->reveal()); @@ -273,10 +272,7 @@ class OrderItemDiscountAdjustmentTest extends MigrateProcessTestCase { $this->rounder->round($rounder_imput)->willReturn($rounder_output); - $mock = $this->getMockBuilder('\Drupal\Tests\commerce_migrate_commerce\Unit\Plugin\migrate\process\commerce1\TestOrderItemDiscountAdjustment') - ->disableOriginalConstructor() - ->setMethods(['split']) - ->getMock(); + $mock = $this->createMock('\Drupal\Tests\commerce_migrate_commerce\Unit\Plugin\migrate\process\commerce1\TestOrderItemDiscountAdjustment'); $mock->expects($this->any())->method('split') ->willReturn($split); $mock->setRounder($this->rounder->reveal()); 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..c5b6aef 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 @@ -2,6 +2,7 @@ namespace Drupal\Tests\commerce_migrate_commerce\Unit\Plugin\migrate\process\commerce1; +use Prophecy\PhpUnit\ProphecyTrait; use Drupal\commerce_migrate_commerce\Plugin\migrate\process\commerce1\ResolveProductVariationType; use Drupal\migrate\Row; use Drupal\Tests\migrate\Unit\process\MigrateProcessTestCase; @@ -16,6 +17,8 @@ use Drupal\Tests\migrate\Unit\process\MigrateProcessTestCase; */ class ResolveProductVariationTypeTest extends MigrateProcessTestCase { + use ProphecyTrait; + /** * Tests valid values. * diff --git a/modules/csv_example/tests/src/Unit/Plugin/migrate/process/AttributeDestinationTest.php b/modules/csv_example/tests/src/Unit/Plugin/migrate/process/AttributeDestinationTest.php index f0eee1a..8e4ec57 100644 --- a/modules/csv_example/tests/src/Unit/Plugin/migrate/process/AttributeDestinationTest.php +++ b/modules/csv_example/tests/src/Unit/Plugin/migrate/process/AttributeDestinationTest.php @@ -23,10 +23,7 @@ class AttributeDestinationTest extends MigrateProcessTestCase { */ public function testAttributeDestination($value = NULL, $expected = NULL) { $configuration = []; - $this->row = $this->getMockBuilder('Drupal\migrate\Row') - ->setMethods(['get']) - ->disableOriginalConstructor() - ->getMock(); + $this->row = $this->createMock('Drupal\migrate\Row'); $this->row ->expects($this->once()) 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..2cbfd3a 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,8 @@ use Drupal\migrate\Row; */ class ProductVariationFileTest extends MigrateProcessTestCase { + use ProphecyTrait; + /** * Tests Product variation file process plugin. */ diff --git a/modules/ubercart/tests/src/Functional/uc6/MigrateUpgradeAddToCartTest.php b/modules/ubercart/tests/src/Functional/uc6/MigrateUpgradeAddToCartTest.php index f736c33..1806d92 100644 --- a/modules/ubercart/tests/src/Functional/uc6/MigrateUpgradeAddToCartTest.php +++ b/modules/ubercart/tests/src/Functional/uc6/MigrateUpgradeAddToCartTest.php @@ -81,7 +81,7 @@ class MigrateUpgradeAddToCartTest extends MigrateUpgradeTestBase { ], ], ]); - $this->loadFixture(drupal_get_path('module', 'commerce_migrate_ubercart') . '/tests/fixtures/uc6.php'); + $this->loadFixture(\Drupal::service('extension.list.module')->getPath('commerce_migrate_ubercart') . '/tests/fixtures/uc6.php'); } /** diff --git a/modules/ubercart/tests/src/Functional/uc6/MigrateUpgradeReviewPageTest.php b/modules/ubercart/tests/src/Functional/uc6/MigrateUpgradeReviewPageTest.php index 2a09982..e9e02cb 100644 --- a/modules/ubercart/tests/src/Functional/uc6/MigrateUpgradeReviewPageTest.php +++ b/modules/ubercart/tests/src/Functional/uc6/MigrateUpgradeReviewPageTest.php @@ -51,7 +51,7 @@ class MigrateUpgradeReviewPageTest extends MultilingualReviewPageTestBase { */ protected function setUp(): void { parent::setUp(); - $this->loadFixture(drupal_get_path('module', 'commerce_migrate_ubercart') . '/tests/fixtures/uc6.php'); + $this->loadFixture(\Drupal::service('extension.list.module')->getPath('commerce_migrate_ubercart') . '/tests/fixtures/uc6.php'); } /** diff --git a/modules/ubercart/tests/src/Functional/uc6/MigrateUpgradeUbercart6Test.php b/modules/ubercart/tests/src/Functional/uc6/MigrateUpgradeUbercart6Test.php index f6910f8..9ad9e7f 100644 --- a/modules/ubercart/tests/src/Functional/uc6/MigrateUpgradeUbercart6Test.php +++ b/modules/ubercart/tests/src/Functional/uc6/MigrateUpgradeUbercart6Test.php @@ -77,7 +77,7 @@ class MigrateUpgradeUbercart6Test extends MigrateUpgradeExecuteTestBase { */ protected function setUp(): void { parent::setUp(); - $this->loadFixture(drupal_get_path('module', 'commerce_migrate_ubercart') . '/tests/fixtures/uc6.php'); + $this->loadFixture(\Drupal::service('extension.list.module')->getPath('commerce_migrate_ubercart') . '/tests/fixtures/uc6.php'); } /** @@ -144,7 +144,7 @@ class MigrateUpgradeUbercart6Test extends MigrateUpgradeExecuteTestBase { ]; if (Comparator::greaterThanOrEqualTo(\Drupal::VERSION, '9.4.0-alpha1')) { $entity_counts['block'] = 25; - }; + } return $entity_counts; } diff --git a/modules/ubercart/tests/src/Functional/uc7/MigrateUpgradeReviewPageTest.php b/modules/ubercart/tests/src/Functional/uc7/MigrateUpgradeReviewPageTest.php index 50e81cb..7ce4266 100644 --- a/modules/ubercart/tests/src/Functional/uc7/MigrateUpgradeReviewPageTest.php +++ b/modules/ubercart/tests/src/Functional/uc7/MigrateUpgradeReviewPageTest.php @@ -52,7 +52,7 @@ class MigrateUpgradeReviewPageTest extends MultilingualReviewPageTestBase { */ protected function setUp(): void { parent::setUp(); - $this->loadFixture(drupal_get_path('module', 'commerce_migrate_ubercart') . '/tests/fixtures/uc7.php'); + $this->loadFixture(\Drupal::service('extension.list.module')->getPath('commerce_migrate_ubercart') . '/tests/fixtures/uc7.php'); } /** @@ -75,7 +75,7 @@ class MigrateUpgradeReviewPageTest extends MultilingualReviewPageTestBase { ]; if (Comparator::greaterThanOrEqualTo(\Drupal::VERSION, '9.4.0-alpha1')) { $available_paths = array_diff($available_paths, ['Color']); - }; + } return $available_paths; } diff --git a/modules/ubercart/tests/src/Functional/uc7/MigrateUpgradeUbercart7Test.php b/modules/ubercart/tests/src/Functional/uc7/MigrateUpgradeUbercart7Test.php index fdb7191..6c29288 100644 --- a/modules/ubercart/tests/src/Functional/uc7/MigrateUpgradeUbercart7Test.php +++ b/modules/ubercart/tests/src/Functional/uc7/MigrateUpgradeUbercart7Test.php @@ -74,7 +74,7 @@ class MigrateUpgradeUbercart7Test extends MigrateUpgradeExecuteTestBase { */ protected function setUp(): void { parent::setUp(); - $this->loadFixture(drupal_get_path('module', 'commerce_migrate_ubercart') . '/tests/fixtures/uc7.php'); + $this->loadFixture(\Drupal::service('extension.list.module')->getPath('commerce_migrate_ubercart') . '/tests/fixtures/uc7.php'); } /** @@ -142,7 +142,7 @@ class MigrateUpgradeUbercart7Test extends MigrateUpgradeExecuteTestBase { if (Comparator::greaterThanOrEqualTo(\Drupal::VERSION, '9.4.0-alpha1')) { $entity_counts['block'] = 29; $entity_counts['date_format'] = 12; - }; + } return $entity_counts; } diff --git a/modules/ubercart/tests/src/Kernel/Plugin/process/UbercartFieldStorageGenerateTest.php b/modules/ubercart/tests/src/Kernel/Plugin/process/UbercartFieldStorageGenerateTest.php index cfe955b..be79a81 100644 --- a/modules/ubercart/tests/src/Kernel/Plugin/process/UbercartFieldStorageGenerateTest.php +++ b/modules/ubercart/tests/src/Kernel/Plugin/process/UbercartFieldStorageGenerateTest.php @@ -50,9 +50,7 @@ class UbercartFieldStorageGenerateTest extends KernelTestBase { */ public function testValidInputs($value = NULL, $source_properties = NULL, $destination_properties = NULL, $expected = NULL) { - $migrateExecutable = $this->getMockBuilder('Drupal\migrate\MigrateExecutable') - ->disableOriginalConstructor() - ->getMock(); + $migrateExecutable = $this->createMock('Drupal\migrate\MigrateExecutable'); $migration_plugin_manager = \Drupal::service('plugin.manager.migration'); $plugin = new UbercartFieldStorageGenerate([], 'test', [], $migration_plugin_manager, ''); @@ -95,9 +93,7 @@ class UbercartFieldStorageGenerateTest extends KernelTestBase { */ public function testProviderInvalidInputs($value = NULL, $source_properties = NULL, $destination_properties = NULL, $expected = NULL) { - $migrateExecutable = $this->getMockBuilder('Drupal\migrate\MigrateExecutable') - ->disableOriginalConstructor() - ->getMock(); + $migrateExecutable = $this->createMock('Drupal\migrate\MigrateExecutable'); $migration_plugin_manager = \Drupal::service('plugin.manager.migration'); $plugin = new UbercartFieldStorageGenerate([], 'test', [], $migration_plugin_manager, ''); 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/tests/src/Kernel/Plugin/migrate/process/CommerceAdjustmentsTest.php b/tests/src/Kernel/Plugin/migrate/process/CommerceAdjustmentsTest.php index a76463d..c9b4b82 100644 --- a/tests/src/Kernel/Plugin/migrate/process/CommerceAdjustmentsTest.php +++ b/tests/src/Kernel/Plugin/migrate/process/CommerceAdjustmentsTest.php @@ -21,7 +21,7 @@ class CommerceAdjustmentsTest extends CommerceKernelTestBase { /** * {@inheritdoc} */ - public static $modules = [ + protected static $modules = [ 'entity_reference_revisions', 'profile', 'state_machine', @@ -46,7 +46,7 @@ class CommerceAdjustmentsTest extends CommerceKernelTestBase { /** * MigrateExecutable for the test. * - * @var \Drupal\migrate\MigrateExecutable|\PHPUnit_Framework_MockObject_MockObject + * @var \Drupal\migrate\MigrateExecutable|\PHPUnit\Framework\MockObject\MockObject */ protected $migrateExecutable; @@ -58,9 +58,7 @@ class CommerceAdjustmentsTest extends CommerceKernelTestBase { $this->row = new Row([]); $configuration = []; $this->plugin = new CommerceAdjustments($configuration, 'map', []); - $this->migrateExecutable = $this->getMockBuilder(MigrateExecutable::class) - ->disableOriginalConstructor() - ->getMock(); + $this->migrateExecutable = $this->createMock(MigrateExecutable::class); } /** diff --git a/tests/src/Kernel/Plugin/migrate/process/CommerceReferenceRevisionTest.php b/tests/src/Kernel/Plugin/migrate/process/CommerceReferenceRevisionTest.php index 0c541a0..a5eee91 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,8 @@ use Drupal\Tests\migrate\Unit\process\MigrateProcessTestCase; */ class CommerceReferenceRevisionTest extends MigrateProcessTestCase { + use ProphecyTrait; + /** * Tests a successful lookup. *