Rename hasExpectationOnOutput() to expectsOutput() and extract hasExpectationOnOutput() from it

Author: sebastianbergmann

src/Framework/TestCase.php

@@ -568,7 +568,7 @@ final public function hasUnexpectedOutput(): bool
             return false;
         }
 
-        if ($this->hasExpectationOnOutput()) {
+        if ($this->expectsOutput()) {
             return false;
         }
 
@@ -598,9 +598,9 @@ final public function doesNotPerformAssertions(): bool
     /**
      * @internal This method is not covered by the backward compatibility promise for PHPUnit
      */
-    final public function hasExpectationOnOutput(): bool
+    final public function expectsOutput(): bool
     {
-        return is_string($this->outputExpectedString) || is_string($this->outputExpectedRegex) || $this->outputRetrievedForAssertion;
+        return $this->hasExpectationOnOutput() || $this->outputRetrievedForAssertion;
     }
 
     /**
@@ -2184,6 +2184,14 @@ private function isRegisteredFailure(Throwable $t): bool
         return false;
     }
 
+    /**
+     * @internal This method is not covered by the backward compatibility promise for PHPUnit
+     */
+    private function hasExpectationOnOutput(): bool
+    {
+        return is_string($this->outputExpectedString) || is_string($this->outputExpectedRegex);
+    }
+
     /**
      * Creates a test stub for the specified interface or class.
      *

src/Util/PHP/Template/TestCaseClass.tpl

@@ -58,7 +58,7 @@ function __phpunit_run_isolated_test()
 
     $output = '';
 
-    if (!$test->hasExpectationOnOutput()) {
+    if (!$test->expectsOutput()) {
         $output = $test->output();
     }
 

src/Util/PHP/Template/TestCaseMethod.tpl

@@ -59,7 +59,7 @@ function __phpunit_run_isolated_test()
 
     $output = '';
 
-    if (!$test->hasExpectationOnOutput()) {
+    if (!$test->expectsOutput()) {
         $output = $test->output();
     }