Merge branch '9.6' into 10.5

sebastianbergmann · sebastianbergmann · commit eb22ea1dafbe · 2024-03-01T17:57:09.000+01:00
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -201,6 +201,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,
         'octal_notation' => true,
         'operator_linebreak' => [
diff --git a/src/Framework/Constraint/Constraint.php b/src/Framework/Constraint/Constraint.php
@@ -86,7 +86,7 @@ protected function matches(mixed $other): bool
      *
      * @throws ExpectationFailedException
      */
-    protected function fail(mixed $other, string $description, ComparisonFailure $comparisonFailure = null): never
+    protected function fail(mixed $other, string $description, ?ComparisonFailure $comparisonFailure = null): never
     {
         $failureDescription = sprintf(
             'Failed asserting that %s.',
diff --git a/src/Framework/Constraint/JsonMatches.php b/src/Framework/Constraint/JsonMatches.php
@@ -68,7 +68,7 @@ protected function matches(mixed $other): bool
      * @throws ExpectationFailedException
      * @throws InvalidJsonException
      */
-    protected function fail(mixed $other, string $description, ComparisonFailure $comparisonFailure = null): never
+    protected function fail(mixed $other, string $description, ?ComparisonFailure $comparisonFailure = null): never
     {
         if ($comparisonFailure === null) {
             [$error, $recodedOther] = Json::canonicalize($other);
diff --git a/src/Framework/Exception/Exception.php b/src/Framework/Exception/Exception.php
@@ -40,7 +40,7 @@ class Exception extends RuntimeException implements \PHPUnit\Exception
 {
     protected array $serializableTrace;
 
-    public function __construct(string $message = '', int $code = 0, Throwable $previous = null)
+    public function __construct(string $message = '', int $code = 0, ?Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/src/Framework/Exception/ExpectationFailedException.php b/src/Framework/Exception/ExpectationFailedException.php
@@ -25,7 +25,7 @@ final class ExpectationFailedException extends AssertionFailedError
 {
     protected ?ComparisonFailure $comparisonFailure = null;
 
-    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/MockObject/Generator/Generator.php b/src/Framework/MockObject/Generator/Generator.php
@@ -103,7 +103,7 @@ final class Generator
      * @throws RuntimeException
      * @throws UnknownTypeException
      */
-    public function testDouble(string $type, bool $mockObject, ?array $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|Stub
+    public function testDouble(string $type, bool $mockObject, ?array $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|Stub
     {
         if ($type === Traversable::class) {
             $type = Iterator::class;
@@ -234,7 +234,7 @@ public function testDoubleForInterfaceIntersection(array $interfaces, bool $mock
      *
      * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5241
      */
-    public function mockObjectForAbstractClass(string $originalClassName, array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, array $mockedMethods = null, bool $cloneArguments = true): MockObject
+    public function mockObjectForAbstractClass(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)) {
@@ -295,7 +295,7 @@ interface_exists($originalClassName, $callAutoload)) {
      *
      * @deprecated https://github.com/sebastianbergmann/phpunit/issues/5243
      */
-    public function mockObjectForTrait(string $traitName, array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, array $mockedMethods = null, bool $cloneArguments = true): MockObject
+    public function mockObjectForTrait(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);
@@ -378,7 +378,7 @@ public function objectForTrait(string $traitName, string $traitClassName = '', b
      *
      * @see https://github.com/sebastianbergmann/phpunit/issues/5476
      */
-    public function generate(string $type, bool $mockObject, array $methods = null, string $mockClassName = '', bool $callOriginalClone = true, bool $callAutoload = true, bool $cloneArguments = true, bool $callOriginalMethods = false): MockClass
+    public function generate(string $type, bool $mockObject, ?array $methods = null, string $mockClassName = '', bool $callOriginalClone = true, bool $callAutoload = true, bool $cloneArguments = true, bool $callOriginalMethods = false): MockClass
     {
         if ($mockClassName !== '') {
             return $this->generateCodeForTestDoubleClass(
@@ -561,7 +561,7 @@ private function userDefinedInterfaceMethods(string $interfaceName): array
      * @throws ReflectionException
      * @throws RuntimeException
      */
-    private function getObject(MockType $mockClass, string $type = '', bool $callOriginalConstructor = false, array $arguments = [], bool $callOriginalMethods = false, object $proxyTarget = null, bool $returnValueGeneration = true): object
+    private function getObject(MockType $mockClass, string $type = '', bool $callOriginalConstructor = false, array $arguments = [], bool $callOriginalMethods = false, ?object $proxyTarget = null, bool $returnValueGeneration = true): object
     {
         $className = $mockClass->generate();
         $object    = $this->instantiate($className, $callOriginalConstructor, $arguments);
diff --git a/src/Runner/PhptTestCase.php b/src/Runner/PhptTestCase.php
@@ -84,7 +84,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 FileDoesNotExistException($filename);
diff --git a/src/Util/Exporter.php b/src/Util/Exporter.php
@@ -29,7 +29,7 @@ public static function export(mixed $value, bool $exportObjects = false): string
         return '{enable export of objects to see this value}';
     }
 
-    private static function isExportable(mixed &$value, Context $context = null): bool
+    private static function isExportable(mixed &$value, ?Context $context = null): bool
     {
         if (is_scalar($value) || $value === null) {
             return true;
diff --git a/src/Util/PHP/AbstractPhpProcess.php b/src/Util/PHP/AbstractPhpProcess.php
@@ -157,7 +157,7 @@ public function runTestJob(string $job, Test $test, string $processResultFile):
     /**
      * 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
     {
         $runtime = new Runtime;
 

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ protected function matches(mixed $other): bool`
`86`	`86`	`*`
`87`	`87`	`* @throws ExpectationFailedException`
`88`	`88`	`*/`
`89`		`- protected function fail(mixed $other, string $description, ComparisonFailure $comparisonFailure = null): never`
	`89`	`+ protected function fail(mixed $other, string $description, ?ComparisonFailure $comparisonFailure = null): never`
`90`	`90`	`{`
`91`	`91`	`$failureDescription = sprintf(`
`92`	`92`	`'Failed asserting that %s.',`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ protected function matches(mixed $other): bool`
`68`	`68`	`* @throws ExpectationFailedException`
`69`	`69`	`* @throws InvalidJsonException`
`70`	`70`	`*/`
`71`		`- protected function fail(mixed $other, string $description, ComparisonFailure $comparisonFailure = null): never`
	`71`	`+ protected function fail(mixed $other, string $description, ?ComparisonFailure $comparisonFailure = null): never`
`72`	`72`	`{`
`73`	`73`	`if ($comparisonFailure === null) {`
`74`	`74`	`[$error, $recodedOther] = Json::canonicalize($other);`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class Exception extends RuntimeException implements \PHPUnit\Exception`
`40`	`40`	`{`
`41`	`41`	`protected array $serializableTrace;`
`42`	`42`
`43`		`- public function __construct(string $message = '', int $code = 0, Throwable $previous = null)`
	`43`	`+ public function __construct(string $message = '', int $code = 0, ?Throwable $previous = null)`
`44`	`44`	`{`
`45`	`45`	`parent::__construct($message, $code, $previous);`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ final class ExpectationFailedException extends AssertionFailedError`
`25`	`25`	`{`
`26`	`26`	`protected ?ComparisonFailure $comparisonFailure = null;`
`27`	`27`
`28`		`- public function __construct(string $message, ComparisonFailure $comparisonFailure = null, Exception $previous = null)`
	`28`	`+ public function __construct(string $message, ?ComparisonFailure $comparisonFailure = null, ?Exception $previous = null)`
`29`	`29`	`{`
`30`	`30`	`$this->comparisonFailure = $comparisonFailure;`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ final class Generator`
`103`	`103`	`* @throws RuntimeException`
`104`	`104`	`* @throws UnknownTypeException`
`105`	`105`	`*/`
`106`		`- public function testDouble(string $type, bool $mockObject, ?array $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\|Stub`
	`106`	`+ public function testDouble(string $type, bool $mockObject, ?array $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\|Stub`
`107`	`107`	`{`
`108`	`108`	`if ($type === Traversable::class) {`
`109`	`109`	`$type = Iterator::class;`
`@@ -234,7 +234,7 @@ public function testDoubleForInterfaceIntersection(array $interfaces, bool $mock`
`234`	`234`	`*`
`235`	`235`	`* @deprecated https://github.com/sebastianbergmann/phpunit/issues/5241`
`236`	`236`	`*/`
`237`		`- public function mockObjectForAbstractClass(string $originalClassName, array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, array $mockedMethods = null, bool $cloneArguments = true): MockObject`
	`237`	`+ public function mockObjectForAbstractClass(string $originalClassName, array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, ?array $mockedMethods = null, bool $cloneArguments = true): MockObject`
`238`	`238`	`{`
`239`	`239`	`if (class_exists($originalClassName, $callAutoload) \|\|`
`240`	`240`	`interface_exists($originalClassName, $callAutoload)) {`
`@@ -295,7 +295,7 @@ interface_exists($originalClassName, $callAutoload)) {`
`295`	`295`	`*`
`296`	`296`	`* @deprecated https://github.com/sebastianbergmann/phpunit/issues/5243`
`297`	`297`	`*/`
`298`		`- public function mockObjectForTrait(string $traitName, array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, array $mockedMethods = null, bool $cloneArguments = true): MockObject`
	`298`	`+ public function mockObjectForTrait(string $traitName, array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, ?array $mockedMethods = null, bool $cloneArguments = true): MockObject`
`299`	`299`	`{`
`300`	`300`	`if (!trait_exists($traitName, $callAutoload)) {`
`301`	`301`	`throw new UnknownTraitException($traitName);`
`@@ -378,7 +378,7 @@ public function objectForTrait(string $traitName, string $traitClassName = '', b`
`378`	`378`	`*`
`379`	`379`	`* @see https://github.com/sebastianbergmann/phpunit/issues/5476`
`380`	`380`	`*/`
`381`		`- public function generate(string $type, bool $mockObject, array $methods = null, string $mockClassName = '', bool $callOriginalClone = true, bool $callAutoload = true, bool $cloneArguments = true, bool $callOriginalMethods = false): MockClass`
	`381`	`+ public function generate(string $type, bool $mockObject, ?array $methods = null, string $mockClassName = '', bool $callOriginalClone = true, bool $callAutoload = true, bool $cloneArguments = true, bool $callOriginalMethods = false): MockClass`
`382`	`382`	`{`
`383`	`383`	`if ($mockClassName !== '') {`
`384`	`384`	`return $this->generateCodeForTestDoubleClass(`
`@@ -561,7 +561,7 @@ private function userDefinedInterfaceMethods(string $interfaceName): array`
`561`	`561`	`* @throws ReflectionException`
`562`	`562`	`* @throws RuntimeException`
`563`	`563`	`*/`
`564`		`- private function getObject(MockType $mockClass, string $type = '', bool $callOriginalConstructor = false, array $arguments = [], bool $callOriginalMethods = false, object $proxyTarget = null, bool $returnValueGeneration = true): object`
	`564`	`+ private function getObject(MockType $mockClass, string $type = '', bool $callOriginalConstructor = false, array $arguments = [], bool $callOriginalMethods = false, ?object $proxyTarget = null, bool $returnValueGeneration = true): object`
`565`	`565`	`{`
`566`	`566`	`$className = $mockClass->generate();`
`567`	`567`	`$object = $this->instantiate($className, $callOriginalConstructor, $arguments);`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ final class PhptTestCase implements Reorderable, SelfDescribing, Test`
`84`	`84`	`*`
`85`	`85`	`* @throws Exception`
`86`	`86`	`*/`
`87`		`- public function __construct(string $filename, AbstractPhpProcess $phpUtil = null)`
	`87`	`+ public function __construct(string $filename, ?AbstractPhpProcess $phpUtil = null)`
`88`	`88`	`{`
`89`	`89`	`if (!is_file($filename)) {`
`90`	`90`	`throw new FileDoesNotExistException($filename);`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public static function export(mixed $value, bool $exportObjects = false): string`
`29`	`29`	`return '{enable export of objects to see this value}';`
`30`	`30`	`}`
`31`	`31`
`32`		`- private static function isExportable(mixed &$value, Context $context = null): bool`
	`32`	`+ private static function isExportable(mixed &$value, ?Context $context = null): bool`
`33`	`33`	`{`
`34`	`34`	`if (is_scalar($value) \|\| $value === null) {`
`35`	`35`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public function runTestJob(string $job, Test $test, string $processResultFile):`
`157`	`157`	`/**`
`158`	`158`	`* Returns the command based into the configurations.`
`159`	`159`	`*/`
`160`		`- public function getCommand(array $settings, string $file = null): string`
	`160`	`+ public function getCommand(array $settings, ?string $file = null): string`
`161`	`161`	`{`
`162`	`162`	`$runtime = new Runtime;`
`163`	`163`