[Internal] support of phpunit 10, drop support for phpunit 8

mpoiriert · Oct 17, 2023 · 71f8e10 · 71f8e10
1 parent 1cfaef6
commit 71f8e10
Show file tree

Hide file tree

Showing 217 changed files with 1,540 additions and 1,661 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ composer-normalize
 ###> phpunit/phpunit ###
 /phpunit.xml
 .phpunit.result.cache
+.phpunit.cache
 ###< phpunit/phpunit ###
 
 ###> friendsofphp/php-cs-fixer ###

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "jms/serializer": "^3.11",
         "jms/serializer-bundle": "^4.2",
         "phpdocumentor/reflection-docblock": "^5.2",
-        "phpunit/phpunit": "^8.0 || ^9.0",
+        "phpunit/phpunit": "^9.0 || ^10.0",
         "psr/http-message": "^1.0",
         "psr/log": "@stable",
         "ramsey/uuid": "^4.2",

diff --git a/composer.lock b/composer.lock
diff --git a/packages/application/Tests/Command/CronDumpToFileCommandTest.php b/packages/application/Tests/Command/CronDumpToFileCommandTest.php
@@ -6,23 +6,19 @@
 use Draw\Component\Application\Cron\CronManager;
 use Draw\Component\Tester\Application\CommandDataTester;
 use Draw\Component\Tester\Application\CommandTestTrait;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 
-/**
- * @covers \Draw\Component\Application\Cron\Command\CronDumpToFileCommand
- */
+#[CoversClass(CronDumpToFileCommand::class)]
 class CronDumpToFileCommandTest extends TestCase
 {
     use CommandTestTrait;
 
-    /**
-     * @var CronManager&MockObject
-     */
-    private CronManager $cronManager;
+    private CronManager&MockObject $cronManager;
 
     public function createCommand(): Command
     {
@@ -36,12 +32,12 @@ public function getCommandName(): string
         return 'draw:cron:dump-to-file';
     }
 
-    public function provideTestArgument(): iterable
+    public static function provideTestArgument(): iterable
     {
         yield ['filePath', InputArgument::REQUIRED];
     }
 
-    public function provideTestOption(): iterable
+    public static function provideTestOption(): iterable
     {
         yield ['override', null, InputOption::VALUE_NONE];
     }

diff --git a/packages/application/Tests/Configuration/DoctrineConfigurationRegistryTest.php b/packages/application/Tests/Configuration/DoctrineConfigurationRegistryTest.php
@@ -11,11 +11,12 @@
 use Draw\Component\Tester\DoctrineOrmTrait;
 use Draw\Contracts\Application\ConfigurationRegistryInterface;
 use Draw\Contracts\Application\Exception\ConfigurationIsNotAccessibleException;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Depends;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Draw\Component\Application\Configuration\DoctrineConfigurationRegistry
- */
+#[CoversClass(DoctrineConfigurationRegistry::class)]
 class DoctrineConfigurationRegistryTest extends TestCase
 {
     use DoctrineOrmTrait;
@@ -119,9 +120,7 @@ public function testHasNotSet(): void
         static::assertFalse($this->object->has('value'));
     }
 
-    /**
-     * @depends testHasNotSet
-     */
+    #[Depends('testHasNotSet')]
     public function testGetDefault(): void
     {
         static::assertNull($this->object->get('value'));
@@ -136,43 +135,33 @@ public function testSet(): void
         $this->addToAssertionCount(1);
     }
 
-    /**
-     * @depends testSet
-     */
+    #[Depends('testSet')]
     public function testHasSet(): void
     {
         static::assertTrue($this->object->has('value'));
     }
 
-    /**
-     * @depends testHasSet
-     */
+    #[Depends('testHasSet')]
     public function testGetSet(): void
     {
         static::assertSame('the-value', $this->object->get('value'));
     }
 
-    /**
-     * @depends testHasSet
-     */
+    #[Depends('testHasSet')]
     public function testDelete(): void
     {
         $this->object->delete('value');
 
         $this->addToAssertionCount(1);
     }
 
-    /**
-     * @depends testDelete
-     */
+    #[Depends('testDelete')]
     public function testHasAfterDelete(): void
     {
         static::assertFalse($this->object->has('value'));
     }
 
-    /**
-     * @depends testGetSet
-     */
+    #[Depends('testGetSet')]
     public function testGetValueChangeFromOtherScope(): void
     {
         $this->object->set('value', 'the-value');
@@ -191,9 +180,7 @@ public function testGetValueChangeFromOtherScope(): void
         static::assertSame('new-value', $this->object->get('value'));
     }
 
-    /**
-     * @depends testGetSet
-     */
+    #[Depends('testGetSet')]
     public function testGetValueInvalidState(): void
     {
         $this->object->set('value', 'the-value');
@@ -214,7 +201,7 @@ public function testGetValueInvalidState(): void
         static::assertSame('new-value', $this->object->get('value'));
     }
 
-    public function provideTestSetGetKeepType(): iterable
+    public static function provideTestSetGetKeepType(): iterable
     {
         yield 'string' => [
             'value',
@@ -237,9 +224,7 @@ public function provideTestSetGetKeepType(): iterable
         ];
     }
 
-    /**
-     * @dataProvider provideTestSetGetKeepType
-     */
+    #[DataProvider('provideTestSetGetKeepType')]
     public function testSetGetKeepType(mixed $value): void
     {
         $this->object->set('value', $value);

diff --git a/packages/application/Tests/Configuration/Entity/ConfigTest.php b/packages/application/Tests/Configuration/Entity/ConfigTest.php
@@ -3,11 +3,10 @@
 namespace Draw\Component\Application\Tests\Configuration\Entity;
 
 use Draw\Component\Application\Configuration\Entity\Config;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Draw\Component\Application\Configuration\Entity\Config
- */
+#[CoversClass(Config::class)]
 class ConfigTest extends TestCase
 {
     private Config $entity;

diff --git a/packages/application/Tests/Cron/CronManagerTest.php b/packages/application/Tests/Cron/CronManagerTest.php
@@ -4,11 +4,10 @@
 
 use Draw\Component\Application\Cron\CronManager;
 use Draw\Component\Application\Cron\Job;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Draw\Component\Application\Cron\CronManager
- */
+#[CoversClass(CronManager::class)]
 class CronManagerTest extends TestCase
 {
     private CronManager $service;

diff --git a/packages/application/Tests/Cron/JobTest.php b/packages/application/Tests/Cron/JobTest.php
@@ -3,11 +3,10 @@
 namespace Draw\Component\Application\Tests\Cron;
 
 use Draw\Component\Application\Cron\Job;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Draw\Component\Application\Cron\Job
- */
+#[CoversClass(Job::class)]
 class JobTest extends TestCase
 {
     private const DEFAULT_NAME = 'name';

diff --git a/packages/application/Tests/Versioning/Command/UpdateDeployedVersionCommandTest.php b/packages/application/Tests/Versioning/Command/UpdateDeployedVersionCommandTest.php
@@ -6,21 +6,17 @@
 use Draw\Component\Application\Versioning\VersionManager;
 use Draw\Component\Tester\Application\CommandDataTester;
 use Draw\Component\Tester\Application\CommandTestTrait;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Command\Command;
 
-/**
- * @covers \Draw\Component\Application\Versioning\Command\UpdateDeployedVersionCommand
- */
+#[CoversClass(UpdateDeployedVersionCommand::class)]
 class UpdateDeployedVersionCommandTest extends TestCase
 {
     use CommandTestTrait;
 
-    /**
-     * @var VersionManager&MockObject
-     */
-    private VersionManager $versionManager;
+    private VersionManager&MockObject $versionManager;
 
     public function createCommand(): Command
     {
@@ -34,12 +30,12 @@ public function getCommandName(): string
         return 'draw:application:update-deployed-version';
     }
 
-    public function provideTestArgument(): iterable
+    public static function provideTestArgument(): iterable
     {
         return [];
     }
 
-    public function provideTestOption(): iterable
+    public static function provideTestOption(): iterable
     {
         return [];
     }

diff --git a/packages/application/Tests/Versioning/Event/FetchRunningVersionEventTest.php b/packages/application/Tests/Versioning/Event/FetchRunningVersionEventTest.php
@@ -3,12 +3,11 @@
 namespace Draw\Component\Application\Tests\Versioning\Event;
 
 use Draw\Component\Application\Versioning\Event\FetchRunningVersionEvent;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Contracts\EventDispatcher\Event;
 
-/**
- * @covers \Draw\Component\Application\Versioning\Event\FetchRunningVersionEvent
- */
+#[CoversClass(FetchRunningVersionEvent::class)]
 class FetchRunningVersionEventTest extends TestCase
 {
     private FetchRunningVersionEvent $event;

diff --git a/packages/application/Tests/Versioning/EventListener/FetchRunningVersionListenerTest.php b/packages/application/Tests/Versioning/EventListener/FetchRunningVersionListenerTest.php
@@ -5,12 +5,11 @@
 use Draw\Component\Application\Versioning\Event\FetchRunningVersionEvent;
 use Draw\Component\Application\Versioning\EventListener\FetchRunningVersionListener;
 use Draw\Component\Core\Reflection\ReflectionAccessor;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-/**
- * @covers \Draw\Component\Application\Versioning\EventListener\FetchRunningVersionListener
- */
+#[CoversClass(FetchRunningVersionListener::class)]
 class FetchRunningVersionListenerTest extends TestCase
 {
     private FetchRunningVersionListener $service;

diff --git a/packages/application/Tests/Versioning/VersionManagerTest.php b/packages/application/Tests/Versioning/VersionManagerTest.php
@@ -7,26 +7,19 @@
 use Draw\Component\Core\Reflection\ReflectionAccessor;
 use Draw\Contracts\Application\ConfigurationRegistryInterface;
 use Draw\Contracts\Application\VersionVerificationInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
-/**
- * @covers \Draw\Component\Application\Versioning\VersionManager
- */
+#[CoversClass(VersionManager::class)]
 class VersionManagerTest extends TestCase
 {
     private VersionManager $service;
 
-    /**
-     * @var ConfigurationRegistryInterface&MockObject
-     */
-    private ConfigurationRegistryInterface $configurationRegistry;
+    private ConfigurationRegistryInterface&MockObject $configurationRegistry;
 
-    /**
-     * @var EventDispatcherInterface&MockObject
-     */
-    private EventDispatcherInterface $eventDispatcher;
+    private MockObject&EventDispatcherInterface $eventDispatcher;
 
     protected function setUp(): void
     {

diff --git a/packages/application/composer.json b/packages/application/composer.json
@@ -16,7 +16,7 @@
         "symfony/event-dispatcher": "^5.4.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0 || ^9.0",
+        "phpunit/phpunit": "^9.0 || ^10.0",
         "draw/tester": "^0.10",
         "symfony/cache": "^5.4.3",
         "symfony/console": "^5.4.3"

diff --git a/packages/aws-tool-kit/Tests/Command/CloudWatchLogsDownloadCommandTest.php b/packages/aws-tool-kit/Tests/Command/CloudWatchLogsDownloadCommandTest.php
@@ -7,23 +7,21 @@
 use Draw\Component\Core\Reflection\ReflectionAccessor;
 use Draw\Component\Tester\Application\CommandDataTester;
 use Draw\Component\Tester\Application\CommandTestTrait;
+use Draw\Component\Tester\MockTrait;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 
-/**
- * @covers \Draw\Component\AwsToolKit\Command\CloudWatchLogsDownloadCommand
- */
+#[CoversClass(CloudWatchLogsDownloadCommand::class)]
 class CloudWatchLogsDownloadCommandTest extends TestCase
 {
     use CommandTestTrait;
+    use MockTrait;
 
-    /**
-     * @var CloudWatchLogsClient&MockObject
-     */
-    private CloudWatchLogsClient $cloudWatchLogsClient;
+    private CloudWatchLogsClient&MockObject $cloudWatchLogsClient;
 
     public function createCommand(): Command
     {
@@ -44,14 +42,14 @@ public function getCommandName(): string
         return 'draw:aws:cloud-watch-logs:download';
     }
 
-    public function provideTestArgument(): iterable
+    public static function provideTestArgument(): iterable
     {
         yield ['logGroupName', InputArgument::REQUIRED, null];
         yield ['logStreamName', InputArgument::REQUIRED, null];
         yield ['output', InputArgument::REQUIRED, null];
     }
 
-    public function provideTestOption(): iterable
+    public static function provideTestOption(): iterable
     {
         yield ['startTime', null, InputOption::VALUE_REQUIRED, '- 1 days'];
         yield ['endTime', null, InputOption::VALUE_REQUIRED, 'now'];
@@ -102,9 +100,11 @@ public function testExecuteNewFile(): void
         $this->cloudWatchLogsClient
             ->expects(static::exactly(2))
             ->method('getLogEvents')
-            ->withConsecutive(
-                [$logEvents],
-                [$logEvents + ['nextToken' => 'next-token']]
+            ->with(
+                ...static::withConsecutive(
+                    [$logEvents],
+                    [$logEvents + ['nextToken' => 'next-token']]
+                )
             )
             ->willReturnOnConsecutiveCalls(
                 [