@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | * @param int $code |
50 | 50 | * @param array|null $context |
51 | 51 | */ |
52 | - public function __construct(?string $name, $value, int $code, ?array $context) |
|
52 | + public function __construct(?string $name, $value, int $code, ? array $context) |
|
53 | 53 | { |
54 | 54 | $this->name = $name; |
55 | 55 | $this->value = $value; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | /** |
85 | 85 | * @inheritdoc |
86 | 86 | */ |
87 | - public function getMessageContext(): ?array |
|
87 | + public function getMessageContext(): ? array |
|
88 | 88 | { |
89 | 89 | return $this->context; |
90 | 90 | } |
@@ -76,8 +76,7 @@ |
||
76 | 76 | $isOk = in_array($value, $values); |
77 | 77 | |
78 | 78 | return $isOk === true ? |
79 | - BlockReplies::createSuccessReply($value) : |
|
80 | - BlockReplies::createErrorReply($context, $value, ErrorCodes::INVALID_VALUE); |
|
79 | + BlockReplies::createSuccessReply($value) : BlockReplies::createErrorReply($context, $value, ErrorCodes::INVALID_VALUE); |
|
81 | 80 | } |
82 | 81 | |
83 | 82 | /** |
@@ -39,5 +39,5 @@ |
||
39 | 39 | /** |
40 | 40 | * @return array|null |
41 | 41 | */ |
42 | - public function getMessageContext(): ?array; |
|
42 | + public function getMessageContext(): ? array; |
|
43 | 43 | } |
@@ -105,8 +105,7 @@ |
||
105 | 105 | $output = filter_var($value, $filterId, $filterOptions); |
106 | 106 | |
107 | 107 | return $output !== false ? |
108 | - BlockReplies::createSuccessReply($output) : |
|
109 | - BlockReplies::createErrorReply($context, $value, $errorCode, [$filterId, $filterOptions]); |
|
108 | + BlockReplies::createSuccessReply($output) : BlockReplies::createErrorReply($context, $value, $errorCode, [$filterId, $filterOptions]); |
|
110 | 109 | } |
111 | 110 | |
112 | 111 | /** |
@@ -105,8 +105,7 @@ discard block |
||
105 | 105 | protected static function lessThan($value, RuleInterface $next = null): RuleInterface |
106 | 106 | { |
107 | 107 | return $next === null ? |
108 | - $value instanceof DateTimeInterface ? new DateTimeLessThan($value) : new NumericLessThan($value) : |
|
109 | - new AndOperator(static::lessThan($value), $next); |
|
108 | + $value instanceof DateTimeInterface ? new DateTimeLessThan($value) : new NumericLessThan($value) : new AndOperator(static::lessThan($value), $next); |
|
110 | 109 | } |
111 | 110 | |
112 | 111 | /** |
@@ -118,8 +117,7 @@ discard block |
||
118 | 117 | protected static function lessOrEquals($value, RuleInterface $next = null): RuleInterface |
119 | 118 | { |
120 | 119 | return $next === null ? |
121 | - $value instanceof DateTimeInterface ? new DateTimeLessOrEquals($value) : new NumericLessOrEquals($value) : |
|
122 | - new AndOperator(static::lessOrEquals($value), $next); |
|
120 | + $value instanceof DateTimeInterface ? new DateTimeLessOrEquals($value) : new NumericLessOrEquals($value) : new AndOperator(static::lessOrEquals($value), $next); |
|
123 | 121 | } |
124 | 122 | |
125 | 123 | /** |
@@ -131,8 +129,7 @@ discard block |
||
131 | 129 | protected static function moreThan($value, RuleInterface $next = null): RuleInterface |
132 | 130 | { |
133 | 131 | return $next === null ? |
134 | - $value instanceof DateTimeInterface ? new DateTimeMoreThan($value) : new NumericMoreThan($value) : |
|
135 | - new AndOperator(static::moreThan($value), $next); |
|
132 | + $value instanceof DateTimeInterface ? new DateTimeMoreThan($value) : new NumericMoreThan($value) : new AndOperator(static::moreThan($value), $next); |
|
136 | 133 | } |
137 | 134 | |
138 | 135 | /** |
@@ -145,8 +142,7 @@ discard block |
||
145 | 142 | { |
146 | 143 | return $next === null ? |
147 | 144 | ($value instanceof DateTimeInterface ? |
148 | - new DateTimeMoreOrEquals($value) : new NumericMoreOrEqualsThan($value)) : |
|
149 | - new AndOperator(static::moreOrEquals($value), $next); |
|
145 | + new DateTimeMoreOrEquals($value) : new NumericMoreOrEqualsThan($value)) : new AndOperator(static::moreOrEquals($value), $next); |
|
150 | 146 | } |
151 | 147 | |
152 | 148 | /** |
@@ -162,8 +158,7 @@ discard block |
||
162 | 158 | |
163 | 159 | return $next === null ? |
164 | 160 | ($areLimitsDates ? |
165 | - new DateTimeBetween($lowerLimit, $upperLimit) : new NumericBetween($lowerLimit, $upperLimit)) : |
|
166 | - new AndOperator(static::between($lowerLimit, $upperLimit), $next); |
|
161 | + new DateTimeBetween($lowerLimit, $upperLimit) : new NumericBetween($lowerLimit, $upperLimit)) : new AndOperator(static::between($lowerLimit, $upperLimit), $next); |
|
167 | 162 | } |
168 | 163 | |
169 | 164 | /** |
@@ -176,8 +171,7 @@ discard block |
||
176 | 171 | protected static function stringLengthBetween(int $min, int $max, RuleInterface $next = null): RuleInterface |
177 | 172 | { |
178 | 173 | return $next === null ? |
179 | - new StringLengthBetween($min, $max) : |
|
180 | - new AndOperator(static::stringLengthBetween($min, $max), $next); |
|
174 | + new StringLengthBetween($min, $max) : new AndOperator(static::stringLengthBetween($min, $max), $next); |
|
181 | 175 | } |
182 | 176 | |
183 | 177 | /** |
@@ -189,8 +183,7 @@ discard block |
||
189 | 183 | protected static function stringLengthMin(int $min, RuleInterface $next = null): RuleInterface |
190 | 184 | { |
191 | 185 | return $next === null ? |
192 | - new StringLengthMin($min) : |
|
193 | - new AndOperator(static::stringLengthMin($min), $next); |
|
186 | + new StringLengthMin($min) : new AndOperator(static::stringLengthMin($min), $next); |
|
194 | 187 | } |
195 | 188 | |
196 | 189 | /** |
@@ -202,8 +195,7 @@ discard block |
||
202 | 195 | protected static function stringLengthMax(int $max, RuleInterface $next = null): RuleInterface |
203 | 196 | { |
204 | 197 | return $next === null ? |
205 | - new StringLengthMax($max) : |
|
206 | - new AndOperator(static::stringLengthMax($max), $next); |
|
198 | + new StringLengthMax($max) : new AndOperator(static::stringLengthMax($max), $next); |
|
207 | 199 | } |
208 | 200 | |
209 | 201 | /** |
@@ -215,8 +207,7 @@ discard block |
||
215 | 207 | protected static function regexp(string $pattern, RuleInterface $next = null): RuleInterface |
216 | 208 | { |
217 | 209 | return $next === null ? |
218 | - new StringRegExp($pattern) : |
|
219 | - new AndOperator(static::regexp($pattern), $next); |
|
210 | + new StringRegExp($pattern) : new AndOperator(static::regexp($pattern), $next); |
|
220 | 211 | } |
221 | 212 | |
222 | 213 | /** |