Implement changes based on CR

Author: rust-le

composer.json

@@ -42,7 +42,7 @@
         "phpstan/phpstan-doctrine": "^1.5",
         "phpstan/phpstan-symfony": "^1.4",
         "phpstan/phpstan-webmozart-assert": "^1.2",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.5",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
         "sylius-labs/coding-standard": "^4.4",
         "sylius/test-application": "^2.0.0@alpha",

phpunit.xml.dist

@@ -2,7 +2,7 @@
 
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.1/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
     colors="true"
     bootstrap="vendor/sylius/test-application/config/bootstrap.php"
 >

tests/Application/src/Kernel.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Sylius\InvoicingPlugin\Application;
+
+use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+use Symfony\Component\HttpKernel\Kernel as BaseKernel;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+
+final class Kernel extends BaseKernel
+{
+    use MicroKernelTrait;
+
+    public function registerBundles(): iterable
+    {
+        $contents = require $this->getProjectDir() . '/tests/TestApplication/bundles.php';
+        
+        foreach ($contents as $class => $envs) {
+            if ($envs[$this->environment] ?? $envs['all'] ?? false) {
+                yield new $class();
+            }
+        }
+    }
+
+    public function getProjectDir(): string
+    {
+        return \dirname(__DIR__, 3);
+    }
+
+    protected function configureContainer(ContainerConfigurator $container): void
+    {
+        $container->import('../TestApplication/config/config.yaml');
+        
+        if (is_file(\dirname(__DIR__) . '/TestApplication/config/services_test.php')) {
+            $container->import('../TestApplication/config/services_test.php');
+        }
+    }
+
+    protected function configureRoutes(RoutingConfigurator $routes): void
+    {
+        $routes->import('../TestApplication/config/routes.yaml');
+    }
+}

tests/Unit/Command/SendInvoiceEmailTest.php

@@ -13,12 +13,13 @@
 
 namespace Tests\Sylius\InvoicingPlugin\Unit\Command;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Sylius\InvoicingPlugin\Command\SendInvoiceEmail;
 
 final class SendInvoiceEmailTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function it_represents_an_intention_to_send_email_containing_invoice(): void
     {
         $command = new SendInvoiceEmail('0000001');

tests/Unit/CommandHandler/SendInvoiceEmailHandlerTest.php

@@ -13,6 +13,7 @@
 
 namespace Tests\Sylius\InvoicingPlugin\Unit\CommandHandler;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Sylius\Component\Core\Model\CustomerInterface;
@@ -48,7 +49,7 @@ protected function setUp(): void
         );
     }
 
-    /** @test */
+    #[Test]
     public function it_requests_an_email_with_an_invoice_to_be_sent(): void
     {
         $invoice = $this->createMock(InvoiceInterface::class);
@@ -85,7 +86,7 @@ public function it_requests_an_email_with_an_invoice_to_be_sent(): void
         ($this->handler)(new SendInvoiceEmail('0000001'));
     }
 
-    /** @test */
+    #[Test]
     public function it_does_not_request_an_email_to_be_sent_if_order_was_not_found(): void
     {
         $this->orderRepository
@@ -105,7 +106,7 @@ public function it_does_not_request_an_email_to_be_sent_if_order_was_not_found()
         ($this->handler)(new SendInvoiceEmail('0000001'));
     }
 
-    /** @test */
+    #[Test]
     public function it_does_not_request_an_email_to_be_sent_if_customer_was_not_found(): void
     {
         $order = $this->createMock(OrderInterface::class);
@@ -132,7 +133,7 @@ public function it_does_not_request_an_email_to_be_sent_if_customer_was_not_foun
         ($this->handler)(new SendInvoiceEmail('0000001'));
     }
 
-    /** @test */
+    #[Test]
     public function it_does_not_request_an_email_to_be_sent_if_invoice_was_not_found(): void
     {
         $order = $this->createMock(OrderInterface::class);

tests/Unit/Converter/OrderItemUnitsToLineItemsConverterTest.php

@@ -14,6 +14,7 @@
 namespace Tests\Sylius\InvoicingPlugin\Unit\Converter;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Sylius\Component\Core\Model\OrderInterface;
@@ -51,13 +52,13 @@ protected function setUp(): void
         );
     }
 
-    /** @test */
+    #[Test]
     public function it_implements_line_items_converter_interface(): void
     {
         self::assertInstanceOf(LineItemsConverterInterface::class, $this->converter);
     }
 
-    /** @test */
+    #[Test]
     public function it_extracts_line_items_from_order_item_units(): void
     {
         $lineItem = $this->createMock(LineItemInterface::class);
@@ -104,7 +105,7 @@ public function it_extracts_line_items_from_order_item_units(): void
         self::assertEquals([$lineItem], $result);
     }
 
-    /** @test */
+    #[Test]
     public function it_groups_the_same_line_items_during_extracting_order_item_units(): void
     {
         $mjolnirLineItem = $this->createMock(LineItemInterface::class);
@@ -121,12 +122,24 @@ public function it_groups_the_same_line_items_during_extracting_order_item_units
         $this->lineItemFactory
             ->expects($this->exactly(3))
             ->method('createWithData')
-            ->withConsecutive(
-                ['Mjolnir', 1, 5000, 5000, 5000, 500, 5500, null, 'MJOLNIR', '10%'],
-                ['Mjolnir', 1, 5000, 5000, 5000, 500, 5500, null, 'MJOLNIR', '10%'],
-                ['Stormbreaker', 1, 8000, 8000, 8000, 1600, 9600, null, 'STORMBREAKER', '20%'],
-            )
-            ->willReturnOnConsecutiveCalls($mjolnirLineItem, $mjolnirLineItem, $stormbreakerLineItem);
+            ->willReturnCallback(function (...$args) use ($mjolnirLineItem, $stormbreakerLineItem) {
+                static $callCount = 0;
+                ++$callCount;
+
+                if ($callCount === 1) {
+                    $this->assertEquals(['Mjolnir', 1, 5000, 5000, 5000, 500, 5500, null, 'MJOLNIR', '10%'], $args);
+
+                    return $mjolnirLineItem;
+                }
+                if ($callCount === 2) {
+                    $this->assertEquals(['Mjolnir', 1, 5000, 5000, 5000, 500, 5500, null, 'MJOLNIR', '10%'], $args);
+
+                    return $mjolnirLineItem;
+                }
+                $this->assertEquals(['Stormbreaker', 1, 8000, 8000, 8000, 1600, 9600, null, 'STORMBREAKER', '20%'], $args);
+
+                return $stormbreakerLineItem;
+            });
 
         $mjolnirLineItem
             ->expects($this->exactly(2))
@@ -161,8 +174,24 @@ public function it_groups_the_same_line_items_during_extracting_order_item_units
         $this->unitNetPriceProvider
             ->expects($this->exactly(3))
             ->method('getUnitNetPrice')
-            ->withConsecutive([$firstOrderItemUnit], [$secondOrderItemUnit], [$thirdOrderItemUnit])
-            ->willReturnOnConsecutiveCalls(5000, 5000, 8000);
+            ->willReturnCallback(function ($unit) use ($firstOrderItemUnit, $secondOrderItemUnit, $thirdOrderItemUnit) {
+                static $callCount = 0;
+                ++$callCount;
+
+                if ($callCount === 1) {
+                    $this->assertSame($firstOrderItemUnit, $unit);
+
+                    return 5000;
+                }
+                if ($callCount === 2) {
+                    $this->assertSame($secondOrderItemUnit, $unit);
+
+                    return 5000;
+                }
+                $this->assertSame($thirdOrderItemUnit, $unit);
+
+                return 8000;
+            });
 
         // Second order item unit setup
         $secondOrderItemUnit->expects(self::once())->method('getTaxTotal')->willReturn(500);
@@ -188,8 +217,24 @@ public function it_groups_the_same_line_items_during_extracting_order_item_units
         $this->taxRatePercentageProvider
             ->expects($this->exactly(3))
             ->method('provideFromAdjustable')
-            ->withConsecutive([$firstOrderItemUnit], [$secondOrderItemUnit], [$thirdOrderItemUnit])
-            ->willReturnOnConsecutiveCalls('10%', '10%', '20%');
+            ->willReturnCallback(function ($unit) use ($firstOrderItemUnit, $secondOrderItemUnit, $thirdOrderItemUnit) {
+                static $callCount = 0;
+                ++$callCount;
+
+                if ($callCount === 1) {
+                    $this->assertSame($firstOrderItemUnit, $unit);
+
+                    return '10%';
+                }
+                if ($callCount === 2) {
+                    $this->assertSame($secondOrderItemUnit, $unit);
+
+                    return '10%';
+                }
+                $this->assertSame($thirdOrderItemUnit, $unit);
+
+                return '20%';
+            });
 
         $result = $this->converter->convert($order);
 

tests/Unit/Converter/ShippingAdjustmentsToLineItemsConverterTest.php

@@ -14,6 +14,7 @@
 namespace Tests\Sylius\InvoicingPlugin\Unit\Converter;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Sylius\Component\Core\Model\AdjustmentInterface;
@@ -45,13 +46,13 @@ protected function setUp(): void
         );
     }
 
-    /** @test */
+    #[Test]
     public function it_implements_line_items_converter_interface(): void
     {
         self::assertInstanceOf(LineItemsConverterInterface::class, $this->converter);
     }
 
-    /** @test */
+    #[Test]
     public function it_extracts_line_items_from_orders_shipping_adjustments(): void
     {
         $lineItem = $this->createMock(LineItemInterface::class);

tests/Unit/Converter/TaxItemsConverterTest.php

@@ -14,6 +14,7 @@
 namespace Tests\Sylius\InvoicingPlugin\Unit\Converter;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Sylius\Component\Core\Model\AdjustmentInterface;
@@ -43,13 +44,13 @@ protected function setUp(): void
         );
     }
 
-    /** @test */
+    #[Test]
     public function it_implements_tax_items_converter_interface(): void
     {
         self::assertInstanceOf(TaxItemsConverterInterface::class, $this->converter);
     }
 
-    /** @test */
+    #[Test]
     public function it_extracts_tax_items_from_order(): void
     {
         $taxItem = $this->createMock(TaxItemInterface::class);

tests/Unit/Creator/InvoiceCreatorTest.php

@@ -14,6 +14,7 @@
 namespace Tests\Sylius\InvoicingPlugin\Unit\Creator;
 
 use Doctrine\ORM\EntityNotFoundException;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Sylius\Component\Core\Model\OrderInterface;
@@ -60,13 +61,13 @@ protected function setUp(): void
         );
     }
 
-    /** @test */
+    #[Test]
     public function it_implements_invoice_for_order_creator_interface(): void
     {
         self::assertInstanceOf(InvoiceCreatorInterface::class, $this->creator);
     }
 
-    /** @test */
+    #[Test]
     public function it_creates_invoice_for_order(): void
     {
         $order = $this->createMock(OrderInterface::class);
@@ -111,7 +112,7 @@ public function it_creates_invoice_for_order(): void
         ($this->creator)('0000001', $invoiceDateTime);
     }
 
-    /** @test */
+    #[Test]
     public function it_creates_invoice_without_generating_pdf_file(): void
     {
         $creator = new InvoiceCreator(
@@ -161,7 +162,7 @@ public function it_creates_invoice_without_generating_pdf_file(): void
         $creator('0000001', $invoiceDateTime);
     }
 
-    /** @test */
+    #[Test]
     public function it_removes_saved_invoice_file_if_database_update_fails(): void
     {
         $order = $this->createMock(OrderInterface::class);
@@ -212,7 +213,7 @@ public function it_removes_saved_invoice_file_if_database_update_fails(): void
         ($this->creator)('0000001', $invoiceDateTime);
     }
 
-    /** @test */
+    #[Test]
     public function it_throws_an_exception_when_invoice_was_already_created_for_given_order(): void
     {
         $order = $this->createMock(OrderInterface::class);