improved native types

Author: dg

src/Utils/Arrays.php

@@ -106,7 +106,7 @@ public static function getKeyOffset(array $array, string|int $key): ?int
 	/**
 	 * @deprecated  use  getKeyOffset()
 	 */
-	public static function searchKey(array $array, $key): ?int
+	public static function searchKey(array $array, string|int $key): ?int
 	{
 		return self::getKeyOffset($array, $key);
 	}
@@ -286,7 +286,7 @@ public static function isList(mixed $value): bool
 	 * Reformats table to associative tree. Path looks like 'field|field[]field->field=field'.
 	 * @param  string|string[]  $path
 	 */
-	public static function associate(array $array, $path): array|\stdClass
+	public static function associate(array $array, string|array $path): array|\stdClass
 	{
 		$parts = is_array($path)
 			? $path
@@ -482,7 +482,7 @@ public static function mapWithKeys(array $array, callable $transformer): array
 	 * Invokes all callbacks and returns array of results.
 	 * @param  callable[]  $callbacks
 	 */
-	public static function invoke(iterable $callbacks, ...$args): array
+	public static function invoke(iterable $callbacks, mixed ...$args): array
 	{
 		$res = [];
 		foreach ($callbacks as $k => $cb) {
@@ -497,7 +497,7 @@ public static function invoke(iterable $callbacks, ...$args): array
 	 * Invokes method on every object in an array and returns array of results.
 	 * @param  object[]  $objects
 	 */
-	public static function invokeMethod(iterable $objects, string $method, ...$args): array
+	public static function invokeMethod(iterable $objects, string $method, mixed ...$args): array
 	{
 		$res = [];
 		foreach ($objects as $k => $obj) {

src/Utils/Callback.php

@@ -25,7 +25,7 @@ final class Callback
 	 */
 	public static function invokeSafe(string $function, array $args, callable $onError): mixed
 	{
-		$prev = set_error_handler(function ($severity, $message, $file) use ($onError, &$prev, $function): ?bool {
+		$prev = set_error_handler(function (int $severity, string $message, string $file, int $line) use ($onError, &$prev, $function): ?bool {
 			if ($file === __FILE__) {
 				$msg = ini_get('html_errors')
 					? Html::htmlToText($message)
@@ -53,7 +53,7 @@ public static function invokeSafe(string $function, array $args, callable $onErr
 	 * @return callable
 	 * @throws Nette\InvalidArgumentException
 	 */
-	public static function check(mixed $callable, bool $syntax = false)
+	public static function check(mixed $callable, bool $syntax = false): mixed
 	{
 		if (!is_callable($callable, $syntax)) {
 			throw new Nette\InvalidArgumentException(
@@ -87,7 +87,7 @@ public static function toString(mixed $callable): string
 	 * @param  callable  $callable  type check is escalated to ReflectionException
 	 * @throws \ReflectionException  if callback is not valid
 	 */
-	public static function toReflection($callable): \ReflectionMethod|\ReflectionFunction
+	public static function toReflection(mixed $callable): \ReflectionMethod|\ReflectionFunction
 	{
 		if ($callable instanceof \Closure) {
 			$callable = self::unwrap($callable);

src/Utils/DateTime.php

@@ -142,7 +142,7 @@ public static function relativeToSeconds(string $relativeTime): int
 	}
 
 
-	private function apply(string $datetime, $timezone = null, bool $ctr = false): void
+	private function apply(string $datetime, ?\DateTimeZone $timezone = null, bool $ctr = false): void
 	{
 		$relPart = '';
 		$absPart = preg_replace_callback(

src/Utils/Html.php

@@ -634,7 +634,7 @@ final public function offsetSet($index, $child): void
 	 * Returns child node (\ArrayAccess implementation).
 	 * @param  int  $index
 	 */
-	final public function offsetGet($index): HtmlStringable|string
+	final public function offsetGet($index): self|string
 	{
 		return $this->children[$index];
 	}

src/Utils/Image.php

@@ -237,7 +237,7 @@ public static function fromBlank(int $width, int $height, ImageColor|array|null
 	 * Returns the type of image from file.
 	 * @return ImageType::*|null
 	 */
-	public static function detectTypeFromFile(string $file, &$width = null, &$height = null): ?int
+	public static function detectTypeFromFile(string $file, mixed &$width = null, mixed &$height = null): ?int
 	{
 		[$width, $height, $type] = Helpers::falseToNull(@getimagesize($file)); // @ - files smaller than 12 bytes causes read error
 		return $type && isset(self::Formats[$type]) ? $type : null;
@@ -248,7 +248,7 @@ public static function detectTypeFromFile(string $file, &$width = null, &$height
 	 * Returns the type of image from string.
 	 * @return ImageType::*|null
 	 */
-	public static function detectTypeFromString(string $s, &$width = null, &$height = null): ?int
+	public static function detectTypeFromString(string $s, mixed &$width = null, mixed &$height = null): ?int
 	{
 		[$width, $height, $type] = Helpers::falseToNull(@getimagesizefromstring($s)); // @ - strings smaller than 12 bytes causes read error
 		return $type && isset(self::Formats[$type]) ? $type : null;
@@ -423,8 +423,8 @@ public function resize(int|string|null $width, int|string|null $height, int $mod
 	public static function calculateSize(
 		int $srcWidth,
 		int $srcHeight,
-		$newWidth,
-		$newHeight,
+		int|string|null $newWidth,
+		int|string|null $newHeight,
 		int $mode = self::OrSmaller,
 	): array
 	{

src/Utils/Strings.php

@@ -680,7 +680,7 @@ private static function bytesToChars(string $s, array $groups): array
 
 
 	/** @internal */
-	public static function pcre(string $func, array $args)
+	public static function pcre(string $func, array $args): mixed
 	{
 		$res = Callback::invokeSafe($func, $args, function (string $message) use ($args): void {
 			// compile-time error, not detectable by preg_last_error

src/Utils/Type.php

@@ -40,7 +40,11 @@ public static function fromReflection(
 	}
 
 
-	private static function fromReflectionType(\ReflectionType $type, $of, bool $asObject): self|string
+	private static function fromReflectionType(
+		\ReflectionType $type,
+		\ReflectionFunctionAbstract|\ReflectionParameter|\ReflectionProperty $of,
+		bool $asObject,
+	): self|string
 	{
 		if ($type instanceof \ReflectionNamedType) {
 			$name = self::resolve($type->getName(), $of);
@@ -291,9 +295,9 @@ private function allowsAll(array $ourTypes, array $givenTypes): bool
 	{
 		return Arrays::every(
 			$ourTypes,
-			fn($ourType) => Arrays::some(
+			fn(string $ourType) => Arrays::some(
 				$givenTypes,
-				fn($givenType) => Validators::isBuiltinType($ourType)
+				fn(string $givenType) => Validators::isBuiltinType($ourType)
 					? strcasecmp($ourType, $givenType) === 0
 					: is_a($givenType, $ourType, allow_string: true),
 			),

src/Utils/Validators.php

@@ -120,7 +120,7 @@ public static function assert(mixed $value, string $expected, string $label = 'v
 	 */
 	public static function assertField(
 		array $array,
-		$key,
+		int|string $key,
 		?string $expected = null,
 		string $label = "item '%' in array",
 	): void