cs

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);
 	}
@@ -117,7 +117,7 @@ public static function searchKey(array $array, $key): ?int
 	 */
 	public static function contains(array $array, mixed $value): bool
 	{
-		return in_array($value, $array, true);
+		return in_array($value, $array, strict: true);
 	}
 
 

src/Utils/Callback.php

@@ -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(

src/Utils/FileInfo.php

@@ -19,14 +19,12 @@
  */
 final class FileInfo extends \SplFileInfo
 {
-	private readonly string $relativePath;
-
-
-	public function __construct(string $file, string $relativePath = '')
-	{
+	public function __construct(
+		string $file,
+		private readonly string $relativePath = '',
+	) {
 		parent::__construct($file);
-		$this->setInfoClass(static::class);
-		$this->relativePath = $relativePath;
+		$this->setInfoClass(self::class);
 	}
 
 

src/Utils/Html.php

@@ -780,7 +780,7 @@ final public function attributes(): string
 				continue;
 
 			} elseif (is_array($value)) {
-				if (strncmp($key, 'data-', 5) === 0) {
+				if (str_starts_with($key, 'data-')) {
 					$value = Json::encode($value);
 
 				} else {

src/Utils/Iterables.php

@@ -215,7 +215,7 @@ public static function memoize(iterable $iterable): \IteratorAggregate
 	{
 		return new class (self::toIterator($iterable)) implements \IteratorAggregate {
 			public function __construct(
-				private \Iterator $iterator,
+				private readonly \Iterator $iterator,
 				private array $cache = [],
 			) {
 			}

src/Utils/ObjectHelpers.php

@@ -27,7 +27,7 @@ final class ObjectHelpers
 	 * @return never
 	 * @throws MemberAccessException
 	 */
-	public static function strictGet(string $class, string $name): void
+	public static function strictGet(string $class, string $name): never
 	{
 		$rc = new \ReflectionClass($class);
 		$hint = self::getSuggestion(array_merge(
@@ -42,7 +42,7 @@ public static function strictGet(string $class, string $name): void
 	 * @return never
 	 * @throws MemberAccessException
 	 */
-	public static function strictSet(string $class, string $name): void
+	public static function strictSet(string $class, string $name): never
 	{
 		$rc = new \ReflectionClass($class);
 		$hint = self::getSuggestion(array_merge(
@@ -222,7 +222,7 @@ public static function hasProperty(string $class, string $name): bool|string
 				if ($rp->isPublic() && !$rp->isStatic()) {
 					$prop = $name >= 'onA' && $name < 'on_' ? 'event' : true;
 				}
-			} catch (\ReflectionException $e) {
+			} catch (\ReflectionException) {
 			}
 		}
 

src/Utils/ReflectionMethod.php

@@ -18,7 +18,7 @@
  */
 final class ReflectionMethod extends \ReflectionMethod
 {
-	private \ReflectionClass $originalClass;
+	private readonly \ReflectionClass $originalClass;
 
 
 	public function __construct(object|string $objectOrMethod, ?string $method = null)

src/Utils/Strings.php

@@ -135,7 +135,7 @@ public static function substring(string $s, int $start, ?int $length = null): st
 	public static function normalize(string $s): string
 	{
 		// convert to compressed normal form (NFC)
-		if (class_exists('Normalizer', false) && ($n = \Normalizer::normalize($s, \Normalizer::FORM_C)) !== false) {
+		if (class_exists('Normalizer', autoload: false) && ($n = \Normalizer::normalize($s, \Normalizer::FORM_C)) !== false) {
 			$s = $n;
 		}
 
@@ -323,7 +323,7 @@ public static function capitalize(string $s): string
 	 */
 	public static function compare(string $left, string $right, ?int $length = null): bool
 	{
-		if (class_exists('Normalizer', false)) {
+		if (class_exists('Normalizer', autoload: false)) {
 			$left = \Normalizer::normalize($left, \Normalizer::FORM_D); // form NFD is faster
 			$right = \Normalizer::normalize($right, \Normalizer::FORM_D); // form NFD is faster
 		}
@@ -688,7 +688,7 @@ public static function pcre(string $func, array $args)
 		});
 
 		if (($code = preg_last_error()) // run-time error, but preg_last_error & return code are liars
-			&& ($res === null || !in_array($func, ['preg_filter', 'preg_replace_callback', 'preg_replace'], true))
+			&& ($res === null || !in_array($func, ['preg_filter', 'preg_replace_callback', 'preg_replace'], strict: true))
 		) {
 			throw new RegexpException(preg_last_error_msg()
 				. ' (pattern: ' . implode(' or ', (array) $args[0]) . ')', $code);

src/Utils/Validators.php

@@ -159,7 +159,7 @@ public static function is(mixed $value, string $expected): bool
 					if (!static::$validators[$type]($value)) {
 						continue;
 					}
-				} catch (\TypeError $e) {
+				} catch (\TypeError) {
 					continue;
 				}
 			} elseif ($type === 'pattern') {