Skip to content

Commit 5534344

Browse files
Merge branch '5.2' into 5.3
* 5.2: Backport type fixes Fix CS Avoid triggering the autoloader in Deprecation::isLegacy() fix markdown markup Backport type fixes uzb translation [DependencyInjection] Fix doc blocks [DependencyInjection] Turn $defaultDeprecationTemplate into a constant [Form] better form doc types to support static analysis
2 parents 19b71c8 + 1edb762 commit 5534344

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Filesystem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ private static function box(callable $func, ...$args)
751751
/**
752752
* @internal
753753
*/
754-
public static function handleError($type, $msg)
754+
public static function handleError(int $type, string $msg)
755755
{
756756
self::$lastError = $msg;
757757
}

Tests/Fixtures/MockStream/MockStream.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ class MockStream
2626
* @param string $opened_path If the path is opened successfully, and STREAM_USE_PATH is set in options,
2727
* opened_path should be set to the full path of the file/resource that was actually opened
2828
*/
29-
public function stream_open($path, $mode, $options, &$opened_path): bool
29+
public function stream_open(string $path, string $mode, int $options, string &$opened_path = null): bool
3030
{
3131
return true;
3232
}
3333

3434
/**
3535
* @param string $path The file path or URL to stat
36-
* @param array $flags Holds additional flags set by the streams API
36+
* @param int $flags Holds additional flags set by the streams API
3737
*
3838
* @return array File stats
3939
*/
40-
public function url_stat($path, $flags): array
40+
public function url_stat(string $path, int $flags): array
4141
{
4242
return [];
4343
}

0 commit comments

Comments
 (0)