Skip to content

Commit 6b5db10

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: [HttpFoundation] Allow array style callable setting for Request setFactory method Make more nullable types explicit Add more explicit nullable types for default null values
2 parents 48345ff + a014167 commit 6b5db10

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/DeprecationErrorHandler/ConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ public function testBaselineFileWriteError()
525525
$this->expectException(\ErrorException::class);
526526
$this->expectExceptionMessageMatches('/[Ff]ailed to open stream: Permission denied/');
527527

528-
set_error_handler(static function (int $errno, string $errstr, string $errfile = null, int $errline = null): bool {
528+
set_error_handler(static function (int $errno, string $errstr, ?string $errfile = null, ?int $errline = null): bool {
529529
if ($errno & (E_WARNING | E_WARNING)) {
530530
throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
531531
}

0 commit comments

Comments
 (0)