Merge pull request #31 from pauci/phpunit-10

feat: Upgrade to phpunit 10
pauci · Apr 26, 2023 · 58dcd30 · 58dcd30
2 parents ebe77a9 + bf926bb
commit 58dcd30
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 22 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -77,7 +77,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.0', '8.1', '8.2']
+        php-versions: ['8.1', '8.2']
 
     services:
       redis:
@@ -112,7 +112,7 @@ jobs:
         run: composer install --no-interaction --no-progress --prefer-dist --optimize-autoloader
 
       - name: Run unit tests
-        run: ./vendor/bin/phpunit --verbose --coverage-clover build/logs/clover.xml --coverage-text
+        run: ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml --coverage-text
 
       - name: Publish coverage report to Codecov
         uses: codecov/codecov-action@v1
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "^8.0 || ^8.1 || ^8.2",
+        "php": "^8.1 || ^8.2",
         "ext-json": "*",
         "psr/clock": "^1.0",
         "psr/container": "^1.0 || ^2.0",
@@ -30,7 +30,7 @@
         "guzzlehttp/guzzle": "^7.2",
         "php-parallel-lint/php-parallel-lint": "^1.3",
         "phpstan/phpstan": "^1.9",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.1",
         "squizlabs/php_codesniffer": "^3.7",
         "symfony/cache": "^6.0",
         "symfony/serializer": "^6.0"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,13 +1,14 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true" cacheDirectory=".phpunit.cache">
+  <coverage/>
   <testsuites>
     <testsuite name="cqrs">
       <directory>./tests</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/src/Plugin/Doctrine/CommandHandling/AbstractOrmTransactionManager.php b/src/Plugin/Doctrine/CommandHandling/AbstractOrmTransactionManager.php
@@ -9,10 +9,8 @@
 
 abstract class AbstractOrmTransactionManager implements TransactionManagerInterface
 {
-    protected EntityManagerInterface $entityManager;
-
-    public function __construct(EntityManagerInterface $entityManager)
-    {
-        $this->entityManager = $entityManager;
+    public function __construct(
+        protected EntityManagerInterface $entityManager,
+    ) {
     }
 }
diff --git a/src/Plugin/Doctrine/Domain/RemoveDeletedAggregatesListener.php b/src/Plugin/Doctrine/Domain/RemoveDeletedAggregatesListener.php
@@ -23,7 +23,7 @@ public function getSubscribedEvents(): array
      */
     public function preFlush(PreFlushEventArgs $event): void
     {
-        $entityManager = $event->getEntityManager();
+        $entityManager = $event->getObjectManager();
         $uow = $entityManager->getUnitOfWork();
 
         foreach ($uow->getIdentityMap() as $class => $entities) {

diff --git a/tests/Domain/Model/AbstractAggregateRootTest.php b/tests/Domain/Model/AbstractAggregateRootTest.php
@@ -13,14 +13,14 @@ public function testRegisterEvent(): void
     {
         $event = new SomeEvent();
 
-        $aggregateRoot = new AggregateRootUnderTest(4);
+        $aggregateRoot = new SomeAggregateRoot(4);
         $aggregateRoot->raise($event);
 
         $eventMessages = $aggregateRoot->getUncommittedEvents();
 
         self::assertCount(1, $eventMessages);
         self::assertInstanceOf(GenericDomainEventMessage::class, $eventMessages[0]);
-        self::assertEquals(AggregateRootUnderTest::class, $eventMessages[0]->getAggregateType());
+        self::assertEquals(SomeAggregateRoot::class, $eventMessages[0]->getAggregateType());
         self::assertEquals(4, $eventMessages[0]->getAggregateId());
         self::assertSame($event, $eventMessages[0]->getPayload());
 

diff --git a/...s/Domain/Model/AggregateRootUnderTest.php → tests/Domain/Model/SomeAggregateRoot.php b/...s/Domain/Model/AggregateRootUnderTest.php → tests/Domain/Model/SomeAggregateRoot.php
@@ -9,7 +9,7 @@
 /**
  * @phpstan-template Id
  */
-class AggregateRootUnderTest extends AbstractAggregateRoot
+class SomeAggregateRoot extends AbstractAggregateRoot
 {
     /**
      * @phpstan-var Id

diff --git a/tests/EventHandling/Publisher/SimpleIdentityMapTest.php b/tests/EventHandling/Publisher/SimpleIdentityMapTest.php
@@ -5,7 +5,7 @@
 namespace CQRSTest\EventHandling\Publisher;
 
 use CQRS\EventHandling\Publisher\SimpleIdentityMap;
-use CQRSTest\Domain\Model\AggregateRootUnderTest;
+use CQRSTest\Domain\Model\SomeAggregateRoot;
 use PHPUnit\Framework\TestCase;
 use Ramsey\Uuid\Uuid;
 
@@ -15,10 +15,10 @@ public function test(): void
     {
         $identityMap = new SimpleIdentityMap();
 
-        $ar1 = new AggregateRootUnderTest(Uuid::uuid4());
+        $ar1 = new SomeAggregateRoot(Uuid::uuid4());
         $identityMap->add($ar1);
 
-        $ar2 = new AggregateRootUnderTest(new \stdClass());
+        $ar2 = new SomeAggregateRoot(new \stdClass());
         $identityMap->add($ar2);
         $identityMap->add($ar2); // Add same object twice