Skip to content

Commit fddb9c6

Browse files
vjikStyleCIBot
vjik
and
StyleCIBot
authored
Remove RuleNameTrait (#333)
* Remove `RuleNameTrait` * Apply fixes from StyleCI Co-authored-by: StyleCI Bot <[email protected]>
1 parent fe43ea1 commit fddb9c6

55 files changed

Lines changed: 281 additions & 65 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/Rule/AtLeast.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use Attribute;
88
use Closure;
9-
use Yiisoft\Validator\Rule\Trait\RuleNameTrait;
109
use Yiisoft\Validator\Rule\Trait\SkipOnEmptyTrait;
1110
use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
1211
use Yiisoft\Validator\Rule\Trait\WhenTrait;
@@ -22,7 +21,6 @@
2221
#[Attribute(Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)]
2322
final class AtLeast implements SerializableRuleInterface, SkipOnErrorInterface, WhenInterface, SkipOnEmptyInterface
2423
{
25-
use RuleNameTrait;
2624
use SkipOnEmptyTrait;
2725
use SkipOnErrorTrait;
2826
use WhenTrait;
@@ -54,6 +52,11 @@ public function __construct(
5452
) {
5553
}
5654

55+
public function getName(): string
56+
{
57+
return 'atLeast';
58+
}
59+
5760
public function getAttributes(): array
5861
{
5962
return $this->attributes;

‎src/Rule/Boolean.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use Attribute;
88
use Closure;
9-
use Yiisoft\Validator\Rule\Trait\RuleNameTrait;
109
use Yiisoft\Validator\Rule\Trait\SkipOnEmptyTrait;
1110
use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
1211
use Yiisoft\Validator\Rule\Trait\WhenTrait;
@@ -22,7 +21,6 @@
2221
#[Attribute(Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)]
2322
final class Boolean implements SerializableRuleInterface, SkipOnEmptyInterface, SkipOnErrorInterface, WhenInterface
2423
{
25-
use RuleNameTrait;
2624
use SkipOnEmptyTrait;
2725
use SkipOnErrorTrait;
2826
use WhenTrait;
@@ -56,6 +54,11 @@ public function __construct(
5654
) {
5755
}
5856

57+
public function getName(): string
58+
{
59+
return 'boolean';
60+
}
61+
5962
public function getTrueValue(): mixed
6063
{
6164
return $this->trueValue;

‎src/Rule/Callback.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Yiisoft\Validator\AttributeEventInterface;
1212
use Yiisoft\Validator\DataSet\ObjectDataSet;
1313
use Yiisoft\Validator\DataSetInterface;
14-
use Yiisoft\Validator\Rule\Trait\RuleNameTrait;
1514
use Yiisoft\Validator\Rule\Trait\SkipOnEmptyTrait;
1615
use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
1716
use Yiisoft\Validator\Rule\Trait\WhenTrait;
@@ -29,7 +28,6 @@ final class Callback implements
2928
SkipOnEmptyInterface,
3029
AttributeEventInterface
3130
{
32-
use RuleNameTrait;
3331
use SkipOnEmptyTrait;
3432
use SkipOnErrorTrait;
3533
use WhenTrait;
@@ -60,6 +58,11 @@ public function __construct(
6058
}
6159
}
6260

61+
public function getName(): string
62+
{
63+
return 'callback';
64+
}
65+
6366
public function getCallback(): ?callable
6467
{
6568
return $this->callback;

‎src/Rule/Compare.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use Closure;
88
use InvalidArgumentException;
99
use RuntimeException;
10-
use Yiisoft\Validator\Rule\Trait\RuleNameTrait;
1110
use Yiisoft\Validator\Rule\Trait\SkipOnEmptyTrait;
1211
use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
1312
use Yiisoft\Validator\Rule\Trait\WhenTrait;
@@ -19,7 +18,6 @@
1918

2019
abstract class Compare implements SerializableRuleInterface, SkipOnEmptyInterface, SkipOnErrorInterface, WhenInterface
2120
{
22-
use RuleNameTrait;
2321
use SkipOnEmptyTrait;
2422
use SkipOnErrorTrait;
2523
use WhenTrait;

‎src/Rule/CompareTo.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,9 @@ public function getHandlerClassName(): string
2626
{
2727
return CompareHandler::class;
2828
}
29+
30+
public function getName(): string
31+
{
32+
return 'compareTo';
33+
}
2934
}

‎src/Rule/Composite.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use Attribute;
88
use Closure;
99
use JetBrains\PhpStorm\ArrayShape;
10-
use Yiisoft\Validator\Rule\Trait\RuleNameTrait;
1110
use Yiisoft\Validator\Rule\Trait\SkipOnEmptyTrait;
1211
use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
1312
use Yiisoft\Validator\Rule\Trait\WhenTrait;
@@ -24,7 +23,6 @@
2423
#[Attribute(Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)]
2524
class Composite implements SerializableRuleInterface, SkipOnErrorInterface, WhenInterface, SkipOnEmptyInterface
2625
{
27-
use RuleNameTrait;
2826
use SkipOnEmptyTrait;
2927
use SkipOnErrorTrait;
3028
use WhenTrait;
@@ -47,6 +45,11 @@ public function __construct(
4745
) {
4846
}
4947

48+
public function getName(): string
49+
{
50+
return 'composite';
51+
}
52+
5053
#[ArrayShape([
5154
'skipOnEmpty' => 'bool',
5255
'skipOnError' => 'bool',

‎src/Rule/Count.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use Closure;
99
use Countable;
1010
use Yiisoft\Validator\Rule\Trait\LimitTrait;
11-
use Yiisoft\Validator\Rule\Trait\RuleNameTrait;
1211
use Yiisoft\Validator\Rule\Trait\SkipOnEmptyTrait;
1312
use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
1413
use Yiisoft\Validator\Rule\Trait\WhenTrait;
@@ -26,7 +25,6 @@
2625
final class Count implements SerializableRuleInterface, SkipOnErrorInterface, WhenInterface, SkipOnEmptyInterface
2726
{
2827
use LimitTrait;
29-
use RuleNameTrait;
3028
use SkipOnEmptyTrait;
3129
use SkipOnErrorTrait;
3230
use WhenTrait;
@@ -94,6 +92,11 @@ public function __construct(
9492
);
9593
}
9694

95+
public function getName(): string
96+
{
97+
return 'count';
98+
}
99+
97100
public function getMessage(): string
98101
{
99102
return $this->message;

‎src/Rule/Each.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use Closure;
99
use JetBrains\PhpStorm\ArrayShape;
1010
use Yiisoft\Validator\PropagateOptionsInterface;
11-
use Yiisoft\Validator\Rule\Trait\RuleNameTrait;
1211
use Yiisoft\Validator\Rule\Trait\SkipOnEmptyTrait;
1312
use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
1413
use Yiisoft\Validator\Rule\Trait\WhenTrait;
@@ -30,7 +29,6 @@ final class Each implements
3029
SkipOnEmptyInterface,
3130
PropagateOptionsInterface
3231
{
33-
use RuleNameTrait;
3432
use SkipOnEmptyTrait;
3533
use SkipOnErrorTrait;
3634
use WhenTrait;
@@ -55,6 +53,11 @@ public function __construct(
5553
) {
5654
}
5755

56+
public function getName(): string
57+
{
58+
return 'each';
59+
}
60+
5861
public function propagateOptions(): void
5962
{
6063
$rules = [];

‎src/Rule/Email.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use Attribute;
88
use Closure;
99
use RuntimeException;
10-
use Yiisoft\Validator\Rule\Trait\RuleNameTrait;
1110
use Yiisoft\Validator\Rule\Trait\SkipOnEmptyTrait;
1211
use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
1312
use Yiisoft\Validator\Rule\Trait\WhenTrait;
@@ -25,7 +24,6 @@
2524
#[Attribute(Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)]
2625
final class Email implements SerializableRuleInterface, SkipOnErrorInterface, WhenInterface, SkipOnEmptyInterface
2726
{
28-
use RuleNameTrait;
2927
use SkipOnEmptyTrait;
3028
use SkipOnErrorTrait;
3129
use WhenTrait;
@@ -85,6 +83,11 @@ public function __construct(
8583
}
8684
}
8785

86+
public function getName(): string
87+
{
88+
return 'email';
89+
}
90+
8891
public function getPattern(): string
8992
{
9093
return $this->pattern;

‎src/Rule/Equal.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,9 @@ public function __construct(
7070
when: $this->when
7171
);
7272
}
73+
74+
public function getName(): string
75+
{
76+
return 'equal';
77+
}
7378
}

0 commit comments

Comments
 (0)