@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | |
226 | 226 | /** |
227 | 227 | * Sets up an observer for the test end. |
228 | - * @param object $observer Must have atTestEnd() |
|
228 | + * @param SimpleMock $observer Must have atTestEnd() |
|
229 | 229 | * method. |
230 | 230 | * @access public |
231 | 231 | */ |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | * Sends a formatted dump of a variable to the |
340 | 340 | * test suite for those emergency debugging |
341 | 341 | * situations. |
342 | - * @param mixed $variable Variable to display. |
|
342 | + * @param string|boolean $variable Variable to display. |
|
343 | 343 | * @param string $message Message to display. |
344 | 344 | * @return mixed The original variable. |
345 | 345 | * @access public |
@@ -552,6 +552,7 @@ discard block |
||
552 | 552 | |
553 | 553 | /** |
554 | 554 | * @deprecated |
555 | + * @param string $test_file |
|
555 | 556 | */ |
556 | 557 | function addTestFile($test_file) { |
557 | 558 | $this->addFile($test_file); |
@@ -162,9 +162,9 @@ discard block |
||
162 | 162 | /** |
163 | 163 | * Will trigger a pass if the if the first parameter |
164 | 164 | * is near enough to the second by the margin. |
165 | - * @param mixed $first Value to compare. |
|
166 | - * @param mixed $second Value to compare. |
|
167 | - * @param mixed $margin Fuzziness of match. |
|
165 | + * @param integer $first Value to compare. |
|
166 | + * @param double $second Value to compare. |
|
167 | + * @param double $margin Fuzziness of match. |
|
168 | 168 | * @param string $message Message to display. |
169 | 169 | * @return boolean True on pass |
170 | 170 | * @access public |
@@ -179,9 +179,9 @@ discard block |
||
179 | 179 | /** |
180 | 180 | * Will trigger a pass if the two parameters differ |
181 | 181 | * by more than the margin. |
182 | - * @param mixed $first Value to compare. |
|
183 | - * @param mixed $second Value to compare. |
|
184 | - * @param mixed $margin Fuzziness of match. |
|
182 | + * @param integer $first Value to compare. |
|
183 | + * @param double $second Value to compare. |
|
184 | + * @param double $margin Fuzziness of match. |
|
185 | 185 | * @param string $message Message to display. |
186 | 186 | * @return boolean True on pass |
187 | 187 | * @access public |
@@ -304,6 +304,8 @@ discard block |
||
304 | 304 | |
305 | 305 | /** |
306 | 306 | * @deprecated |
307 | + * @param string $pattern |
|
308 | + * @param string $subject |
|
307 | 309 | */ |
308 | 310 | function assertWantedPattern($pattern, $subject, $message = '%s') { |
309 | 311 | return $this->assertPattern($pattern, $subject, $message); |
@@ -328,6 +330,7 @@ discard block |
||
328 | 330 | |
329 | 331 | /** |
330 | 332 | * @deprecated |
333 | + * @param string $pattern |
|
331 | 334 | */ |
332 | 335 | function assertNoUnwantedPattern($pattern, $subject, $message = '%s') { |
333 | 336 | return $this->assertNoPattern($pattern, $subject, $message); |
@@ -395,7 +398,7 @@ discard block |
||
395 | 398 | * Creates an equality expectation if the |
396 | 399 | * object/value is not already some type |
397 | 400 | * of expectation. |
398 | - * @param mixed $expected Expected value. |
|
401 | + * @param boolean $expected Expected value. |
|
399 | 402 | * @return SimpleExpectation Expectation object. |
400 | 403 | * @access private |
401 | 404 | */ |
@@ -412,6 +415,7 @@ discard block |
||
412 | 415 | |
413 | 416 | /** |
414 | 417 | * @deprecated |
418 | + * @param string $pattern |
|
415 | 419 | */ |
416 | 420 | function assertErrorPattern($pattern, $message = '%s') { |
417 | 421 | return $this->assertError(new PatternExpectation($pattern), $message); |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | /** |
179 | 179 | * Breaks the request down into an object. |
180 | 180 | * @param string $raw Raw request. |
181 | - * @return SimpleFormEncoding Parsed data. |
|
181 | + * @return SimpleGetEncoding Parsed data. |
|
182 | 182 | * @access private |
183 | 183 | */ |
184 | 184 | function _parseRequest($raw) { |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | /** |
267 | 267 | * Accessor for page if any. This may be a |
268 | 268 | * directory name if ambiguious. |
269 | - * @return Page name. |
|
269 | + * @return false|string name. |
|
270 | 270 | * @access public |
271 | 271 | */ |
272 | 272 | function getPage() { |
@@ -466,6 +466,7 @@ discard block |
||
466 | 466 | * @param string/SimpleUrl $base Base URL. |
467 | 467 | * @param string Absolute path. |
468 | 468 | * @access private |
469 | + * @return string |
|
469 | 470 | */ |
470 | 471 | function _extractAbsolutePath($base) { |
471 | 472 | if ($this->getHost()) { |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | * Fetches the page until no longer redirected or |
233 | 233 | * until the redirect limit runs out. |
234 | 234 | * @param SimpleUrl $url Target to fetch. |
235 | - * @param SimpelFormEncoding $encoding Additional parameters for request. |
|
235 | + * @param SimpleEncoding $encoding Additional parameters for request. |
|
236 | 236 | * @return SimpleHttpResponse Hopefully the target page. |
237 | 237 | * @access private |
238 | 238 | */ |
@@ -290,9 +290,6 @@ discard block |
||
290 | 290 | /** |
291 | 291 | * Builds the appropriate HTTP request object. |
292 | 292 | * @param SimpleUrl $url Target to fetch as url object. |
293 | - * @param SimpleFormEncoding $parameters POST/GET parameters. |
|
294 | - * @return SimpleHttpRequest New request object. |
|
295 | - * @access protected |
|
296 | 293 | */ |
297 | 294 | function &_createHttpRequest($url, $encoding) { |
298 | 295 | $request = &new SimpleHttpRequest($this->_createRoute($url), $encoding); |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | /** |
175 | 175 | * Tests the expectation. True if it matches |
176 | 176 | * a string value or an array value in any order. |
177 | - * @param mixed $compare Raw header block to search. |
|
177 | + * @param false|string $compare Raw header block to search. |
|
178 | 178 | * @return boolean True if header present. |
179 | 179 | * @access public |
180 | 180 | */ |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | |
278 | 278 | /** |
279 | 279 | * Tests that the unwanted header is not found. |
280 | - * @param mixed $compare Raw header block to search. |
|
280 | + * @param string $compare Raw header block to search. |
|
281 | 281 | * @return boolean True if header present. |
282 | 282 | * @access public |
283 | 283 | */ |
@@ -499,7 +499,7 @@ discard block |
||
499 | 499 | /** |
500 | 500 | * Creates a new default web browser object. |
501 | 501 | * Will be cleared at the end of the test method. |
502 | - * @return TestBrowser New browser. |
|
502 | + * @return SimpleBrowser New browser. |
|
503 | 503 | * @access public |
504 | 504 | */ |
505 | 505 | function &createBrowser() { |
@@ -617,7 +617,7 @@ discard block |
||
617 | 617 | * Issues a fail if there is a transport error anywhere |
618 | 618 | * in the current frameset. Only one such error is |
619 | 619 | * reported. |
620 | - * @param string/boolean $result HTML or failure. |
|
620 | + * @param boolean $result HTML or failure. |
|
621 | 621 | * @return string/boolean $result Passes through result. |
622 | 622 | * @access private |
623 | 623 | */ |
@@ -685,7 +685,7 @@ discard block |
||
685 | 685 | * the base URL reflects the new location. |
686 | 686 | * @param string $url URL to fetch. |
687 | 687 | * @param hash $parameters Optional additional GET data. |
688 | - * @return boolean/string Raw page on success. |
|
688 | + * @return boolean Raw page on success. |
|
689 | 689 | * @access public |
690 | 690 | */ |
691 | 691 | function get($url, $parameters = false) { |
@@ -699,7 +699,7 @@ discard block |
||
699 | 699 | * the base URL reflects the new location. |
700 | 700 | * @param string $url URL to fetch. |
701 | 701 | * @param hash $parameters Optional additional GET data. |
702 | - * @return boolean/string Raw page on success. |
|
702 | + * @return boolean Raw page on success. |
|
703 | 703 | * @access public |
704 | 704 | */ |
705 | 705 | function post($url, $parameters = false) { |
@@ -858,7 +858,7 @@ discard block |
||
858 | 858 | * @param string $label Button label. An unlabeled |
859 | 859 | * button can be triggered by 'Submit'. |
860 | 860 | * @param hash $additional Additional form values. |
861 | - * @return boolean/string Page on success, else false. |
|
861 | + * @return boolean Page on success, else false. |
|
862 | 862 | * @access public |
863 | 863 | */ |
864 | 864 | function clickSubmit($label = 'Submit', $additional = false) { |
@@ -871,7 +871,7 @@ discard block |
||
871 | 871 | * form will be submitted by this. |
872 | 872 | * @param string $name Name attribute of button. |
873 | 873 | * @param hash $additional Additional form values. |
874 | - * @return boolean/string Page on success. |
|
874 | + * @return boolean Page on success. |
|
875 | 875 | * @access public |
876 | 876 | */ |
877 | 877 | function clickSubmitByName($name, $additional = false) { |
@@ -884,7 +884,7 @@ discard block |
||
884 | 884 | * form will be submitted by this. |
885 | 885 | * @param string $id ID attribute of button. |
886 | 886 | * @param hash $additional Additional form values. |
887 | - * @return boolean/string Page on success. |
|
887 | + * @return boolean Page on success. |
|
888 | 888 | * @access public |
889 | 889 | */ |
890 | 890 | function clickSubmitById($id, $additional = false) { |
@@ -914,7 +914,7 @@ discard block |
||
914 | 914 | * @param integer $x X-coordinate of imaginary click. |
915 | 915 | * @param integer $y Y-coordinate of imaginary click. |
916 | 916 | * @param hash $additional Additional form values. |
917 | - * @return boolean/string Page on success. |
|
917 | + * @return boolean Page on success. |
|
918 | 918 | * @access public |
919 | 919 | */ |
920 | 920 | function clickImage($label, $x = 1, $y = 1, $additional = false) { |
@@ -932,7 +932,7 @@ discard block |
||
932 | 932 | * @param integer $x X-coordinate of imaginary click. |
933 | 933 | * @param integer $y Y-coordinate of imaginary click. |
934 | 934 | * @param hash $additional Additional form values. |
935 | - * @return boolean/string Page on success. |
|
935 | + * @return boolean Page on success. |
|
936 | 936 | * @access public |
937 | 937 | */ |
938 | 938 | function clickImageByName($name, $x = 1, $y = 1, $additional = false) { |
@@ -945,11 +945,11 @@ discard block |
||
945 | 945 | * form will be submitted by this. Clicking outside of |
946 | 946 | * the boundary of the coordinates will result in |
947 | 947 | * a failure. |
948 | - * @param integer/string $id ID attribute of button. |
|
948 | + * @param integer $id ID attribute of button. |
|
949 | 949 | * @param integer $x X-coordinate of imaginary click. |
950 | 950 | * @param integer $y Y-coordinate of imaginary click. |
951 | 951 | * @param hash $additional Additional form values. |
952 | - * @return boolean/string Page on success. |
|
952 | + * @return boolean Page on success. |
|
953 | 953 | * @access public |
954 | 954 | */ |
955 | 955 | function clickImageById($id, $x = 1, $y = 1, $additional = false) { |
@@ -987,7 +987,7 @@ discard block |
||
987 | 987 | * with normalised space. |
988 | 988 | * @param string $label Text between the anchor tags. |
989 | 989 | * @param integer $index Link position counting from zero. |
990 | - * @return boolean/string Page on success. |
|
990 | + * @return boolean Page on success. |
|
991 | 991 | * @access public |
992 | 992 | */ |
993 | 993 | function clickLink($label, $index = 0) { |
@@ -997,7 +997,7 @@ discard block |
||
997 | 997 | /** |
998 | 998 | * Follows a link by id attribute. |
999 | 999 | * @param string $id ID attribute value. |
1000 | - * @return boolean/string Page on success. |
|
1000 | + * @return boolean Page on success. |
|
1001 | 1001 | * @access public |
1002 | 1002 | */ |
1003 | 1003 | function clickLinkById($id) { |
@@ -1028,7 +1028,7 @@ discard block |
||
1028 | 1028 | /** |
1029 | 1029 | * Tests for the non-presence of a link label. Match is |
1030 | 1030 | * case insensitive with normalised space. |
1031 | - * @param string/integer $label Text between the anchor tags |
|
1031 | + * @param string $label Text between the anchor tags |
|
1032 | 1032 | * or ID attribute. |
1033 | 1033 | * @param string $message Message to display. Default |
1034 | 1034 | * can be embedded with %s. |
@@ -1079,10 +1079,7 @@ discard block |
||
1079 | 1079 | /** |
1080 | 1080 | * Sets all form fields with that label, or name if there |
1081 | 1081 | * is no label attached. |
1082 | - * @param string $name Name of field in forms. |
|
1083 | - * @param string $value New value of field. |
|
1084 | - * @return boolean True if field exists, otherwise false. |
|
1085 | - * @access public |
|
1082 | + * @param string $label |
|
1086 | 1083 | */ |
1087 | 1084 | function setField($label, $value, $position=false) { |
1088 | 1085 | return $this->_browser->setField($label, $value, $position); |
@@ -1101,7 +1098,7 @@ discard block |
||
1101 | 1098 | |
1102 | 1099 | /** |
1103 | 1100 | * Sets all form fields with that id. |
1104 | - * @param string/integer $id Id of field in forms. |
|
1101 | + * @param integer $id Id of field in forms. |
|
1105 | 1102 | * @param string $value New value of field. |
1106 | 1103 | * @return boolean True if field exists, otherwise false. |
1107 | 1104 | * @access public |
@@ -1115,13 +1112,7 @@ discard block |
||
1115 | 1112 | * to the expected value. A missing form will always |
1116 | 1113 | * fail. If no value is given then only the existence |
1117 | 1114 | * of the field is checked. |
1118 | - * @param string $name Name of field in forms. |
|
1119 | - * @param mixed $expected Expected string/array value or |
|
1120 | - * false for unset fields. |
|
1121 | - * @param string $message Message to display. Default |
|
1122 | - * can be embedded with %s. |
|
1123 | - * @return boolean True if pass. |
|
1124 | - * @access public |
|
1115 | + * @param string $label |
|
1125 | 1116 | */ |
1126 | 1117 | function assertField($label, $expected = true, $message = '%s') { |
1127 | 1118 | $value = $this->_browser->getField($label); |
@@ -1191,7 +1182,7 @@ discard block |
||
1191 | 1182 | /** |
1192 | 1183 | * Checks the response code against a list |
1193 | 1184 | * of possible values. |
1194 | - * @param array $responses Possible responses for a pass. |
|
1185 | + * @param integer $responses Possible responses for a pass. |
|
1195 | 1186 | * @param string $message Message to display. Default |
1196 | 1187 | * can be embedded with %s. |
1197 | 1188 | * @return boolean True if pass. |
@@ -1208,7 +1199,7 @@ discard block |
||
1208 | 1199 | /** |
1209 | 1200 | * Checks the mime type against a list |
1210 | 1201 | * of possible values. |
1211 | - * @param array $types Possible mime types for a pass. |
|
1202 | + * @param string $types Possible mime types for a pass. |
|
1212 | 1203 | * @param string $message Message to display. |
1213 | 1204 | * @return boolean True if pass. |
1214 | 1205 | * @access public |
@@ -1294,6 +1285,8 @@ discard block |
||
1294 | 1285 | |
1295 | 1286 | /** |
1296 | 1287 | * @deprecated |
1288 | + * @param string $header |
|
1289 | + * @param string $pattern |
|
1297 | 1290 | */ |
1298 | 1291 | function assertHeaderPattern($header, $pattern, $message = '%s') { |
1299 | 1292 | return $this->assert( |
@@ -1497,8 +1490,8 @@ discard block |
||
1497 | 1490 | * Will trigger a pass if the two parameters have |
1498 | 1491 | * the same value only. Otherwise a fail. This |
1499 | 1492 | * is for testing hand extracted text, etc. |
1500 | - * @param mixed $first Value to compare. |
|
1501 | - * @param mixed $second Value to compare. |
|
1493 | + * @param string|false $first Value to compare. |
|
1494 | + * @param string $second Value to compare. |
|
1502 | 1495 | * @param string $message Message to display. |
1503 | 1496 | * @return boolean True on pass |
1504 | 1497 | * @access public |
@@ -1514,8 +1507,8 @@ discard block |
||
1514 | 1507 | * Will trigger a pass if the two parameters have |
1515 | 1508 | * a different value. Otherwise a fail. This |
1516 | 1509 | * is for testing hand extracted text, etc. |
1517 | - * @param mixed $first Value to compare. |
|
1518 | - * @param mixed $second Value to compare. |
|
1510 | + * @param string $first Value to compare. |
|
1511 | + * @param string $second Value to compare. |
|
1519 | 1512 | * @param string $message Message to display. |
1520 | 1513 | * @return boolean True on pass |
1521 | 1514 | * @access public |
@@ -132,8 +132,6 @@ |
||
132 | 132 | /** |
133 | 133 | * Paints the end of a test method. |
134 | 134 | * @param string $test_name Name of test that is ending. |
135 | - * @param integer $progress Number of test cases ending. |
|
136 | - * @access public |
|
137 | 135 | */ |
138 | 136 | function paintMethodEnd($test_name) { |
139 | 137 | print $this->_getIndent(); |
@@ -27,10 +27,16 @@ |
||
27 | 27 | return (strpos($file->getPathname(), '/_') === false && preg_match($this->pattern, $file->getFilename())); |
28 | 28 | } |
29 | 29 | |
30 | + /** |
|
31 | + * @param string $pattern |
|
32 | + */ |
|
30 | 33 | public function setPattern($pattern) { |
31 | 34 | $this->pattern = $pattern; |
32 | 35 | } |
33 | 36 | |
37 | + /** |
|
38 | + * @param string $path |
|
39 | + */ |
|
34 | 40 | public static function apply($path, $pattern = '@Test.php$@') { |
35 | 41 | $RecursiveIt = new RecursiveCachingIterator(new RecursiveDirectoryIterator($path)); |
36 | 42 | $RecursiveIt = new RecursiveIteratorIterator($RecursiveIt, RecursiveIteratorIterator::SELF_FIRST); |
@@ -13,6 +13,9 @@ |
||
13 | 13 | |
14 | 14 | class testsPluginInfo extends PluginInfo { |
15 | 15 | |
16 | + /** |
|
17 | + * @param testsPlugin $plugin |
|
18 | + */ |
|
16 | 19 | function testsPluginInfo(&$plugin) { |
17 | 20 | $this->PluginInfo($plugin); |
18 | 21 | $this->setPluginDescriptor(new testsPluginDescriptor()); |
@@ -24,6 +24,9 @@ |
||
24 | 24 | |
25 | 25 | protected $testPaths = array(); |
26 | 26 | |
27 | + /** |
|
28 | + * @param string $order |
|
29 | + */ |
|
27 | 30 | public function runByOrder(&$reporter, $order) { |
28 | 31 | $this->addTestFiles(); |
29 | 32 | if ($order === 'invert') { |