Merge pull request #1489 from Jean85/allow-phpunit-12-7.x

MarcelloDuarte · web-flow · commit 107b1597cef2 · 2025-05-03T11:03:36.000+01:00
[7.x] Allow phpunit 12
diff --git a/CHANGES-v7.md b/CHANGES-v7.md
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [7.6.0]
 
 ### Added
-- PHPUnit 11 compatibility [@Jean85](https://github.com/Jean85)
+- PHPUnit 11 & 12 compatibility [@Jean85](https://github.com/Jean85)
 
 ## [7.5.0]
 
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "php":                      "^7.3 || 8.0.* || 8.1.* || 8.2.* || 8.3.*",
         "phpspec/prophecy":         "^1.9",
         "phpspec/php-diff":         "^1.0.0",
-        "sebastian/exporter":       "^3.0 || ^4.0 || ^5.0 || ^6.0",
+        "sebastian/exporter":       "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
         "symfony/console":          "^3.4 || ^4.4 || ^5.0 || ^6.0 || ^7.0",
         "symfony/event-dispatcher": "^3.4 || ^4.4 || ^5.0 || ^6.0 || ^7.0",
         "symfony/process":          "^3.4 || ^4.4 || ^5.0 || ^6.0 || ^7.0",
@@ -38,7 +38,7 @@
     "require-dev": {
         "behat/behat":           "^3.3",
         "symfony/filesystem":    "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
-        "phpunit/phpunit":       "^8.0 || ^9.0 || ^10.0 || ^11.0",
+        "phpunit/phpunit":       "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
         "vimeo/psalm": "^4.3 || ^5.2"
     },
 
diff --git a/integration/PhpSpec/Console/Prompter/QuestionTest.php b/integration/PhpSpec/Console/Prompter/QuestionTest.php
@@ -3,12 +3,16 @@
 namespace integration\PhpSpec\Console\Prompter;
 
 use PhpSpec\Console\Prompter\Question;
+use PHPUnit\Framework\Attributes\RequiresMethod;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 /**
  * @requires function \Symfony\Component\Console\Helper\QuestionHelper::ask
  */
+#[RequiresMethod(QuestionHelper::class, 'ask')]
 class QuestionTest extends TestCase
 {
     /**
@@ -43,6 +47,7 @@ protected function setUp() : void
     /**
      * @test
      */
+    #[Test]
     function it_is_a_prompter()
     {
         $this->assertInstanceOf('PhpSpec\Console\Prompter', $this->prompter);
@@ -51,6 +56,7 @@ function it_is_a_prompter()
     /**
      * @test
      */
+    #[Test]
     function it_can_ask_a_question_and_return_the_result()
     {
         $this->questionHelper->expects($this->once())
diff --git a/integration/PhpSpec/Formatter/Presenter/Differ/ObjectEngineTest.php b/integration/PhpSpec/Formatter/Presenter/Differ/ObjectEngineTest.php
@@ -4,6 +4,7 @@
 
 namespace PhpSpec\Formatter\Presenter\Differ;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use SebastianBergmann\Exporter\Exporter;
 
@@ -26,24 +27,28 @@ public function setUp() : void
     }
 
     /** @test */
+    #[Test]
     public function it_is_an_differ_engine()
     {
         self::assertInstanceOf(DifferEngine::class, $this->engine);
     }
 
     /** @test */
+    #[Test]
     public function it_does_not_support_scalars()
     {
         self::assertFalse($this->engine->supports(1, 2));
     }
 
     /** @test */
+    #[Test]
     public function it_only_supports_objects()
     {
         self::assertTrue($this->engine->supports(new \StdClass(), new \StdClass()));
     }
 
     /** @test */
+    #[Test]
     public function it_converts_objects_to_string_and_diffs_the_result()
     {
         $this->stringDiffer->method('compare')
diff --git a/integration/PhpSpec/Loader/StreamWrapperTest.php b/integration/PhpSpec/Loader/StreamWrapperTest.php
@@ -7,6 +7,7 @@
 use PhpSpec\Loader\StreamWrapper;
 use PhpSpec\Loader\Transformer\InMemoryTypeHintIndex;
 use PhpSpec\Loader\Transformer\TypeHintRewriter;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
 class StreamWrapperTest extends TestCase
@@ -23,6 +24,7 @@ function setUp() : void
      * @test
      * @requires PHP 7.0
      */
+    #[Test]
     function it_loads_a_spec_with_no_typehints()
     {
         require StreamWrapper::wrapPath(__DIR__.'/examples/ExampleSpec.php');

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace PhpSpec\Formatter\Presenter\Differ;`
`6`	`6`
	`7`	`+use PHPUnit\Framework\Attributes\Test;`
`7`	`8`	`use PHPUnit\Framework\TestCase;`
`8`	`9`	`use SebastianBergmann\Exporter\Exporter;`
`9`	`10`
`@@ -26,24 +27,28 @@ public function setUp() : void`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`/** @test */`
	`30`	`+ #[Test]`
`29`	`31`	`public function it_is_an_differ_engine()`
`30`	`32`	`{`
`31`	`33`	`self::assertInstanceOf(DifferEngine::class, $this->engine);`
`32`	`34`	`}`
`33`	`35`
`34`	`36`	`/** @test */`
	`37`	`+ #[Test]`
`35`	`38`	`public function it_does_not_support_scalars()`
`36`	`39`	`{`
`37`	`40`	`self::assertFalse($this->engine->supports(1, 2));`
`38`	`41`	`}`
`39`	`42`
`40`	`43`	`/** @test */`
	`44`	`+ #[Test]`
`41`	`45`	`public function it_only_supports_objects()`
`42`	`46`	`{`
`43`	`47`	`self::assertTrue($this->engine->supports(new \StdClass(), new \StdClass()));`
`44`	`48`	`}`
`45`	`49`
`46`	`50`	`/** @test */`
	`51`	`+ #[Test]`
`47`	`52`	`public function it_converts_objects_to_string_and_diffs_the_result()`
`48`	`53`	`{`
`49`	`54`	`$this->stringDiffer->method('compare')`