cs

Author: dg

src/Schema/Elements/Base.php

@@ -70,7 +70,7 @@ public function transform(callable $handler): self
 	/** @param  callable(mixed): bool  $handler */
 	public function assert(callable $handler, ?string $description = null): self
 	{
-		$expected = $description ?: (is_string($handler) ? "$handler()" : '#' . count($this->transforms));
+		$expected = $description ?? (is_string($handler) ? "$handler()" : '#' . count($this->transforms));
 		return $this->transform(function ($value, Context $context) use ($handler, $description, $expected) {
 			if ($handler($value)) {
 				return $value;

src/Schema/Elements/Structure.php

@@ -175,7 +175,7 @@ private function validateItems(array &$value, Context $context): void
 			if ($this->otherItems) {
 				$items += array_fill_keys($extraKeys, $this->otherItems);
 			} else {
-				$keys = array_map('strval', array_keys($items));
+				$keys = array_map(strval(...), array_keys($items));
 				foreach ($extraKeys as $key) {
 					$hint = Nette\Utils\Helpers::getSuggestion($keys, (string) $key);
 					$context->addError(

src/Schema/Helpers.php

@@ -127,7 +127,7 @@ public static function validateRange(mixed $value, array $range, Context $contex
 		if (is_array($value) || is_string($value)) {
 			[$length, $label] = is_array($value)
 				? [count($value), 'items']
-				: (in_array('unicode', explode('|', $types), true)
+				: (in_array('unicode', explode('|', $types), strict: true)
 					? [Nette\Utils\Strings::length($value), 'characters']
 					: [strlen($value), 'bytes']);
 

src/Schema/Message.php

@@ -63,22 +63,15 @@ final class Message
 	/** @deprecated use Message::Deprecated */
 	public const DEPRECATED = self::Deprecated;
 
-	public string $message;
-	public string $code;
 
-	/** @var string[] */
-	public array $path;
-
-	/** @var string[] */
-	public array $variables;
-
-
-	public function __construct(string $message, string $code, array $path, array $variables = [])
-	{
-		$this->message = $message;
-		$this->code = $code;
-		$this->path = $path;
-		$this->variables = $variables;
+	public function __construct(
+		public string $message,
+		public string $code,
+		/** @var list<int|string> */
+		public array $path,
+		/** @var array<string, mixed> */
+		public array $variables = [],
+	) {
 	}
 
 

src/Schema/ValidationException.php

@@ -17,17 +17,12 @@
  */
 class ValidationException extends Nette\InvalidStateException
 {
-	/** @var Message[] */
-	private array $messages;
-
-
-	/**
-	 * @param  Message[]  $messages
-	 */
-	public function __construct(?string $message, array $messages = [])
-	{
-		parent::__construct($message ?: $messages[0]->toString());
-		$this->messages = $messages;
+	public function __construct(
+		?string $message,
+		/** @var list<Message> */
+		private array $messages = [],
+	) {
+		parent::__construct($message ?? $messages[0]->toString());
 	}