@@ -487,15 +487,26 @@ |
||
487 | 487 | return parent::cleanFilename($filename); |
488 | 488 | } |
489 | 489 | |
490 | + /** |
|
491 | + * @param string $filename |
|
492 | + * @param string $hash |
|
493 | + * @param string $variant |
|
494 | + */ |
|
490 | 495 | public function getFileID($filename, $hash, $variant = null) { |
491 | 496 | return parent::getFileID($filename, $hash, $variant); |
492 | 497 | } |
493 | 498 | |
494 | 499 | |
500 | + /** |
|
501 | + * @param string $fileID |
|
502 | + */ |
|
495 | 503 | public function getOriginalFilename($fileID, &$variant = '') { |
496 | 504 | return parent::getOriginalFilename($fileID, $variant); |
497 | 505 | } |
498 | 506 | |
507 | + /** |
|
508 | + * @param null|string $variant |
|
509 | + */ |
|
499 | 510 | public function getDefaultConflictResolution($variant) { |
500 | 511 | return parent::getDefaultConflictResolution($variant); |
501 | 512 | } |
@@ -98,6 +98,11 @@ |
||
98 | 98 | 'The finder respects the max depth setting.'); |
99 | 99 | } |
100 | 100 | |
101 | + /** |
|
102 | + * @param SS_FileFinder $finder |
|
103 | + * @param string[] $expect |
|
104 | + * @param string $message |
|
105 | + */ |
|
101 | 106 | public function assertFinderFinds($finder, $expect, $message = null) { |
102 | 107 | $found = $finder->find($this->base); |
103 | 108 |
@@ -23,6 +23,11 @@ |
||
23 | 23 | $this->internalCheck("domain.but.no.user", "Invalid, no user part", false); |
24 | 24 | } |
25 | 25 | |
26 | + /** |
|
27 | + * @param string $email |
|
28 | + * @param string $checkText |
|
29 | + * @param boolean $expectSuccess |
|
30 | + */ |
|
26 | 31 | public function internalCheck($email, $checkText, $expectSuccess) { |
27 | 32 | $field = new EmailField("MyEmail"); |
28 | 33 | $field->setValue($email); |
@@ -111,6 +111,9 @@ |
||
111 | 111 | |
112 | 112 | protected $id; |
113 | 113 | |
114 | + /** |
|
115 | + * @param string $link |
|
116 | + */ |
|
114 | 117 | public function __construct($gridField, $id, $link) { |
115 | 118 | $this->gridField = $gridField; |
116 | 119 | $this->id = $id; |
@@ -7,6 +7,9 @@ discard block |
||
7 | 7 | |
8 | 8 | protected static $fixture_file = 'MemberDatetimeOptionsetFieldTest.yml'; |
9 | 9 | |
10 | + /** |
|
11 | + * @param DataObject|null $member |
|
12 | + */ |
|
10 | 13 | protected function createDateFormatFieldForMember($member) { |
11 | 14 | require_once 'Zend/Date.php'; |
12 | 15 | $defaultDateFormat = Zend_Locale_Format::getDateFormat($member->Locale); |
@@ -26,6 +29,9 @@ discard block |
||
26 | 29 | return $field; |
27 | 30 | } |
28 | 31 | |
32 | + /** |
|
33 | + * @param DataObject|null $member |
|
34 | + */ |
|
29 | 35 | protected function createTimeFormatFieldForMember($member) { |
30 | 36 | require_once 'Zend/Date.php'; |
31 | 37 | $defaultTimeFormat = Zend_Locale_Format::getTimeFormat($member->Locale); |
@@ -21,6 +21,9 @@ |
||
21 | 21 | return str_replace(' ', $nbsp, trim($input)); |
22 | 22 | } |
23 | 23 | |
24 | + /** |
|
25 | + * @param string $locale |
|
26 | + */ |
|
24 | 27 | protected function checkInputValidation($locale, $tests) { |
25 | 28 | i18n::set_locale($locale); |
26 | 29 | $field = new NumericField('Number'); |
@@ -298,7 +298,6 @@ discard block |
||
298 | 298 | * Simulates a form post to the test controller with the specified file tuple (Filename, Hash, Variant) |
299 | 299 | * |
300 | 300 | * @param string $fileField Name of field to assign ids to |
301 | - * @param array $ids list of file IDs |
|
302 | 301 | * @return boolean Array with key 'errors' |
303 | 302 | */ |
304 | 303 | protected function mockUploadFileSave($fileField, $filename, $hash, $variant = null) { |
@@ -328,7 +327,7 @@ discard block |
||
328 | 327 | * Simulates a file upload |
329 | 328 | * |
330 | 329 | * @param string $fileField Name of the field to mock upload for |
331 | - * @param array $tmpFileName Name of temporary file to upload |
|
330 | + * @param string $tmpFileName Name of temporary file to upload |
|
332 | 331 | * @return SS_HTTPResponse form response |
333 | 332 | */ |
334 | 333 | protected function mockFileUpload($fileField, $tmpFileName) { |
@@ -360,6 +359,9 @@ discard block |
||
360 | 359 | return $this->record; |
361 | 360 | } |
362 | 361 | |
362 | + /** |
|
363 | + * @param AssetFieldTest_Controller $controller |
|
364 | + */ |
|
363 | 365 | function __construct($controller = null, $name = 'Form') { |
364 | 366 | if(empty($controller)) { |
365 | 367 | $controller = new AssetFieldTest_Controller(); |
@@ -936,7 +936,7 @@ discard block |
||
936 | 936 | * Simulates a file upload |
937 | 937 | * |
938 | 938 | * @param string $fileField Name of the field to mock upload for |
939 | - * @param array $tmpFileName Name of temporary file to upload |
|
939 | + * @param string $tmpFileName Name of temporary file to upload |
|
940 | 940 | * @return SS_HTTPResponse form response |
941 | 941 | */ |
942 | 942 | protected function mockFileUpload($fileField, $tmpFileName) { |
@@ -948,6 +948,9 @@ discard block |
||
948 | 948 | ); |
949 | 949 | } |
950 | 950 | |
951 | + /** |
|
952 | + * @param string $fileField |
|
953 | + */ |
|
951 | 954 | protected function mockFileExists($fileField, $fileName) { |
952 | 955 | return $this->get( |
953 | 956 | "UploadFieldTest_Controller/Form/field/{$fileField}/fileexists?filename=".urlencode($fileName) |
@@ -1075,6 +1078,9 @@ discard block |
||
1075 | 1078 | return $this->record; |
1076 | 1079 | } |
1077 | 1080 | |
1081 | + /** |
|
1082 | + * @param UploadFieldTest_Controller $controller |
|
1083 | + */ |
|
1078 | 1084 | function __construct($controller = null, $name = 'Form') { |
1079 | 1085 | if(empty($controller)) { |
1080 | 1086 | $controller = new UploadFieldTest_Controller(); |
@@ -827,6 +827,10 @@ discard block |
||
827 | 827 | * Assist with testing of specific protected methods |
828 | 828 | */ |
829 | 829 | class i18nTextCollectorTest_Collector extends i18nTextCollector implements TestOnly { |
830 | + |
|
831 | + /** |
|
832 | + * @param string $directory |
|
833 | + */ |
|
830 | 834 | public function getModules_Test($directory) { |
831 | 835 | return $this->getModules($directory); |
832 | 836 | } |
@@ -835,6 +839,9 @@ discard block |
||
835 | 839 | return $this->resolveDuplicateConflicts($entitiesByModule); |
836 | 840 | } |
837 | 841 | |
842 | + /** |
|
843 | + * @param string $module |
|
844 | + */ |
|
838 | 845 | public function getFileListForModule_Test($module) { |
839 | 846 | return parent::getFileListForModule($module); |
840 | 847 | } |