@@ -158,8 +158,7 @@ discard block |
||
| 158 | 158 | { |
| 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 | } |
@@ -2206,8 +2205,7 @@ discard block |
||
| 2206 | 2205 | ); |
| 2207 | 2206 | |
| 2208 | 2207 | throw $this->createException($message, $this->overrideCode ?: self::INVALID_EMAIL, $fieldName); |
| 2209 | - } |
|
| 2210 | - else |
|
| 2208 | + } else |
|
| 2211 | 2209 | { |
| 2212 | 2210 | $host = substr($this->value, strpos($this->value, '@') + 1); |
| 2213 | 2211 | // Likely not a FQDN, bug in PHP FILTER_VALIDATE_EMAIL prior to PHP 5.3.3 |
@@ -2341,8 +2339,7 @@ discard block |
||
| 2341 | 2339 | try |
| 2342 | 2340 | { |
| 2343 | 2341 | $this->regex('/^04[0-9]{8})$/', $message, $fieldName); |
| 2344 | - } |
|
| 2345 | - catch ( AssertionFailedException $e ) |
|
| 2342 | + } catch ( AssertionFailedException $e ) |
|
| 2346 | 2343 | { |
| 2347 | 2344 | $message = $message ?: $this->overrideError; |
| 2348 | 2345 | $message = sprintf( |
@@ -2374,8 +2371,7 @@ discard block |
||
| 2374 | 2371 | try |
| 2375 | 2372 | { |
| 2376 | 2373 | $this->regex('(^([a-zA-Z]{1}[a-zA-Z0-9]*)$)', $message, $fieldName); |
| 2377 | - } |
|
| 2378 | - catch (AssertionFailedException $e) |
|
| 2374 | + } catch (AssertionFailedException $e) |
|
| 2379 | 2375 | { |
| 2380 | 2376 | $message = $message ?: $this->overrideError; |
| 2381 | 2377 | $message = sprintf( |
@@ -2681,8 +2677,7 @@ discard block |
||
| 2681 | 2677 | try |
| 2682 | 2678 | { |
| 2683 | 2679 | $this->email($message, $fieldName); |
| 2684 | - } |
|
| 2685 | - catch (AssertionFailedException $e) |
|
| 2680 | + } catch (AssertionFailedException $e) |
|
| 2686 | 2681 | { |
| 2687 | 2682 | $message = $message ?: $this->overrideError; |
| 2688 | 2683 | $message = sprintf( |
@@ -534,7 +534,7 @@ discard block |
||
| 534 | 534 | /** |
| 535 | 535 | * Assert that value is not equal to a provided value (using == ). |
| 536 | 536 | * |
| 537 | - * @param mixed $value2 |
|
| 537 | + * @param string $value2 |
|
| 538 | 538 | * @param string $message |
| 539 | 539 | * @param string $fieldName |
| 540 | 540 | * @return Assert |
@@ -1408,7 +1408,7 @@ discard block |
||
| 1408 | 1408 | /** |
| 1409 | 1409 | * Alias of {@see choice()} |
| 1410 | 1410 | * |
| 1411 | - * @param array $choices |
|
| 1411 | + * @param integer[] $choices |
|
| 1412 | 1412 | * @param string $message |
| 1413 | 1413 | * @param string $fieldName |
| 1414 | 1414 | * @return Assert |
@@ -1585,7 +1585,7 @@ discard block |
||
| 1585 | 1585 | /** |
| 1586 | 1586 | * Assert that key exists in the values array. |
| 1587 | 1587 | * |
| 1588 | - * @param string|integer $key |
|
| 1588 | + * @param string $key |
|
| 1589 | 1589 | * @param string $message |
| 1590 | 1590 | * @param string $fieldName |
| 1591 | 1591 | * @return Assert |
@@ -2728,7 +2728,7 @@ discard block |
||
| 2728 | 2728 | } |
| 2729 | 2729 | |
| 2730 | 2730 | /** |
| 2731 | - * @param $func |
|
| 2731 | + * @param string $func |
|
| 2732 | 2732 | * @param $args |
| 2733 | 2733 | * @return bool |
| 2734 | 2734 | * @throws AssertionFailedException |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | * @param Closure $test |
| 43 | 43 | * @param string $suiteName |
| 44 | 44 | * @param string $successMessage |
| 45 | - * @param int|null $exceptionCode |
|
| 45 | + * @param integer $exceptionCode |
|
| 46 | 46 | * @param string $exceptionClass |
| 47 | 47 | * @return Suite |
| 48 | 48 | * @throws AssertionFailedException |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | * @param string $testName |
| 167 | 167 | * @param Closure $test |
| 168 | 168 | * @param string $successMessage |
| 169 | - * @param int|null $exceptionCode |
|
| 169 | + * @param integer $exceptionCode |
|
| 170 | 170 | * @param string $exceptionClass |
| 171 | 171 | * @return Suite |
| 172 | 172 | * @throws AssertionFailedException |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | * @param string $testName |
| 252 | 252 | * @param Closure $test |
| 253 | 253 | * @param string $successMessage |
| 254 | - * @param int|null $exceptionCode |
|
| 254 | + * @param integer $exceptionCode |
|
| 255 | 255 | * @param string $exceptionClass |
| 256 | 256 | * @throws AssertionFailedException |
| 257 | 257 | */ |
@@ -707,8 +707,8 @@ discard block |
||
| 707 | 707 | /** |
| 708 | 708 | * Log messages to resource |
| 709 | 709 | * |
| 710 | - * @param mixed $level The level of the log message |
|
| 711 | - * @param string|object $message If an object is passed it must implement __toString() |
|
| 710 | + * @param string $level The level of the log message |
|
| 711 | + * @param string $message If an object is passed it must implement __toString() |
|
| 712 | 712 | * @param array $context Placeholders to be substituted in the message |
| 713 | 713 | */ |
| 714 | 714 | public function log($level, $message, array $context=[]) |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | } |
| 785 | 785 | |
| 786 | 786 | /** |
| 787 | - * @return mixed|resource |
|
| 787 | + * @return resource |
|
| 788 | 788 | * @throws \Exception |
| 789 | 789 | */ |
| 790 | 790 | protected function getResource() |
@@ -132,8 +132,7 @@ discard block |
||
| 132 | 132 | $this->getLogger()->info("[{$testName}] - Starting..."); |
| 133 | 133 | $testCase->runTest($this); |
| 134 | 134 | $this->getLogger()->info("[{$testName}] - " . $testCase->getSuccessMessage()); |
| 135 | - } |
|
| 136 | - catch ( \Exception $e ) |
|
| 135 | + } catch ( \Exception $e ) |
|
| 137 | 136 | { |
| 138 | 137 | $expectedCode = $testCase->getExceptionCode(); |
| 139 | 138 | $expectedClass = $testCase->getExceptionType(); |
@@ -723,8 +722,7 @@ discard block |
||
| 723 | 722 | if ( is_callable($this->formatter) ) |
| 724 | 723 | { |
| 725 | 724 | $message = $this->formatter->__invoke(static::$logLevels[$level][4], $message, $context); |
| 726 | - } |
|
| 727 | - else |
|
| 725 | + } else |
|
| 728 | 726 | { |
| 729 | 727 | $message = $this->formatMessage($level, $message, $context); |
| 730 | 728 | } |
@@ -148,8 +148,7 @@ |
||
| 148 | 148 | { |
| 149 | 149 | $value = $argv[$i + 1]; |
| 150 | 150 | $i++; |
| 151 | - } |
|
| 152 | - else |
|
| 151 | + } else |
|
| 153 | 152 | { |
| 154 | 153 | $value = isset($out[$key]) ? $out[$key] : true; |
| 155 | 154 | } |