Skip to content

Commit a3e31de

Browse files
committed
added missing typehints
1 parent 0ef12af commit a3e31de

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

src/Utils/Arrays.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ public static function flatten(array $arr, bool $preserveKeys = false): array
138138
{
139139
$res = [];
140140
$cb = $preserveKeys
141-
? function ($v, $k) use (&$res) { $res[$k] = $v; }
142-
: function ($v) use (&$res) { $res[] = $v; };
141+
? function ($v, $k) use (&$res): void { $res[$k] = $v; }
142+
: function ($v) use (&$res): void { $res[] = $v; };
143143
array_walk_recursive($arr, $cb);
144144
return $res;
145145
}

src/Utils/Callback.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ public static function invokeArgs($callable, array $args = [])
6666
*/
6767
public static function invokeSafe(string $function, array $args, callable $onError)
6868
{
69-
$prev = set_error_handler(function ($severity, $message, $file) use ($onError, &$prev, $function) {
69+
$prev = set_error_handler(function ($severity, $message, $file) use ($onError, &$prev, $function): ?bool {
7070
if ($file === __FILE__) {
7171
$msg = $message;
7272
if (ini_get('html_errors')) {
7373
$msg = html_entity_decode(strip_tags($msg));
7474
}
7575
$msg = preg_replace("#^$function\(.*?\): #", '', $msg);
7676
if ($onError($msg, $severity) !== false) {
77-
return;
77+
return null;
7878
}
7979
}
8080
return $prev ? $prev(...func_get_args()) : false;

src/Utils/Image.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public static function fromFile(string $file, int &$detectedFormat = null)
152152
$detectedFormat = null;
153153
throw new UnknownImageFileException(is_file($file) ? "Unknown type of file '$file'." : "File '$file' not found.");
154154
}
155-
return new static(Callback::invokeSafe('imagecreatefrom' . image_type_to_extension($detectedFormat, false), [$file], function (string $message) {
155+
return new static(Callback::invokeSafe('imagecreatefrom' . image_type_to_extension($detectedFormat, false), [$file], function (string $message): void {
156156
throw new ImageException($message);
157157
}));
158158
}
@@ -174,7 +174,7 @@ public static function fromString(string $s, int &$detectedFormat = null)
174174
$detectedFormat = isset(self::$formats[$tmp]) ? $tmp : null;
175175
}
176176

177-
return new static(Callback::invokeSafe('imagecreatefromstring', [$s], function (string $message) {
177+
return new static(Callback::invokeSafe('imagecreatefromstring', [$s], function (string $message): void {
178178
throw new ImageException($message);
179179
}));
180180
}

src/Utils/Random.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ final class Random
2424
*/
2525
public static function generate(int $length = 10, string $charlist = '0-9a-z'): string
2626
{
27-
$charlist = count_chars(preg_replace_callback('#.-.#', function (array $m) {
27+
$charlist = count_chars(preg_replace_callback('#.-.#', function (array $m): string {
2828
return implode('', range($m[0][0], $m[0][2]));
2929
}, $charlist), 3);
3030
$chLen = strlen($charlist);

src/Utils/Strings.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ public static function replace(string $subject, $pattern, $replacement = null, i
492492
/** @internal */
493493
public static function pcre(string $func, array $args)
494494
{
495-
$res = Callback::invokeSafe($func, $args, function (string $message) use ($args) {
495+
$res = Callback::invokeSafe($func, $args, function (string $message) use ($args): void {
496496
// compile-time error, not detectable by preg_last_error
497497
throw new RegexpException($message . ' in pattern: ' . implode(' or ', (array) $args[0]));
498498
});

tests/bootstrap.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
@mkdir(TEMP_DIR);
2323

2424

25-
function test(\Closure $function)
25+
function test(\Closure $function): void
2626
{
2727
$function();
2828
}

0 commit comments

Comments
 (0)