@@ -399,7 +399,7 @@ |
||
399 | 399 | * string of HTML. |
400 | 400 | * |
401 | 401 | * @param string $html HTML to scan for elements |
402 | - * @return SimpleXMLElement |
|
402 | + * @return \SimpleXMLElement |
|
403 | 403 | */ |
404 | 404 | public function findOptionElements($html) |
405 | 405 | { |
@@ -20,6 +20,9 @@ |
||
20 | 20 | |
21 | 21 | protected $id; |
22 | 22 | |
23 | + /** |
|
24 | + * @param string $link |
|
25 | + */ |
|
23 | 26 | public function __construct($gridField, $id, $link) |
24 | 27 | { |
25 | 28 | $this->gridField = $gridField; |
@@ -39,6 +39,9 @@ |
||
39 | 39 | return $this->can(__FUNCTION__, $member, $context); |
40 | 40 | } |
41 | 41 | |
42 | + /** |
|
43 | + * @param string $perm |
|
44 | + */ |
|
42 | 45 | public function can($perm, $member = null, $context = array()) |
43 | 46 | { |
44 | 47 | $perms = [ |
@@ -670,7 +670,7 @@ |
||
670 | 670 | * Get the HTML class attribute from a node in the sitetree |
671 | 671 | * |
672 | 672 | * @param $html |
673 | - * @param $node |
|
673 | + * @param DataObject|null $node |
|
674 | 674 | * @return string |
675 | 675 | */ |
676 | 676 | protected function getNodeClassFromTree($html, $node) |
@@ -9,6 +9,10 @@ |
||
9 | 9 | class MemberForm extends Form |
10 | 10 | { |
11 | 11 | |
12 | + /** |
|
13 | + * @param \SilverStripe\Control\Controller $controller |
|
14 | + * @param string $name |
|
15 | + */ |
|
12 | 16 | public function __construct($controller, $name) |
13 | 17 | { |
14 | 18 | $fields = TestMember::singleton()->getCMSFields(); |
@@ -676,6 +676,8 @@ discard block |
||
676 | 676 | /** |
677 | 677 | * Execute a log-in form using Director::test(). |
678 | 678 | * Helper method for the tests above |
679 | + * @param string $email |
|
680 | + * @param string $password |
|
679 | 681 | */ |
680 | 682 | public function doTestLoginForm($email, $password, $backURL = 'test/link') |
681 | 683 | { |
@@ -697,6 +699,8 @@ discard block |
||
697 | 699 | |
698 | 700 | /** |
699 | 701 | * Helper method to execute a change password form |
702 | + * @param string $oldPassword |
|
703 | + * @param string $newPassword |
|
700 | 704 | */ |
701 | 705 | public function doTestChangepasswordForm($oldPassword, $newPassword) |
702 | 706 | { |
@@ -16,6 +16,9 @@ |
||
16 | 16 | Versioned::class |
17 | 17 | ); |
18 | 18 | |
19 | + /** |
|
20 | + * @param string $entropy |
|
21 | + */ |
|
19 | 22 | public function setEntropy($entropy) |
20 | 23 | { |
21 | 24 | $this->entropy = $entropy; |
@@ -173,6 +173,10 @@ discard block |
||
173 | 173 | ); |
174 | 174 | } |
175 | 175 | |
176 | + /** |
|
177 | + * @param \SilverStripe\ORM\FieldType\DBHTMLText $result |
|
178 | + * @param string[] $expected |
|
179 | + */ |
|
176 | 180 | private function assertExpectedStrings($result, $expected) |
177 | 181 | { |
178 | 182 | foreach ($expected as $expectedStr) { |
@@ -1088,6 +1092,10 @@ discard block |
||
1088 | 1092 | $this->assertEquals('A A1 A1 i A1 ii A2 A3', $rationalisedResult); |
1089 | 1093 | } |
1090 | 1094 | |
1095 | + /** |
|
1096 | + * @param string $a |
|
1097 | + * @param string $b |
|
1098 | + */ |
|
1091 | 1099 | public function assertEqualIgnoringWhitespace($a, $b, $message = '') |
1092 | 1100 | { |
1093 | 1101 | $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b), $message); |
@@ -1819,6 +1827,11 @@ discard block |
||
1819 | 1827 | $this->_renderWithSourceFileComments('SSViewerTestComments/'.$template['name'], $template['expected']); |
1820 | 1828 | } |
1821 | 1829 | } |
1830 | + |
|
1831 | + /** |
|
1832 | + * @param string $name |
|
1833 | + * @param string $expected |
|
1834 | + */ |
|
1822 | 1835 | private function _renderWithSourceFileComments($name, $expected) |
1823 | 1836 | { |
1824 | 1837 | $viewer = new SSViewer(array($name)); |
@@ -135,12 +135,12 @@ discard block |
||
135 | 135 | |
136 | 136 | /** |
137 | 137 | * Email constructor. |
138 | - * @param string|array|null $from |
|
139 | - * @param string|array|null $to |
|
138 | + * @param string $from |
|
139 | + * @param string $to |
|
140 | 140 | * @param string|null $subject |
141 | 141 | * @param string|null $body |
142 | - * @param string|array|null $cc |
|
143 | - * @param string|array|null $bcc |
|
142 | + * @param string $cc |
|
143 | + * @param string $bcc |
|
144 | 144 | * @param string|null $returnPath |
145 | 145 | */ |
146 | 146 | public function __construct( |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | } |
227 | 227 | |
228 | 228 | /** |
229 | - * @param string|array $address |
|
229 | + * @param string $address |
|
230 | 230 | * @param string|null $name |
231 | 231 | * @return $this |
232 | 232 | */ |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | } |
239 | 239 | |
240 | 240 | /** |
241 | - * @return array |
|
241 | + * @return string |
|
242 | 242 | */ |
243 | 243 | public function getSender() |
244 | 244 | { |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | } |
304 | 304 | |
305 | 305 | /** |
306 | - * @param string|array $address |
|
306 | + * @param string $address |
|
307 | 307 | * @param string|null $name |
308 | 308 | * @return $this |
309 | 309 | */ |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | } |
336 | 336 | |
337 | 337 | /** |
338 | - * @param string|array $address |
|
338 | + * @param string $address |
|
339 | 339 | * @param string|null $name |
340 | 340 | * @return $this |
341 | 341 | */ |
@@ -367,7 +367,7 @@ discard block |
||
367 | 367 | } |
368 | 368 | |
369 | 369 | /** |
370 | - * @param string|array $address |
|
370 | + * @param string $address |
|
371 | 371 | * @param string|null $name |
372 | 372 | * @return $this |
373 | 373 | */ |
@@ -384,7 +384,7 @@ discard block |
||
384 | 384 | } |
385 | 385 | |
386 | 386 | /** |
387 | - * @param string|array $address |
|
387 | + * @param string $address |
|
388 | 388 | * @param string|null $name |
389 | 389 | * @return $this |
390 | 390 | */ |
@@ -396,7 +396,7 @@ discard block |
||
396 | 396 | } |
397 | 397 | |
398 | 398 | /** |
399 | - * @param string|array $address |
|
399 | + * @param string $address |
|
400 | 400 | * @param string|null $name |
401 | 401 | * @return $this |
402 | 402 | */ |
@@ -502,7 +502,7 @@ discard block |
||
502 | 502 | } |
503 | 503 | |
504 | 504 | /** |
505 | - * @param string|array $name The data name to add or array to names => value |
|
505 | + * @param string $name The data name to add or array to names => value |
|
506 | 506 | * @param string|null $value The value of the data to add |
507 | 507 | * @return $this |
508 | 508 | */ |
@@ -672,7 +672,7 @@ discard block |
||
672 | 672 | } |
673 | 673 | |
674 | 674 | /** |
675 | - * @return array|bool |
|
675 | + * @return boolean |
|
676 | 676 | */ |
677 | 677 | public function sendPlain() |
678 | 678 | { |
@@ -728,7 +728,7 @@ discard block |
||
728 | 728 | } |
729 | 729 | |
730 | 730 | /** |
731 | - * @return Swift_MimePart|false |
|
731 | + * @return \Swift_Mime_MimeEntity |
|
732 | 732 | */ |
733 | 733 | public function findPlainPart() |
734 | 734 | { |