Allow use AtLeast as class attribute (#443)

vjik · web-flow · commit 9e37da9e08e2 · 2022-12-09T14:29:31.000+03:00
diff --git a/src/Rule/AtLeast.php b/src/Rule/AtLeast.php
@@ -19,7 +19,7 @@
  *
  * @psalm-import-type WhenType from WhenInterface
  */
-#[Attribute(Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)]
+#[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)]
 final class AtLeast implements RuleWithOptionsInterface, SkipOnErrorInterface, WhenInterface, SkipOnEmptyInterface
 {
     use SkipOnEmptyTrait;
diff --git a/tests/Rule/AtLeastTest.php b/tests/Rule/AtLeastTest.php
@@ -12,6 +12,7 @@
 use Yiisoft\Validator\Tests\Rule\Base\RuleWithOptionsTestTrait;
 use Yiisoft\Validator\Tests\Rule\Base\SkipOnErrorTestTrait;
 use Yiisoft\Validator\Tests\Rule\Base\WhenTestTrait;
+use Yiisoft\Validator\Tests\Support\Data\AtLeastDto;
 
 final class AtLeastTest extends RuleTestCase
 {
@@ -153,6 +154,9 @@ public function __construct()
                 ['obj' => ['attr1' => null, 'attr2' => 1]],
                 ['obj' => new AtLeast(['attr2'])],
             ],
+            'class attribute' => [
+                new AtLeastDto(1),
+            ],
         ];
     }
 
@@ -225,6 +229,11 @@ public function dataValidationFailed(): array
                 ['data' => new AtLeast(['attr1', 'attr2'], min: 2, message: 'Attribute - {attribute}, min - {min}.')],
                 ['data' => ['Attribute - data, min - 2.']],
             ],
+            'class attribute' => [
+                new AtLeastDto(),
+                null,
+                ['' => ['The data must have at least "1" filled attributes.']],
+            ],
         ];
     }
 
diff --git a/tests/Support/Data/AtLeastDto.php b/tests/Support/Data/AtLeastDto.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Validator\Tests\Support\Data;
+
+use Yiisoft\Validator\Rule\AtLeast;
+
+#[AtLeast(['a', 'b', 'c'])]
+final class AtLeastDto
+{
+    public function __construct(
+        public ?int $a = null,
+        public ?int $b = null,
+        public ?int $c = null,
+    ) {
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*`
`20`	`20`	`* @psalm-import-type WhenType from WhenInterface`
`21`	`21`	`*/`
`22`		`-#[Attribute(Attribute::TARGET_PROPERTY \| Attribute::IS_REPEATABLE)]`
	`22`	`+#[Attribute(Attribute::TARGET_CLASS \| Attribute::TARGET_PROPERTY \| Attribute::IS_REPEATABLE)]`
`23`	`23`	`final class AtLeast implements RuleWithOptionsInterface, SkipOnErrorInterface, WhenInterface, SkipOnEmptyInterface`
`24`	`24`	`{`
`25`	`25`	`use SkipOnEmptyTrait;`