| @@ -96,7 +96,7 @@ | ||
| 96 | 96 | * @param string $input | 
| 97 | 97 | * @param string $format | 
| 98 | 98 | * | 
| 99 | - * @return DateTimeInterface|null | |
| 99 | + * @return DateTimeImmutable|null | |
| 100 | 100 | * | 
| 101 | 101 | * @SuppressWarnings(PHPMD.StaticAccess) | 
| 102 | 102 | */ | 
| @@ -30,7 +30,7 @@ | ||
| 30 | 30 | */ | 
| 31 | 31 | public function __construct(array $scalars) | 
| 32 | 32 |      { | 
| 33 | -        assert(call_user_func(function () use ($scalars) { | |
| 33 | +        assert(call_user_func(function() use ($scalars) { | |
| 34 | 34 |              foreach ($scalars as $scalar) { | 
| 35 | 35 | assert(static::isValidType($scalar) === true); | 
| 36 | 36 | } | 
| @@ -23,15 +23,15 @@ | ||
| 23 | 23 |  { | 
| 24 | 24 | /** | 
| 25 | 25 | * @param int $key | 
| 26 | - * @param mixed $default | |
| 26 | + * @param boolean $default | |
| 27 | 27 | * | 
| 28 | - * @return mixed | |
| 28 | + * @return ContextInterface | |
| 29 | 29 | */ | 
| 30 | 30 | public function getState(int $key, $default = null); | 
| 31 | 31 | |
| 32 | 32 | /** | 
| 33 | 33 | * @param int $key | 
| 34 | - * @param mixed $value | |
| 34 | + * @param boolean $value | |
| 35 | 35 | * | 
| 36 | 36 | * @return self | 
| 37 | 37 | */ | 
| @@ -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 | /** | 
| @@ -114,7 +114,7 @@ | ||
| 114 | 114 | } | 
| 115 | 115 | |
| 116 | 116 | /** | 
| 117 | - * @param iterable $errors | |
| 117 | + * @param ErrorInterface[] $errors | |
| 118 | 118 | * | 
| 119 | 119 | * @return void | 
| 120 | 120 | */ | 
| @@ -67,10 +67,10 @@ discard block | ||
| 67 | 67 | // 'address1' => 'Dow 1', // missed required parameter | 
| 68 | 68 | 'accepted' => 'false', | 
| 69 | 69 | ]; | 
| 70 | -        $this->console('Invalid data (errors)' . PHP_EOL); | |
| 70 | +        $this->console('Invalid data (errors)'.PHP_EOL); | |
| 71 | 71 | $validator->validate($invalidInput); | 
| 72 | 72 | $this->printErrors($validator->getErrors()); | 
| 73 | -        $this->console('Invalid data (captures)' . PHP_EOL); | |
| 73 | +        $this->console('Invalid data (captures)'.PHP_EOL); | |
| 74 | 74 | $this->printCaptures($validator->getCaptures()); | 
| 75 | 75 | |
| 76 | 76 | // Check with valid data | 
| @@ -83,10 +83,10 @@ discard block | ||
| 83 | 83 | 'address2' => null, | 
| 84 | 84 | 'accepted' => 'true', | 
| 85 | 85 | ]; | 
| 86 | - $this->console(PHP_EOL . 'Valid data (errors)' . PHP_EOL); | |
| 86 | + $this->console(PHP_EOL.'Valid data (errors)'.PHP_EOL); | |
| 87 | 87 | $validator->validate($validInput); | 
| 88 | 88 | $this->printErrors($validator->getErrors()); | 
| 89 | -        $this->console('Valid data (captures)' . PHP_EOL); | |
| 89 | +        $this->console('Valid data (captures)'.PHP_EOL); | |
| 90 | 90 | $this->printCaptures($validator->getCaptures()); | 
| 91 | 91 | |
| 92 | 92 | // The output would be | 
| @@ -134,11 +134,11 @@ discard block | ||
| 134 | 134 | $context = $error->getMessageParameters(); | 
| 135 | 135 |              $errorMsg   = MessageFormatter::formatMessage('en', $errorMsg, $context !== null ? $context : []); | 
| 136 | 136 | |
| 137 | -            $this->console("$entry failed for `$paramValue` with: $errorMsg" . PHP_EOL); | |
| 137 | +            $this->console("$entry failed for `$paramValue` with: $errorMsg".PHP_EOL); | |
| 138 | 138 | } | 
| 139 | 139 | |
| 140 | 140 |          if ($hasErrors === false) { | 
| 141 | -            $this->console('No errors' . PHP_EOL); | |
| 141 | +            $this->console('No errors'.PHP_EOL); | |
| 142 | 142 | } | 
| 143 | 143 | } | 
| 144 | 144 | |
| @@ -155,11 +155,11 @@ discard block | ||
| 155 | 155 | $hasCaptures = true; | 
| 156 | 156 | $type = gettype($value); | 
| 157 | 157 | $value = $value instanceof DateTimeInterface ? $value->format(DateTime::ISO8601) : $value; | 
| 158 | -            $this->console("`$name` = `$value` ($type)" . PHP_EOL); | |
| 158 | +            $this->console("`$name` = `$value` ($type)".PHP_EOL); | |
| 159 | 159 | } | 
| 160 | 160 | |
| 161 | 161 |          if ($hasCaptures === false) { | 
| 162 | -            $this->console('No captures' . PHP_EOL); | |
| 162 | +            $this->console('No captures'.PHP_EOL); | |
| 163 | 163 | } | 
| 164 | 164 | } | 
| 165 | 165 | |
| @@ -39,7 +39,7 @@ | ||
| 39 | 39 | */ | 
| 40 | 40 | public static function amount(int $max): RuleInterface | 
| 41 | 41 |      { | 
| 42 | - assert ($max > 0); | |
| 42 | + assert($max > 0); | |
| 43 | 43 | |
| 44 | 44 | return static::stringToInt(static::between(1, $max)); | 
| 45 | 45 | } | 
| @@ -94,8 +94,7 @@ | ||
| 94 | 94 |      { | 
| 95 | 95 | $isOk = $context->getStates()->getState(static::STATE_HAS_BEEN_CALLED, false); | 
| 96 | 96 | |
| 97 | - return $isOk === true ? BlockReplies::createEndSuccessReply() : | |
| 98 | - BlockReplies::createEndErrorReply($context, ErrorCodes::REQUIRED, Messages::REQUIRED, []); | |
| 97 | + return $isOk === true ? BlockReplies::createEndSuccessReply() : BlockReplies::createEndErrorReply($context, ErrorCodes::REQUIRED, Messages::REQUIRED, []); | |
| 99 | 98 | } | 
| 100 | 99 | |
| 101 | 100 | /** | 
| @@ -90,7 +90,6 @@ | ||
| 90 | 90 | $output = filter_var($value, $filterId, $filterOptions); | 
| 91 | 91 | |
| 92 | 92 | return $output !== false ? | 
| 93 | - static::createSuccessReply($output) : | |
| 94 | - static::createErrorReply($context, $value, $errorCode, $messageTemplate, [$filterId, $filterOptions]); | |
| 93 | + static::createSuccessReply($output) : static::createErrorReply($context, $value, $errorCode, $messageTemplate, [$filterId, $filterOptions]); | |
| 95 | 94 | } | 
| 96 | 95 | } | 
| @@ -61,7 +61,6 @@ | ||
| 61 | 61 | $isOk = in_array($value, $values); | 
| 62 | 62 | |
| 63 | 63 | return $isOk === true ? | 
| 64 | - static::createSuccessReply($value) : | |
| 65 | - static::createErrorReply($context, $value, ErrorCodes::INVALID_VALUE, Messages::INVALID_VALUE, []); | |
| 64 | + static::createSuccessReply($value) : static::createErrorReply($context, $value, ErrorCodes::INVALID_VALUE, Messages::INVALID_VALUE, []); | |
| 66 | 65 | } | 
| 67 | 66 | } |