@@ -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); |
@@ -1816,6 +1824,11 @@ discard block |
||
1816 | 1824 | $this->_renderWithSourceFileComments('SSViewerTestComments/'.$template['name'], $template['expected']); |
1817 | 1825 | } |
1818 | 1826 | } |
1827 | + |
|
1828 | + /** |
|
1829 | + * @param string $name |
|
1830 | + * @param string $expected |
|
1831 | + */ |
|
1819 | 1832 | private function _renderWithSourceFileComments($name, $expected) |
1820 | 1833 | { |
1821 | 1834 | $viewer = new SSViewer(array($name)); |
@@ -8,7 +8,6 @@ |
||
8 | 8 | use SilverStripe\Control\HTTPResponse; |
9 | 9 | use SilverStripe\Core\Convert; |
10 | 10 | use SilverStripe\Core\Injector\Injector; |
11 | -use SilverStripe\Dev\Debug; |
|
12 | 11 | use SilverStripe\Dev\SapphireTest; |
13 | 12 | use SilverStripe\i18n\i18n; |
14 | 13 | use SilverStripe\ORM\DataObject; |
@@ -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 | { |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use SilverStripe\Core\Object; |
6 | 6 | use Iterator; |
7 | - |
|
8 | 7 | use SilverStripe\Control\Director; |
9 | 8 | |
10 | 9 | /** |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use SilverStripe\ORM\DataObject; |
6 | 6 | use SilverStripe\ORM\DataObjectInterface; |
7 | 7 | use SilverStripe\Security\Member; |
8 | -use SilverStripe\View\Requirements; |
|
9 | 8 | |
10 | 9 | /** |
11 | 10 | * Two masked input fields, checks for matching passwords. |
@@ -89,6 +89,9 @@ discard block |
||
89 | 89 | $this->sequentialSaveableSet = null; |
90 | 90 | } |
91 | 91 | |
92 | + /** |
|
93 | + * @param FormField[] $list |
|
94 | + */ |
|
92 | 95 | protected function collateDataFields(&$list, $saveableOnly = false) |
93 | 96 | { |
94 | 97 | if (!isset($list)) { |
@@ -198,7 +201,7 @@ discard block |
||
198 | 201 | * Removes a number of fields from a Tab/TabSet within this FieldList. |
199 | 202 | * |
200 | 203 | * @param string $tabName The name of the Tab or TabSet field |
201 | - * @param array $fields A list of fields, e.g. array('Name', 'Email') |
|
204 | + * @param string[] $fields A list of fields, e.g. array('Name', 'Email') |
|
202 | 205 | */ |
203 | 206 | public function removeFieldsFromTab($tabName, $fields) |
204 | 207 | { |
@@ -625,7 +628,7 @@ discard block |
||
625 | 628 | } |
626 | 629 | |
627 | 630 | /** |
628 | - * @param $field |
|
631 | + * @param CompositeField $field |
|
629 | 632 | * @return $this |
630 | 633 | */ |
631 | 634 | public function setContainerField($field) |
@@ -707,6 +710,7 @@ discard block |
||
707 | 710 | * the children collection. Doesn't work recursively. |
708 | 711 | * |
709 | 712 | * @param string|FormField |
713 | + * @param string $field |
|
710 | 714 | * @return int Position in children collection (first position starts with 0). |
711 | 715 | * Returns FALSE if the field can't be found. |
712 | 716 | */ |
@@ -77,7 +77,7 @@ |
||
77 | 77 | * |
78 | 78 | * @param GridField |
79 | 79 | * |
80 | - * @return array |
|
80 | + * @return string[] |
|
81 | 81 | */ |
82 | 82 | public function getActions($gridField) |
83 | 83 | { |
@@ -12,7 +12,7 @@ |
||
12 | 12 | |
13 | 13 | /** |
14 | 14 | * @param array $properties |
15 | - * @return string |
|
15 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
16 | 16 | */ |
17 | 17 | public function FieldHolder($properties = array()) |
18 | 18 | { |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use SilverStripe\Core\Convert; |
6 | 6 | use SilverStripe\ORM\FieldType\DBHTMLText; |
7 | -use SilverStripe\View\Requirements; |
|
8 | 7 | use InvalidArgumentException; |
9 | 8 | |
10 | 9 | /** |
@@ -8,7 +8,6 @@ |
||
8 | 8 | use SilverStripe\ORM\DataObject; |
9 | 9 | use SilverStripe\ORM\DataObjectInterface; |
10 | 10 | use SilverStripe\ORM\FieldType\DBHTMLText; |
11 | -use SilverStripe\View\Requirements; |
|
12 | 11 | use SilverStripe\View\ViewableData; |
13 | 12 | use stdClass; |
14 | 13 |