Merge branch '12.5'

* 12.5:
  Do not emit event for tests from PHPUnit's own test suite
  Handle PhpunitNoticeTriggered event

Author: sebastianbergmann

src/Framework/TestCase.php

@@ -51,6 +51,7 @@
 use function set_exception_handler;
 use function sprintf;
 use function str_contains;
+use function str_starts_with;
 use function stream_get_contents;
 use function stream_get_meta_data;
 use function tmpfile;
@@ -1384,14 +1385,16 @@ private function verifyMockObjects(): void
     {
         foreach ($this->mockObjects as $mockObject) {
             if (!$mockObject['mockObject']->__phpunit_hasMatchers()) {
-                Event\Facade::emitter()->testTriggeredPhpunitNotice(
-                    $this->testValueObjectForEvents,
-                    sprintf(
-                        'No expectations were configured for the mock object for %s. ' .
-                        'You should refactor your test code and use a test stub instead.',
-                        $mockObject['type'],
-                    ),
-                );
+                if (!str_starts_with($this::class, 'PHPUnit\\')) {
+                    Event\Facade::emitter()->testTriggeredPhpunitNotice(
+                        $this->testValueObjectForEvents,
+                        sprintf(
+                            'No expectations were configured for the mock object for %s. ' .
+                            'You should refactor your test code and use a test stub instead.',
+                            $mockObject['type'],
+                        ),
+                    );
+                }
 
                 continue;
             }

src/TextUI/Output/Default/ProgressPrinter/ProgressPrinter.php

@@ -188,6 +188,11 @@ public function testTriggeredPhpunitDeprecation(): void
         $this->updateTestStatus(TestStatus::deprecation());
     }
 
+    public function testTriggeredPhpunitNotice(): void
+    {
+        $this->updateTestStatus(TestStatus::notice());
+    }
+
     public function testConsideredRisky(): void
     {
         $this->updateTestStatus(TestStatus::risky());
@@ -316,6 +321,7 @@ private function registerSubscribers(Facade $facade): void
             new TestTriggeredPhpDeprecationSubscriber($this),
             new TestTriggeredPhpNoticeSubscriber($this),
             new TestTriggeredPhpunitDeprecationSubscriber($this),
+            new TestTriggeredPhpunitNoticeSubscriber($this),
             new TestTriggeredPhpunitWarningSubscriber($this),
             new TestTriggeredPhpWarningSubscriber($this),
             new TestTriggeredWarningSubscriber($this),

src/TextUI/Output/Default/ProgressPrinter/Subscriber/TestTriggeredPhpunitNoticeSubscriber.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TextUI\Output\Default\ProgressPrinter;
+
+use PHPUnit\Event\Test\PhpunitNoticeTriggered;
+use PHPUnit\Event\Test\PhpunitNoticeTriggeredSubscriber;
+
+/**
+ * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final readonly class TestTriggeredPhpunitNoticeSubscriber extends Subscriber implements PhpunitNoticeTriggeredSubscriber
+{
+    public function notify(PhpunitNoticeTriggered $event): void
+    {
+        $this->printer()->testTriggeredPhpunitNotice();
+    }
+}

tests/end-to-end/event/_files/MockWithoutExpectationTest.php

@@ -7,9 +7,10 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace PHPUnit\TestFixture\Event;
+namespace TestFixture\PHPUnit\Event;
 
 use PHPUnit\Framework\TestCase;
+use PHPUnit\TestFixture\Event\Example;
 
 final class MockWithoutExpectationTest extends TestCase
 {

tests/end-to-end/event/mock-object-without-expectation.phpt

@@ -21,15 +21,15 @@ Test Suite Loaded (1 test)
 Test Runner Started
 Test Suite Sorted
 Test Runner Execution Started (1 test)
-Test Suite Started (PHPUnit\TestFixture\Event\MockWithoutExpectationTest, 1 test)
-Test Preparation Started (PHPUnit\TestFixture\Event\MockWithoutExpectationTest::testSuccess)
-Test Prepared (PHPUnit\TestFixture\Event\MockWithoutExpectationTest::testSuccess)
+Test Suite Started (TestFixture\PHPUnit\Event\MockWithoutExpectationTest, 1 test)
+Test Preparation Started (TestFixture\PHPUnit\Event\MockWithoutExpectationTest::testSuccess)
+Test Prepared (TestFixture\PHPUnit\Event\MockWithoutExpectationTest::testSuccess)
 Mock Object Created (PHPUnit\TestFixture\Event\Example)
-Test Triggered PHPUnit Notice (PHPUnit\TestFixture\Event\MockWithoutExpectationTest::testSuccess)
+Test Triggered PHPUnit Notice (TestFixture\PHPUnit\Event\MockWithoutExpectationTest::testSuccess)
 No expectations were configured for the mock object for PHPUnit\TestFixture\Event\Example. You should refactor your test code and use a test stub instead.
-Test Passed (PHPUnit\TestFixture\Event\MockWithoutExpectationTest::testSuccess)
-Test Finished (PHPUnit\TestFixture\Event\MockWithoutExpectationTest::testSuccess)
-Test Suite Finished (PHPUnit\TestFixture\Event\MockWithoutExpectationTest, 1 test)
+Test Passed (TestFixture\PHPUnit\Event\MockWithoutExpectationTest::testSuccess)
+Test Finished (TestFixture\PHPUnit\Event\MockWithoutExpectationTest::testSuccess)
+Test Suite Finished (TestFixture\PHPUnit\Event\MockWithoutExpectationTest, 1 test)
 Test Runner Execution Finished
 Test Runner Finished
 PHPUnit Finished (Shell Exit Code: 0)

tests/end-to-end/generic/exception-in-mock-destructor.phpt

@@ -25,4 +25,4 @@ Exception: Some exception.
 %sExceptionInMockDestructor.php:%d
 
 ERRORS!
-Tests: 1, Assertions: 1, Errors: 1, PHPUnit Notices: 1.
+Tests: 1, Assertions: 1, Errors: 1.

tests/end-to-end/logging/teamcity/teamcity-directory.phpt

@@ -133,4 +133,4 @@ This test did not perform any assertions
 %s%eStatusTest.php:%d
 
 ERRORS!
-Tests: 18, Assertions: 6, Errors: 6, Failures: 2, PHPUnit Notices: 1, Skipped: 3, Incomplete: 2, Risky: 2.
+Tests: 18, Assertions: 6, Errors: 6, Failures: 2, Skipped: 3, Incomplete: 2, Risky: 2.

tests/end-to-end/logging/teamcity/teamcity-file.phpt

@@ -97,4 +97,4 @@ This test did not perform any assertions
 %s%eStatusTest.php:%d
 
 ERRORS!
-Tests: 13, Assertions: 4, Errors: 2, Failures: 2, PHPUnit Notices: 1, Skipped: 3, Incomplete: 2, Risky: 2.
+Tests: 13, Assertions: 4, Errors: 2, Failures: 2, Skipped: 3, Incomplete: 2, Risky: 2.

tests/end-to-end/regression/5891.phpt

@@ -17,5 +17,4 @@ Runtime: %s
 
 Time: %s, Memory: %s MB
 
-OK, but there were issues!
-Tests: 2, Assertions: 4, PHPUnit Notices: 2.
+OK (2 tests, 4 assertions)