Merge pull request #1473 from jrfnl/8.x/php-8.4-fix-implicitly-nullable

MarcelloDuarte · web-flow · commit 62822eef17a4 · 2025-05-17T17:33:23.000+01:00
PHP 8.4 | Fix implicitly nullable parameters (8.x/main)
diff --git a/src/PhpSpec/Exception/Example/StopOnFailureException.php b/src/PhpSpec/Exception/Example/StopOnFailureException.php
@@ -23,7 +23,7 @@ class StopOnFailureException extends ExampleException
     public function __construct(
         string $message = "",
         int $code = 0,
-        Exception $previous = null,
+        ?Exception $previous = null,
         private int $result = 0)
     {
         parent::__construct($message, $code, $previous);
diff --git a/src/PhpSpec/Matcher/TriggerMatcher.php b/src/PhpSpec/Matcher/TriggerMatcher.php
@@ -44,7 +44,7 @@ public function negativeMatch(string $name, mixed $subject, array $arguments): D
     /**
      * @throws \PhpSpec\Exception\Example\FailureException
      */
-    public function verifyPositive(callable $callable, array $arguments, int $level = null, string $message = null) : void
+    public function verifyPositive(callable $callable, array $arguments, ?int $level = null, ?string $message = null) : void
     {
         $triggered = 0;
         $prevHandler = function($type, $str, $file, $line, $context=[]){};
@@ -73,7 +73,7 @@ public function verifyPositive(callable $callable, array $arguments, int $level
     /**
      * @throws \PhpSpec\Exception\Example\FailureException
      */
-    public function verifyNegative(callable $callable, array $arguments, int $level = null, string $message = null) : void
+    public function verifyNegative(callable $callable, array $arguments, ?int $level = null, ?string $message = null) : void
     {
         $triggered = 0;
         $prevHandler = function($type, $str, $file, $line, $context=[]){};
diff --git a/src/PhpSpec/Message/CurrentExampleTracker.php b/src/PhpSpec/Message/CurrentExampleTracker.php
@@ -17,7 +17,7 @@ final class CurrentExampleTracker
 {
     private ?string $currentExample = null;
 
-    public function setCurrentExample(string $currentExample = null) : void
+    public function setCurrentExample(?string $currentExample = null) : void
     {
         $this->currentExample = $currentExample;
     }
diff --git a/src/PhpSpec/Wrapper/Collaborator.php b/src/PhpSpec/Wrapper/Collaborator.php
@@ -33,7 +33,7 @@ public function beADoubleOf(string $classOrInterface): void
         }
     }
 
-    public function beConstructedWith(array $arguments = null): void
+    public function beConstructedWith(?array $arguments = null): void
     {
         $this->prophecy->willBeConstructedWith($arguments);
     }
diff --git a/src/PhpSpec/Wrapper/Subject/Expectation/ConstructorDecorator.php b/src/PhpSpec/Wrapper/Subject/Expectation/ConstructorDecorator.php
@@ -30,7 +30,7 @@ public function __construct(Expectation $expectation)
      * @throws \PhpSpec\Exception\Example\ErrorException
      * @throws \PhpSpec\Exception\Fracture\FractureException
      */
-    public function match(string $alias, mixed $subject, array $arguments = [], WrappedObject $wrappedObject = null) : DelayedCall|DuringCall|bool|null
+    public function match(string $alias, mixed $subject, array $arguments = [], ?WrappedObject $wrappedObject = null) : DelayedCall|DuringCall|bool|null
     {
         try {
             $wrapped = $subject->getWrappedObject();

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class StopOnFailureException extends ExampleException`
`23`	`23`	`public function __construct(`
`24`	`24`	`string $message = "",`
`25`	`25`	`int $code = 0,`
`26`		`- Exception $previous = null,`
	`26`	`+ ?Exception $previous = null,`
`27`	`27`	`private int $result = 0)`
`28`	`28`	`{`
`29`	`29`	`parent::__construct($message, $code, $previous);`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ final class CurrentExampleTracker`
`17`	`17`	`{`
`18`	`18`	`private ?string $currentExample = null;`
`19`	`19`
`20`		`- public function setCurrentExample(string $currentExample = null) : void`
	`20`	`+ public function setCurrentExample(?string $currentExample = null) : void`
`21`	`21`	`{`
`22`	`22`	`$this->currentExample = $currentExample;`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function beADoubleOf(string $classOrInterface): void`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function beConstructedWith(array $arguments = null): void`
	`36`	`+ public function beConstructedWith(?array $arguments = null): void`
`37`	`37`	`{`
`38`	`38`	`$this->prophecy->willBeConstructedWith($arguments);`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function __construct(Expectation $expectation)`
`30`	`30`	`* @throws \PhpSpec\Exception\Example\ErrorException`
`31`	`31`	`* @throws \PhpSpec\Exception\Fracture\FractureException`
`32`	`32`	`*/`
`33`		`- public function match(string $alias, mixed $subject, array $arguments = [], WrappedObject $wrappedObject = null) : DelayedCall\|DuringCall\|bool\|null`
	`33`	`+ public function match(string $alias, mixed $subject, array $arguments = [], ?WrappedObject $wrappedObject = null) : DelayedCall\|DuringCall\|bool\|null`
`34`	`34`	`{`
`35`	`35`	`try {`
`36`	`36`	`$wrapped = $subject->getWrappedObject();`