Fix conflicts

This commit is contained in:
dinamiko 2022-06-14 10:59:47 +02:00
commit 5de360c869
3 changed files with 12 additions and 9 deletions

View file

@ -318,6 +318,10 @@ class OrderProcessorTest extends TestCase
->expects('is')
->with(OrderStatus::APPROVED)
->andReturn(false);
$orderStatus
->expects('is')
->with(OrderStatus::CREATED)
->andReturn(false);
$orderId = 'abc';
$orderIntent = 'CAPTURE';
$currentOrder = Mockery::mock(Order::class);