Update PHPUnit (9.x -> 10.x)

jakzal · Nov 28, 2023 · 2907ebe · 2907ebe
1 parent 3c37ebd
commit 2907ebe
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -53,10 +53,6 @@ infection:
 .PHONY: infection
 
 phpunit: tools/phpunit
-	tools/phpunit
-.PHONY: phpunit
-
-phpunit-coverage: tools/phpunit
 	phpdbg -qrr tools/phpunit
 .PHONY: phpunit
 

diff --git a/composer.json b/composer.json
@@ -8,8 +8,8 @@
         "psr/container": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
-        "zalas/phpunit-globals": "^2.1",
+        "phpunit/phpunit": "^10.0",
+        "zalas/phpunit-globals": "^3.2",
         "infection/infection": "^0.26"
     },
     "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php" beStrictAboutOutputDuringTests="true" beStrictAboutTodoAnnotatedTests="true" colors="true" verbose="true">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" bootstrap="vendor/autoload.php" beStrictAboutOutputDuringTests="true" beStrictAboutTodoAnnotatedTests="true" colors="true">
+  <coverage includeUncoveredFiles="true">
     <report>
       <clover outputFile="build/coverage.xml"/>
       <html outputDirectory="build/coverage" lowUpperBound="50" highLowerBound="95"/>
@@ -20,7 +17,12 @@
     <env name="TOOLBOX_EXCLUDED_TAGS" value="" force="true"/>
   </php>
   <extensions>
-    <extension class="Zalas\PHPUnit\Globals\AnnotationExtension"/>
+    <bootstrap class="Zalas\PHPUnit\Globals\AnnotationExtension"/>
   </extensions>
   <logging/>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/Cli/ServiceContainer/RunnerFactoryTest.php b/tests/Cli/ServiceContainer/RunnerFactoryTest.php
@@ -2,6 +2,7 @@
 
 namespace Zalas\Toolbox\Tests\Cli\ServiceContainer;
 
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerExceptionInterface;
@@ -89,6 +90,7 @@ public function test_it_creates_the_parametrised_runner_if_target_dir_option_is_
         $this->assertInstanceOf(ParametrisedRunner::class, $runner);
     }
 
+    #[DoesNotPerformAssertions]
     public function test_the_parametrised_runner_includes_the_target_dir_parameter()
     {
         $this->givenInput(['--target-dir' => '/usr/local/bin', '--dry-run' => true]);
@@ -114,6 +116,7 @@ public function test_it_throws_an_exception_if_target_dir_does_not_exist()
         $this->runnerFactory->createRunner();
     }
 
+    #[DoesNotPerformAssertions]
     public function test_it_uses_the_real_path_as_target_dir()
     {
         $this->givenInput(['--target-dir' => __DIR__.'/../../../bin', '--dry-run' => true]);

diff --git a/tests/Cli/ServiceContainerTest.php b/tests/Cli/ServiceContainerTest.php
@@ -48,7 +48,7 @@ public function test_it_creates_application_services(string $serviceId, string $
         $this->assertInstanceOf($expectedType, $this->container->get($serviceId));
     }
 
-    public function provideApplicationServices()
+    public static function provideApplicationServices()
     {
         yield [InstallCommand::class, InstallCommand::class];
         yield [ListCommand::class, ListCommand::class];

diff --git a/tests/Json/Factory/BoxBuildCommandFactoryTest.php b/tests/Json/Factory/BoxBuildCommandFactoryTest.php
@@ -58,7 +58,7 @@ public function test_it_complains_if_any_of_required_properties_is_missing(strin
         BoxBuildCommandFactory::import($properties);
     }
 
-    public function provideRequiredProperties(): \Generator
+    public static function provideRequiredProperties(): \Generator
     {
         yield ['repository'];
         yield ['phar'];

diff --git a/tests/Json/Factory/ComposerBinPluginCommandFactoryTest.php b/tests/Json/Factory/ComposerBinPluginCommandFactoryTest.php
@@ -57,7 +57,7 @@ public function test_it_complains_if_any_of_required_properties_is_missing(strin
         ComposerBinPluginCommandFactory::import($properties);
     }
 
-    public function provideRequiredProperties(): \Generator
+    public static function provideRequiredProperties(): \Generator
     {
         yield ['package'];
         yield ['namespace'];

diff --git a/tests/Json/Factory/ComposerInstallCommandFactoryTest.php b/tests/Json/Factory/ComposerInstallCommandFactoryTest.php
@@ -41,7 +41,7 @@ public function test_it_complains_if_a_required_property_is_missing(string $prop
         ComposerInstallCommandFactory::import($properties);
     }
 
-    public function provideRequiredProperties()
+    public static function provideRequiredProperties()
     {
         yield ['repository'];
         yield ['target-dir'];

diff --git a/tests/Json/Factory/FileDownloadCommandFactoryTest.php b/tests/Json/Factory/FileDownloadCommandFactoryTest.php
@@ -38,7 +38,7 @@ public function test_it_complains_if_any_of_required_properties_is_missing(strin
         FileDownloadCommandFactory::import($properties);
     }
 
-    public function provideRequiredProperties(): \Generator
+    public static function provideRequiredProperties(): \Generator
     {
         yield ['url'];
         yield ['file'];

diff --git a/tests/Json/Factory/PharDownloadCommandFactoryTest.php b/tests/Json/Factory/PharDownloadCommandFactoryTest.php
@@ -38,7 +38,7 @@ public function test_it_complains_if_any_of_required_properties_is_missing(strin
         PharDownloadCommandFactory::import($properties);
     }
 
-    public function provideRequiredProperties(): \Generator
+    public static function provideRequiredProperties(): \Generator
     {
         yield ['phar'];
         yield ['bin'];

diff --git a/tests/Json/Factory/PhiveInstallCommandFactoryTest.php b/tests/Json/Factory/PhiveInstallCommandFactoryTest.php
@@ -53,7 +53,7 @@ public function test_it_accepts_unsigned_phars()
         $this->assertStringContainsString('unsigned', (string)$command);
     }
 
-    public function provideRequiredProperties(): \Generator
+    public static function provideRequiredProperties(): \Generator
     {
         yield ['alias'];
         yield ['bin'];

diff --git a/tests/Json/Factory/ToolFactoryTest.php b/tests/Json/Factory/ToolFactoryTest.php
@@ -209,7 +209,7 @@ public function test_it_complains_if_any_of_required_properties_is_missing(strin
         ToolFactory::import($properties);
     }
 
-    public function provideRequiredProperties(): \Generator
+    public static function provideRequiredProperties(): \Generator
     {
         yield ['name'];
         yield ['summary'];