@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | /** |
| 547 | 547 | * Assert that value is not equal to a provided value (using == ). |
| 548 | 548 | * |
| 549 | - * @param mixed $value2 |
|
| 549 | + * @param string $value2 |
|
| 550 | 550 | * @param string $message |
| 551 | 551 | * @param string $fieldName |
| 552 | 552 | * @return Assert |
@@ -1448,7 +1448,7 @@ discard block |
||
| 1448 | 1448 | /** |
| 1449 | 1449 | * Alias of {@see choice()} |
| 1450 | 1450 | * |
| 1451 | - * @param array $choices |
|
| 1451 | + * @param integer[] $choices |
|
| 1452 | 1452 | * @param string $message |
| 1453 | 1453 | * @param string $fieldName |
| 1454 | 1454 | * @return Assert |
@@ -1625,7 +1625,7 @@ discard block |
||
| 1625 | 1625 | /** |
| 1626 | 1626 | * Assert that key exists in the values array. |
| 1627 | 1627 | * |
| 1628 | - * @param string|integer $key |
|
| 1628 | + * @param string $key |
|
| 1629 | 1629 | * @param string $message |
| 1630 | 1630 | * @param string $fieldName |
| 1631 | 1631 | * @return Assert |
@@ -2743,7 +2743,6 @@ discard block |
||
| 2743 | 2743 | * Uses code from {@link https://github.com/ramsey/uuid} that is MIT licensed. |
| 2744 | 2744 | * |
| 2745 | 2745 | * @param string|null $message |
| 2746 | - * @param string|null $propertyPath |
|
| 2747 | 2746 | * @return Assert |
| 2748 | 2747 | * @throws AssertionFailedException |
| 2749 | 2748 | */ |
@@ -2798,7 +2797,7 @@ discard block |
||
| 2798 | 2797 | } |
| 2799 | 2798 | |
| 2800 | 2799 | /** |
| 2801 | - * @param $func |
|
| 2800 | + * @param string $func |
|
| 2802 | 2801 | * @param $args |
| 2803 | 2802 | * @return bool |
| 2804 | 2803 | * @throws AssertionFailedException |
@@ -158,8 +158,7 @@ discard block |
||
| 158 | 158 | try |
| 159 | 159 | { |
| 160 | 160 | $validator->__invoke(); |
| 161 | - } |
|
| 162 | - catch ( AssertionFailedException $e ) |
|
| 161 | + } catch ( AssertionFailedException $e ) |
|
| 163 | 162 | { |
| 164 | 163 | $errors[$fieldName] = $e->getMessage(); |
| 165 | 164 | } |
@@ -2246,8 +2245,7 @@ discard block |
||
| 2246 | 2245 | ); |
| 2247 | 2246 | |
| 2248 | 2247 | throw $this->createException($message, $this->overrideCode ?: self::INVALID_EMAIL, $fieldName); |
| 2249 | - } |
|
| 2250 | - else |
|
| 2248 | + } else |
|
| 2251 | 2249 | { |
| 2252 | 2250 | $host = substr($this->value, strpos($this->value, '@') + 1); |
| 2253 | 2251 | // Likely not a FQDN, bug in PHP FILTER_VALIDATE_EMAIL prior to PHP 5.3.3 |
@@ -2381,8 +2379,7 @@ discard block |
||
| 2381 | 2379 | try |
| 2382 | 2380 | { |
| 2383 | 2381 | $this->regex('/^04[0-9]{8})$/', $message, $fieldName); |
| 2384 | - } |
|
| 2385 | - catch ( AssertionFailedException $e ) |
|
| 2382 | + } catch ( AssertionFailedException $e ) |
|
| 2386 | 2383 | { |
| 2387 | 2384 | $message = $message ?: $this->overrideError; |
| 2388 | 2385 | $message = sprintf( |
@@ -2414,8 +2411,7 @@ discard block |
||
| 2414 | 2411 | try |
| 2415 | 2412 | { |
| 2416 | 2413 | $this->regex('(^([a-zA-Z]{1}[a-zA-Z0-9]*)$)', $message, $fieldName); |
| 2417 | - } |
|
| 2418 | - catch (AssertionFailedException $e) |
|
| 2414 | + } catch (AssertionFailedException $e) |
|
| 2419 | 2415 | { |
| 2420 | 2416 | $message = $message ?: $this->overrideError; |
| 2421 | 2417 | $message = sprintf( |
@@ -2721,8 +2717,7 @@ discard block |
||
| 2721 | 2717 | try |
| 2722 | 2718 | { |
| 2723 | 2719 | $this->email($message, $fieldName); |
| 2724 | - } |
|
| 2725 | - catch (AssertionFailedException $e) |
|
| 2720 | + } catch (AssertionFailedException $e) |
|
| 2726 | 2721 | { |
| 2727 | 2722 | $message = $message ?: $this->overrideError; |
| 2728 | 2723 | $message = sprintf( |