Merge branch '10.5'

Author: sebastianbergmann

src/Framework/Constraint/Cardinality/SameSize.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\Framework\Constraint;
 
+use Countable;
 use PHPUnit\Framework\Exception;
 
 /**
@@ -17,7 +18,7 @@
 final class SameSize extends Count
 {
     /**
-     * @psalm-param \Countable|iterable $expected
+     * @psalm-param Countable|iterable $expected
      *
      * @throws Exception
      */

src/Framework/Constraint/Equality/IsEqualCanonicalizing.php

@@ -64,7 +64,6 @@ public function evaluate(mixed $other, string $description = '', bool $returnRes
                 $other,
                 0.0,
                 true,
-                false,
             );
         } catch (ComparisonFailure $f) {
             if ($returnResult) {

src/Framework/MockObject/Runtime/Rule/MethodName.php

@@ -11,6 +11,7 @@
 
 use function is_string;
 use PHPUnit\Framework\Constraint\Constraint;
+use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\InvalidArgumentException;
 use PHPUnit\Framework\MockObject\Invocation as BaseInvocation;
 use PHPUnit\Framework\MockObject\MethodNameConstraint;
@@ -40,15 +41,15 @@ public function toString(): string
     }
 
     /**
-     * @throws \PHPUnit\Framework\ExpectationFailedException
+     * @throws ExpectationFailedException
      */
     public function matches(BaseInvocation $invocation): bool
     {
         return $this->matchesName($invocation->methodName());
     }
 
     /**
-     * @throws \PHPUnit\Framework\ExpectationFailedException
+     * @throws ExpectationFailedException
      */
     public function matchesName(string $methodName): bool
     {

src/Runner/PhptTestCase.php

@@ -193,8 +193,6 @@ public function run(): void
                 $this->filename,
                 true,
                 TestStatus::unknown(),
-                [],
-                [],
             );
         }
 

src/TextUI/Command/Commands/WarmCodeCoverageCacheCommand.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TextUI\Command;
 
+use const PHP_EOL;
 use function printf;
 use PHPUnit\TextUI\Configuration\CodeCoverageFilterRegistry;
 use PHPUnit\TextUI\Configuration\Configuration;
@@ -68,7 +69,7 @@ public function execute(): Result
         printf(
             '[%s]%s',
             $timer->stop()->asString(),
-            \PHP_EOL,
+            PHP_EOL,
         );
 
         return Result::from();

src/TextUI/Configuration/Xml/Validator/ValidationResult.php

@@ -11,6 +11,7 @@
 
 use function sprintf;
 use function trim;
+use LibXMLError;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
@@ -25,7 +26,7 @@
     private array $validationErrors;
 
     /**
-     * @psalm-param array<int,\LibXMLError> $errors
+     * @psalm-param array<int,LibXMLError> $errors
      */
     public static function fromArray(array $errors): self
     {