cs

Author: dg

src/Schema/Elements/Base.php

@@ -68,7 +68,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

@@ -11,7 +11,7 @@
 use Nette\Schema\Context;
 use Nette\Schema\Helpers;
 use Nette\Schema\Schema;
-use function array_diff_key, array_fill_keys, array_key_exists, array_keys, array_map, array_merge, array_pop, array_values, is_array, is_object;
+use function array_diff_key, array_fill_keys, array_key_exists, array_keys, array_map, array_merge, array_pop, array_values, is_array, is_object, strval;
 
 
 final class Structure implements Schema
@@ -173,7 +173,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

@@ -74,7 +74,7 @@ public static function getPropertyType(\ReflectionProperty|\ReflectionParameter
 	 * Returns an annotation value.
 	 * @param  \ReflectionClass<object>|\ReflectionProperty  $ref
 	 */
-	public static function parseAnnotation(\Reflector $ref, string $name): ?string
+	public static function parseAnnotation(\ReflectionClass|\ReflectionProperty $ref, string $name): ?string
 	{
 		if (!Reflection::areCommentsAvailable()) {
 			throw new Nette\InvalidStateException('You have to enable phpDoc comments in opcode cache.');
@@ -125,7 +125,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

@@ -8,7 +8,7 @@
 namespace Nette\Schema;
 
 use Nette;
-use function implode, preg_last_error_msg, preg_replace_callback;
+use function implode, preg_replace_callback;
 
 
 final class Message
@@ -61,22 +61,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

@@ -15,17 +15,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());
 	}
 
 

tests/Schema/Expect.array.phpt

@@ -308,13 +308,6 @@ test('arrayOf() & keys II.', function () {
 });
 
 
-testException(
-	'arrayOf() error',
-	fn() => Expect::arrayOf(['a' => Expect::string()]),
-	TypeError::class,
-);
-
-
 test('type[]', function () {
 	$schema = Expect::type('int[]');
 

tests/Schema/Expect.castTo.phpt

@@ -20,8 +20,8 @@ test('built-in', function () {
 test('simple object', function () {
 	class Foo1
 	{
-		public $a;
-		public $b;
+		public mixed $a;
+		public mixed $b;
 	}
 
 	$foo = new Foo1;
@@ -39,8 +39,8 @@ test('simple object', function () {
 test('object with constructor', function () {
 	class Foo2
 	{
-		private $a;
-		private $b;
+		private int $a;
+		private int $b;
 
 
 		public function __construct(int $a, int $b)

tests/Schema/Expect.dynamic.phpt

@@ -10,13 +10,9 @@ require __DIR__ . '/../bootstrap.php';
 
 class DynamicParameter implements Nette\Schema\DynamicParameter
 {
-	/** @var string */
-	private $value;
-
-
-	public function __construct(string $value)
-	{
-		$this->value = $value;
+	public function __construct(
+		private string $value,
+	) {
 	}
 }
 

tests/Schema/Expect.list.phpt

@@ -95,10 +95,3 @@ test('listOf() & scalar', function () {
 		(new Processor)->process($schema, ['key' => 'val']);
 	}, ['The item expects to be list, array given.']);
 });
-
-
-testException(
-	'listOf() & error',
-	fn() => Expect::listOf(['a' => Expect::string()]),
-	TypeError::class,
-);