Merge branch '8.5' into 9.6

sebastianbergmann · sebastianbergmann · commit dd98a2a2f953 · 2024-03-01T17:51:58.000+01:00
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -194,6 +194,7 @@
         'no_whitespace_in_blank_line' => true,
         'non_printable_character' => true,
         'normalize_index_brace' => true,
+        'nullable_type_declaration_for_default_null_value' => true,
         'object_operator_without_whitespace' => true,
         'operator_linebreak' => [
             'only_booleans' => true,
diff --git a/src/Framework/Constraint/Constraint.php b/src/Framework/Constraint/Constraint.php
@@ -101,7 +101,7 @@ protected function matches($other): bool
      *
      * @psalm-return never-return
      */
-    protected function fail($other, $description, ComparisonFailure $comparisonFailure = null): void
+    protected function fail($other, $description, ?ComparisonFailure $comparisonFailure = null): void
     {
         $failureDescription = sprintf(
             'Failed asserting that %s.',
diff --git a/src/Framework/Constraint/JsonMatches.php b/src/Framework/Constraint/JsonMatches.php
@@ -78,7 +78,7 @@ protected function matches($other): bool
      *
      * @psalm-return never-return
      */
-    protected function fail($other, $description, ComparisonFailure $comparisonFailure = null): void
+    protected function fail($other, $description, ?ComparisonFailure $comparisonFailure = null): void
     {
         if ($comparisonFailure === null) {
             [$error, $recodedOther] = Json::canonicalize($other);
diff --git a/src/Framework/Error/Error.php b/src/Framework/Error/Error.php
@@ -16,7 +16,7 @@
  */
 class Error extends Exception
 {
-    public function __construct(string $message, int $code, string $file, int $line, \Exception $previous = null)
+    public function __construct(string $message, int $code, string $file, int $line, ?\Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/src/Framework/Exception/Exception.php b/src/Framework/Exception/Exception.php
@@ -44,7 +44,7 @@ class Exception extends RuntimeException implements \PHPUnit\Exception
      */
     protected $serializableTrace;
 
-    public function __construct($message = '', $code = 0, Throwable $previous = null)
+    public function __construct($message = '', $code = 0, ?Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/src/Framework/Exception/ExpectationFailedException.php b/src/Framework/Exception/ExpectationFailedException.php
@@ -28,7 +28,7 @@ final class ExpectationFailedException extends AssertionFailedError
      */
     protected $comparisonFailure;
 
-    public function __construct(string $message, ComparisonFailure $comparisonFailure = null, Exception $previous = null)
+    public function __construct(string $message, ?ComparisonFailure $comparisonFailure = null, ?Exception $previous = null)
     {
         $this->comparisonFailure = $comparisonFailure;
 
diff --git a/src/Framework/Exception/InvalidArgumentException.php b/src/Framework/Exception/InvalidArgumentException.php
@@ -39,7 +39,7 @@ public static function create(int $argument, string $type): self
         );
     }
 
-    private function __construct(string $message = '', int $code = 0, \Exception $previous = null)
+    private function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
diff --git a/src/Framework/ExceptionWrapper.php b/src/Framework/ExceptionWrapper.php
@@ -114,7 +114,7 @@ public function getOriginalException(): ?Throwable
      *
      * Approach works both for var_dump() and var_export() and print_r().
      */
-    private function originalException(Throwable $exceptionToStore = null): ?Throwable
+    private function originalException(?Throwable $exceptionToStore = null): ?Throwable
     {
         // drop once PHP 7.3 support is removed
         if (PHP_VERSION_ID < 70400) {
diff --git a/src/Framework/MockObject/Generator.php b/src/Framework/MockObject/Generator.php
@@ -152,7 +152,7 @@ public function __clone()
      * @throws RuntimeException
      * @throws UnknownTypeException
      */
-    public function getMock(string $type, $methods = [], array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, bool $cloneArguments = true, bool $callOriginalMethods = false, object $proxyTarget = null, bool $allowMockingUnknownTypes = true, bool $returnValueGeneration = true): MockObject
+    public function getMock(string $type, $methods = [], array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, bool $cloneArguments = true, bool $callOriginalMethods = false, ?object $proxyTarget = null, bool $allowMockingUnknownTypes = true, bool $returnValueGeneration = true): MockObject
     {
         if (!is_array($methods) && null !== $methods) {
             throw InvalidArgumentException::create(2, 'array');
@@ -307,7 +307,7 @@ public function getMockForInterfaces(array $interfaces, bool $callAutoload = tru
      * @throws UnknownClassException
      * @throws UnknownTypeException
      */
-    public function getMockForAbstractClass(string $originalClassName, array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, array $mockedMethods = null, bool $cloneArguments = true): MockObject
+    public function getMockForAbstractClass(string $originalClassName, array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, ?array $mockedMethods = null, bool $cloneArguments = true): MockObject
     {
         if (class_exists($originalClassName, $callAutoload) ||
             interface_exists($originalClassName, $callAutoload)) {
@@ -370,7 +370,7 @@ interface_exists($originalClassName, $callAutoload)) {
      * @throws UnknownTraitException
      * @throws UnknownTypeException
      */
-    public function getMockForTrait(string $traitName, array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, array $mockedMethods = null, bool $cloneArguments = true): MockObject
+    public function getMockForTrait(string $traitName, array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, ?array $mockedMethods = null, bool $cloneArguments = true): MockObject
     {
         if (!trait_exists($traitName, $callAutoload)) {
             throw new UnknownTraitException($traitName);
@@ -447,7 +447,7 @@ public function getObjectForTrait(string $traitName, string $traitClassName = ''
      * @throws ReflectionException
      * @throws RuntimeException
      */
-    public function generate(string $type, array $methods = null, string $mockClassName = '', bool $callOriginalClone = true, bool $callAutoload = true, bool $cloneArguments = true, bool $callOriginalMethods = false): MockClass
+    public function generate(string $type, ?array $methods = null, string $mockClassName = '', bool $callOriginalClone = true, bool $callAutoload = true, bool $cloneArguments = true, bool $callOriginalMethods = false): MockClass
     {
         if ($mockClassName !== '') {
             return $this->generateMock(
@@ -703,7 +703,7 @@ private function userDefinedInterfaceMethods(string $interfaceName): array
      * @throws ReflectionException
      * @throws RuntimeException
      */
-    private function getObject(MockType $mockClass, $type = '', bool $callOriginalConstructor = false, bool $callAutoload = false, array $arguments = [], bool $callOriginalMethods = false, object $proxyTarget = null, bool $returnValueGeneration = true)
+    private function getObject(MockType $mockClass, $type = '', bool $callOriginalConstructor = false, bool $callAutoload = false, array $arguments = [], bool $callOriginalMethods = false, ?object $proxyTarget = null, bool $returnValueGeneration = true)
     {
         $className = $mockClass->generate();
 
diff --git a/src/Framework/Test.php b/src/Framework/Test.php
@@ -19,5 +19,5 @@ interface Test extends Countable
     /**
      * Runs a test and collects its result in a TestResult instance.
      */
-    public function run(TestResult $result = null): TestResult;
+    public function run(?TestResult $result = null): TestResult;
 }
diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -812,7 +812,7 @@ public function hasFailed(): bool
      * @throws CodeCoverageException
      * @throws UtilException
      */
-    public function run(TestResult $result = null): TestResult
+    public function run(?TestResult $result = null): TestResult
     {
         if ($result === null) {
             $result = $this->createResult();
diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
@@ -599,7 +599,7 @@ public function setGroupDetails(array $groups): void
      * @throws CodeCoverageException
      * @throws Warning
      */
-    public function run(TestResult $result = null): TestResult
+    public function run(?TestResult $result = null): TestResult
     {
         if ($result === null) {
             $result = $this->createResult();
diff --git a/src/Runner/PhptTestCase.php b/src/Runner/PhptTestCase.php
@@ -85,7 +85,7 @@ final class PhptTestCase implements Reorderable, SelfDescribing, Test
      *
      * @throws Exception
      */
-    public function __construct(string $filename, AbstractPhpProcess $phpUtil = null)
+    public function __construct(string $filename, ?AbstractPhpProcess $phpUtil = null)
     {
         if (!is_file($filename)) {
             throw new Exception(
@@ -116,7 +116,7 @@ public function count(): int
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      * @throws Exception
      */
-    public function run(TestResult $result = null): TestResult
+    public function run(?TestResult $result = null): TestResult
     {
         if ($result === null) {
             $result = new TestResult;
diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
@@ -122,7 +122,7 @@ final class TestRunner extends BaseTestRunner
      */
     private $timer;
 
-    public function __construct(TestSuiteLoader $loader = null, CodeCoverageFilter $filter = null)
+    public function __construct(?TestSuiteLoader $loader = null, ?CodeCoverageFilter $filter = null)
     {
         if ($filter === null) {
             $filter = new CodeCoverageFilter;
diff --git a/src/Util/PHP/AbstractPhpProcess.php b/src/Util/PHP/AbstractPhpProcess.php
@@ -201,7 +201,7 @@ public function runTestJob(string $job, Test $test, TestResult $result, string $
     /**
      * Returns the command based into the configurations.
      */
-    public function getCommand(array $settings, string $file = null): string
+    public function getCommand(array $settings, ?string $file = null): string
     {
         $command = $this->runtime->getBinary();
 
diff --git a/src/Util/PHP/WindowsPhpProcess.php b/src/Util/PHP/WindowsPhpProcess.php
@@ -20,7 +20,7 @@
  */
 final class WindowsPhpProcess extends DefaultPhpProcess
 {
-    public function getCommand(array $settings, string $file = null): string
+    public function getCommand(array $settings, ?string $file = null): string
     {
         if (PHP_MAJOR_VERSION < 8) {
             return '"' . parent::getCommand($settings, $file) . '"';
diff --git a/tests/_files/DoubleTestCase.php b/tests/_files/DoubleTestCase.php
@@ -27,7 +27,7 @@ public function count(): int
         return 2;
     }
 
-    public function run(TestResult $result = null): TestResult
+    public function run(?TestResult $result = null): TestResult
     {
         $result->startTest($this);
 
diff --git a/tests/_files/NotReorderableTest.php b/tests/_files/NotReorderableTest.php
@@ -17,7 +17,7 @@ public function count(): int
         return 1;
     }
 
-    public function run(TestResult $result = null): TestResult
+    public function run(?TestResult $result = null): TestResult
     {
         return new TestResult;
     }
diff --git a/tests/_files/NotSelfDescribingTest.php b/tests/_files/NotSelfDescribingTest.php
@@ -24,7 +24,7 @@ public function count(): int
         return 0;
     }
 
-    public function run(TestResult $result = null): TestResult
+    public function run(?TestResult $result = null): TestResult
     {
         return new TestResult;
     }
diff --git a/tests/unit/Framework/Constraint/ConstraintTest.php b/tests/unit/Framework/Constraint/ConstraintTest.php
@@ -43,7 +43,7 @@ final protected function reduce(): Constraint
                 return parent::reduce();
             }
 
-            final protected function fail($other, $description, ComparisonFailure $comparisonFailure = null): void
+            final protected function fail($other, $description, ?ComparisonFailure $comparisonFailure = null): void
             {
                 parent::fail($other, $description, $comparisonFailure);
             }
@@ -83,7 +83,7 @@ final public function exposedExporter(): Exporter
                 return $this->exporter();
             }
 
-            final public function exposedFail($other, $description, ComparisonFailure $comparisonFailure = null): void
+            final public function exposedFail($other, $description, ?ComparisonFailure $comparisonFailure = null): void
             {
                 $this->fail($other, $description, $comparisonFailure);
             }

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ protected function matches($other): bool`
`101`	`101`	`*`
`102`	`102`	`* @psalm-return never-return`
`103`	`103`	`*/`
`104`		`- protected function fail($other, $description, ComparisonFailure $comparisonFailure = null): void`
	`104`	`+ protected function fail($other, $description, ?ComparisonFailure $comparisonFailure = null): void`
`105`	`105`	`{`
`106`	`106`	`$failureDescription = sprintf(`
`107`	`107`	`'Failed asserting that %s.',`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ protected function matches($other): bool`
`78`	`78`	`*`
`79`	`79`	`* @psalm-return never-return`
`80`	`80`	`*/`
`81`		`- protected function fail($other, $description, ComparisonFailure $comparisonFailure = null): void`
	`81`	`+ protected function fail($other, $description, ?ComparisonFailure $comparisonFailure = null): void`
`82`	`82`	`{`
`83`	`83`	`if ($comparisonFailure === null) {`
`84`	`84`	`[$error, $recodedOther] = Json::canonicalize($other);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`	`class Error extends Exception`
`18`	`18`	`{`
`19`		`- public function __construct(string $message, int $code, string $file, int $line, \Exception $previous = null)`
	`19`	`+ public function __construct(string $message, int $code, string $file, int $line, ?\Exception $previous = null)`
`20`	`20`	`{`
`21`	`21`	`parent::__construct($message, $code, $previous);`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class Exception extends RuntimeException implements \PHPUnit\Exception`
`44`	`44`	`*/`
`45`	`45`	`protected $serializableTrace;`
`46`	`46`
`47`		`- public function __construct($message = '', $code = 0, Throwable $previous = null)`
	`47`	`+ public function __construct($message = '', $code = 0, ?Throwable $previous = null)`
`48`	`48`	`{`
`49`	`49`	`parent::__construct($message, $code, $previous);`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ final class ExpectationFailedException extends AssertionFailedError`
`28`	`28`	`*/`
`29`	`29`	`protected $comparisonFailure;`
`30`	`30`
`31`		`- public function __construct(string $message, ComparisonFailure $comparisonFailure = null, Exception $previous = null)`
	`31`	`+ public function __construct(string $message, ?ComparisonFailure $comparisonFailure = null, ?Exception $previous = null)`
`32`	`32`	`{`
`33`	`33`	`$this->comparisonFailure = $comparisonFailure;`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static function create(int $argument, string $type): self`
`39`	`39`	`);`
`40`	`40`	`}`
`41`	`41`
`42`		`- private function __construct(string $message = '', int $code = 0, \Exception $previous = null)`
	`42`	`+ private function __construct(string $message = '', int $code = 0, ?\Exception $previous = null)`
`43`	`43`	`{`
`44`	`44`	`parent::__construct($message, $code, $previous);`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public function getOriginalException(): ?Throwable`
`114`	`114`	`*`
`115`	`115`	`* Approach works both for var_dump() and var_export() and print_r().`
`116`	`116`	`*/`
`117`		`- private function originalException(Throwable $exceptionToStore = null): ?Throwable`
	`117`	`+ private function originalException(?Throwable $exceptionToStore = null): ?Throwable`
`118`	`118`	`{`
`119`	`119`	`// drop once PHP 7.3 support is removed`
`120`	`120`	`if (PHP_VERSION_ID < 70400) {`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@ interface Test extends Countable`
`19`	`19`	`/**`
`20`	`20`	`* Runs a test and collects its result in a TestResult instance.`
`21`	`21`	`*/`
`22`		`- public function run(TestResult $result = null): TestResult;`
	`22`	`+ public function run(?TestResult $result = null): TestResult;`
`23`	`23`	`}`