@@ -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 | /** |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | */ |
59 | 59 | private function showSingleValueValidation(): void |
60 | 60 | { |
61 | - $this->console('Basic usage sample.' . PHP_EOL); |
|
62 | - $this->console('===================' . PHP_EOL); |
|
61 | + $this->console('Basic usage sample.'.PHP_EOL); |
|
62 | + $this->console('==================='.PHP_EOL); |
|
63 | 63 | |
64 | 64 | // Let's build a rule that validates an input to be either `null` or a string from 5 to 10 characters. |
65 | 65 | $validator = v::validator( |
@@ -69,21 +69,21 @@ discard block |
||
69 | 69 | // let's try validation with valid input |
70 | 70 | $input = null; |
71 | 71 | if ($validator->validate($input) === true) { |
72 | - $this->console("Validation OK for `null`." . PHP_EOL); |
|
72 | + $this->console("Validation OK for `null`.".PHP_EOL); |
|
73 | 73 | } else { |
74 | 74 | assert(false, 'We should not be here.'); |
75 | 75 | } |
76 | 76 | // another one |
77 | 77 | $input = 'Hello'; |
78 | 78 | if ($validator->validate($input) === true) { |
79 | - $this->console("Validation OK for `$input`." . PHP_EOL); |
|
79 | + $this->console("Validation OK for `$input`.".PHP_EOL); |
|
80 | 80 | } else { |
81 | 81 | assert(false, 'We should not be here.'); |
82 | 82 | } |
83 | 83 | // this one should not pass the validation |
84 | 84 | $input = 'This string is too long.'; |
85 | 85 | if ($validator->validate($input) === false) { |
86 | - $this->console("Input `$input` has not passed validation." . PHP_EOL); |
|
86 | + $this->console("Input `$input` has not passed validation.".PHP_EOL); |
|
87 | 87 | $this->printErrors($validator->getErrors()); |
88 | 88 | } else { |
89 | 89 | assert(false, 'We should not be here.'); |
@@ -99,9 +99,9 @@ discard block |
||
99 | 99 | r::isString(r::stringToDateTime(DATE_ATOM, r::between($fromDate, $toDate))) |
100 | 100 | ->setName('my_date')->enableCapture() |
101 | 101 | ); |
102 | - $input = '2001-03-04T05:06:07+08:00'; |
|
102 | + $input = '2001-03-04T05:06:07+08:00'; |
|
103 | 103 | if ($validator->validate($input) === true) { |
104 | - $this->console("Validation OK for `$input`." . PHP_EOL); |
|
104 | + $this->console("Validation OK for `$input`.".PHP_EOL); |
|
105 | 105 | $myDate = $validator->getCaptures()['my_date']; |
106 | 106 | // note that captured date is already DateTime |
107 | 107 | assert($myDate instanceof DateTimeInterface); |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | assert(false, 'We should not be here.'); |
110 | 110 | } |
111 | 111 | |
112 | - $this->console(PHP_EOL . PHP_EOL . PHP_EOL); |
|
112 | + $this->console(PHP_EOL.PHP_EOL.PHP_EOL); |
|
113 | 113 | |
114 | 114 | // The output would be |
115 | 115 | // ------------------------------------------------------------------------------------------------------- |
@@ -128,8 +128,8 @@ discard block |
||
128 | 128 | */ |
129 | 129 | private function showArrayValuesValidation(): void |
130 | 130 | { |
131 | - $this->console('Advanced usage sample.' . PHP_EOL); |
|
132 | - $this->console('===================' . PHP_EOL); |
|
131 | + $this->console('Advanced usage sample.'.PHP_EOL); |
|
132 | + $this->console('==================='.PHP_EOL); |
|
133 | 133 | |
134 | 134 | // Validation rules for input are |
135 | 135 | // - `email` must be a string and a valid email value (as FILTER_VALIDATE_EMAIL describes) |
@@ -150,10 +150,10 @@ discard block |
||
150 | 150 | 'last_name' => '', |
151 | 151 | 'payment_plan' => '123', |
152 | 152 | ]; |
153 | - $this->console('Invalid data (errors)' . PHP_EOL); |
|
153 | + $this->console('Invalid data (errors)'.PHP_EOL); |
|
154 | 154 | $validator->validate($invalidInput); |
155 | 155 | $this->printErrors($validator->getErrors()); |
156 | - $this->console('Invalid data (captures)' . PHP_EOL); |
|
156 | + $this->console('Invalid data (captures)'.PHP_EOL); |
|
157 | 157 | $this->printCaptures($validator->getCaptures()); |
158 | 158 | |
159 | 159 | // Check with valid data |
@@ -163,10 +163,10 @@ discard block |
||
163 | 163 | 'last_name' => null, |
164 | 164 | 'payment_plan' => '2', |
165 | 165 | ]; |
166 | - $this->console(PHP_EOL . 'Valid data (errors)' . PHP_EOL); |
|
166 | + $this->console(PHP_EOL.'Valid data (errors)'.PHP_EOL); |
|
167 | 167 | $validator->validate($validInput); |
168 | 168 | $this->printErrors($validator->getErrors()); |
169 | - $this->console('Valid data (captures)' . PHP_EOL); |
|
169 | + $this->console('Valid data (captures)'.PHP_EOL); |
|
170 | 170 | $this->printCaptures($validator->getCaptures()); |
171 | 171 | |
172 | 172 | // The output would be |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | } |
207 | 207 | |
208 | 208 | if ($hasErrors === false) { |
209 | - $this->console('No errors' . PHP_EOL); |
|
209 | + $this->console('No errors'.PHP_EOL); |
|
210 | 210 | } |
211 | 211 | } |
212 | 212 | |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | $context = $error->getMessageContext(); |
225 | 225 | $errorMsg = MessageFormatter::formatMessage('en', $errorMsg, $context !== null ? $context : []); |
226 | 226 | |
227 | - $this->console("$entry failed for `$paramValue` with: $errorMsg" . PHP_EOL); |
|
227 | + $this->console("$entry failed for `$paramValue` with: $errorMsg".PHP_EOL); |
|
228 | 228 | } |
229 | 229 | |
230 | 230 | /** |
@@ -239,11 +239,11 @@ discard block |
||
239 | 239 | foreach ($captures as $name => $value) { |
240 | 240 | $hasCaptures = true; |
241 | 241 | $type = gettype($value); |
242 | - $this->console("`$name` = `$value` ($type)" . PHP_EOL); |
|
242 | + $this->console("`$name` = `$value` ($type)".PHP_EOL); |
|
243 | 243 | } |
244 | 244 | |
245 | 245 | if ($hasCaptures === false) { |
246 | - $this->console('No captures' . PHP_EOL); |
|
246 | + $this->console('No captures'.PHP_EOL); |
|
247 | 247 | } |
248 | 248 | } |
249 | 249 |