fixed PHP 8.5 compatibility

Author: dg

src/Iterators/CachingIterator.php

@@ -34,7 +34,7 @@ class CachingIterator extends \CachingIterator implements \Countable
 	public function __construct(iterable|\stdClass $iterable)
 	{
 		$iterable = $iterable instanceof \stdClass
-			? new \ArrayIterator($iterable)
+			? new \ArrayIterator((array) $iterable)
 			: Nette\Utils\Iterables::toIterator($iterable);
 		parent::__construct($iterable, 0);
 	}

src/Utils/Arrays.php

@@ -533,7 +533,7 @@ public static function toObject(iterable $array, object $object): object
 	 */
 	public static function toKey(mixed $value): int|string
 	{
-		return key([$value => null]);
+		return key(@[$value => null]);
 	}
 
 

src/Utils/Image.php

@@ -239,8 +239,8 @@ public static function fromBlank(int $width, int $height, ImageColor|array|null
 	 */
 	public static function detectTypeFromFile(string $file, &$width = null, &$height = null): ?int
 	{
-		[$width, $height, $type] = @getimagesize($file); // @ - files smaller than 12 bytes causes read error
-		return isset(self::Formats[$type]) ? $type : null;
+		[$width, $height, $type] = Helpers::falseToNull(@getimagesize($file)); // @ - files smaller than 12 bytes causes read error
+		return $type && isset(self::Formats[$type]) ? $type : null;
 	}
 
 
@@ -250,8 +250,8 @@ public static function detectTypeFromFile(string $file, &$width = null, &$height
 	 */
 	public static function detectTypeFromString(string $s, &$width = null, &$height = null): ?int
 	{
-		[$width, $height, $type] = @getimagesizefromstring($s); // @ - strings smaller than 12 bytes causes read error
-		return isset(self::Formats[$type]) ? $type : null;
+		[$width, $height, $type] = Helpers::falseToNull(@getimagesizefromstring($s)); // @ - strings smaller than 12 bytes causes read error
+		return $type && isset(self::Formats[$type]) ? $type : null;
 	}
 
 

tests/Utils/ArrayHash.phpt

@@ -117,7 +117,7 @@ test('recursive conversion transforms nested arrays into ArrayHash', function ()
 		'j' => 'Jack',
 		'children' => $list['children'],
 		'c' => 'Jim',
-	], iterator_to_array(new RecursiveIteratorIterator(new RecursiveArrayIterator($list), RecursiveIteratorIterator::SELF_FIRST)));
+	], @iterator_to_array(new RecursiveIteratorIterator(new RecursiveArrayIterator($list), RecursiveIteratorIterator::SELF_FIRST))); // ArrayIterator($object) is deprecated since PHP 8.5
 });
 
 

tests/Utils/Arrays.associate().phpt

@@ -81,7 +81,7 @@ Assert::equal(
 		22 => (object) [
 			'John' => ['name' => 'John', 'age' => 22],
 		],
-		null => (object) [
+		'' => (object) [
 			'Mary' => ['name' => 'Mary', 'age' => null],
 		],
 		44 => (object) [
@@ -112,7 +112,7 @@ Assert::same(
 			22 => ['name' => 'John', 'age' => 22],
 		],
 		'Mary' => [
-			null => ['name' => 'Mary', 'age' => null],
+			'' => ['name' => 'Mary', 'age' => null],
 		],
 		'Paul' => [
 			44 => ['name' => 'Paul', 'age' => 44],
@@ -168,7 +168,7 @@ Assert::same(
 			[22 => ['name' => 'John', 'age' => 22]],
 		],
 		'Mary' => [
-			[null => ['name' => 'Mary', 'age' => null]],
+			['' => ['name' => 'Mary', 'age' => null]],
 		],
 		'Paul' => [
 			[44 => ['name' => 'Paul', 'age' => 44]],

tests/Utils/FileSystem.copy.phpt

@@ -33,6 +33,12 @@ class RemoteStream /* extends \streamWrapper */
 	{
 		return false;
 	}
+
+
+	public function stream_eof()
+	{
+		return false;
+	}
 }
 
 stream_wrapper_register('remote', RemoteStream::class, STREAM_IS_URL);