@@ -20,7 +20,7 @@ |
||
20 | 20 | * |
21 | 21 | * @param string $testFile The name of the file being tested. |
22 | 22 | * |
23 | - * @return array |
|
23 | + * @return string[] |
|
24 | 24 | */ |
25 | 25 | public function getCliValues($testFile) |
26 | 26 | { |
@@ -19,9 +19,3 @@ |
||
19 | 19 | $arr = array( |
20 | 20 | 'a' => 'a' |
21 | 21 | <<<<<<< HEAD |
22 | - 'b' => 'b' |
|
23 | -======= |
|
24 | - 'c' => 'c' |
|
25 | ->>>>>>> master |
|
26 | - ); |
|
27 | - } |
@@ -78,6 +78,7 @@ |
||
78 | 78 | * @param string $content The content to tokenize, |
79 | 79 | * @param \PHP_CodeSniffer\Config | null $config The config data for the run. |
80 | 80 | * @param string $eolChar The EOL char used in the content. |
81 | + * @param null|\PHP_CodeSniffer\Config $config |
|
81 | 82 | * |
82 | 83 | * @return void |
83 | 84 | * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the file appears to be minified. |
@@ -93,7 +93,7 @@ |
||
93 | 93 | * |
94 | 94 | * @param \PHP_CodeSniffer\Files\File $phpcsFile Optional. The current file being processed. |
95 | 95 | * |
96 | - * @return bool True if annotations should be ignored, false otherwise. |
|
96 | + * @return boolean|null True if annotations should be ignored, false otherwise. |
|
97 | 97 | */ |
98 | 98 | public static function ignore_annotations( File $phpcsFile = null ) { |
99 | 99 | if ( isset( $phpcsFile, $phpcsFile->config->annotations ) ) { |
@@ -951,7 +951,7 @@ discard block |
||
951 | 951 | * @param bool $is_error Optional. Whether to report the message as an 'error' or 'warning'. |
952 | 952 | * Defaults to true (error). |
953 | 953 | * @param string $code Optional error code for the message. Defaults to 'Found'. |
954 | - * @param array $data Optional input for the data replacements. |
|
954 | + * @param string[] $data Optional input for the data replacements. |
|
955 | 955 | * @param int $severity Optional. Severity level. Defaults to 0 which will translate to |
956 | 956 | * the PHPCS default severity level. |
957 | 957 | * @return bool |
@@ -970,7 +970,7 @@ discard block |
||
970 | 970 | * @param bool $is_error Optional. Whether to report the message as an 'error' or 'warning'. |
971 | 971 | * Defaults to true (error). |
972 | 972 | * @param string $code Optional error code for the message. Defaults to 'Found'. |
973 | - * @param array $data Optional input for the data replacements. |
|
973 | + * @param string[] $data Optional input for the data replacements. |
|
974 | 974 | * @param int $severity Optional. Severity level. Defaults to 0 which will translate to |
975 | 975 | * the PHPCS default severity level. |
976 | 976 | * @return bool |
@@ -150,7 +150,7 @@ |
||
150 | 150 | * |
151 | 151 | * @since 0.14.0 |
152 | 152 | * |
153 | - * @return array |
|
153 | + * @return integer[] |
|
154 | 154 | */ |
155 | 155 | public function register() { |
156 | 156 | return array( |
@@ -98,7 +98,7 @@ |
||
98 | 98 | * |
99 | 99 | * @since 0.8.0 |
100 | 100 | * |
101 | - * @return array |
|
101 | + * @return integer[] |
|
102 | 102 | */ |
103 | 103 | public function register() { |
104 | 104 |
@@ -76,7 +76,7 @@ |
||
76 | 76 | * @param mixed $val Assigned value. |
77 | 77 | * @param int $line Token line. |
78 | 78 | * @param array $group Group definition. |
79 | - * @return mixed FALSE if no match, TRUE if matches, STRING if matches |
|
79 | + * @return boolean FALSE if no match, TRUE if matches, STRING if matches |
|
80 | 80 | * with custom error message passed to ->process(). |
81 | 81 | */ |
82 | 82 | public function callback( $key, $val, $line, $group ) { |
@@ -29,7 +29,7 @@ |
||
29 | 29 | /** |
30 | 30 | * Returns an array of tokens this test wants to listen for. |
31 | 31 | * |
32 | - * @return array |
|
32 | + * @return integer[] |
|
33 | 33 | */ |
34 | 34 | public function register() { |
35 | 35 | return array( |