@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | * |
381 | 381 | * @param DataObject $node |
382 | 382 | * @param int $depth |
383 | - * @return array|string |
|
383 | + * @return callable |
|
384 | 384 | */ |
385 | 385 | protected function getSubtree($node, $depth = 0) |
386 | 386 | { |
@@ -613,7 +613,7 @@ discard block |
||
613 | 613 | /** |
614 | 614 | * Expose the given object in the tree, by marking this page and all it ancestors. |
615 | 615 | * |
616 | - * @param DataObject|Hierarchy $childObj |
|
616 | + * @param DataObject $childObj |
|
617 | 617 | * @return $this |
618 | 618 | */ |
619 | 619 | public function markToExpose(DataObject $childObj) |
@@ -758,7 +758,7 @@ discard block |
||
758 | 758 | /** |
759 | 759 | * Check if this node has too many children |
760 | 760 | * |
761 | - * @param DataObject|Hierarchy $node |
|
761 | + * @param DataObject $node |
|
762 | 762 | * @param int $count Children count (if already calculated) |
763 | 763 | * @return bool |
764 | 764 | */ |
@@ -418,6 +418,7 @@ discard block |
||
418 | 418 | * |
419 | 419 | * @param string$html |
420 | 420 | * @param DataObject $node |
421 | + * @param string $html |
|
421 | 422 | * @return string |
422 | 423 | */ |
423 | 424 | protected function getNodeClassFromTree($html, $node) |
@@ -434,6 +435,10 @@ discard block |
||
434 | 435 | return ''; |
435 | 436 | } |
436 | 437 | |
438 | + /** |
|
439 | + * @param string $expected |
|
440 | + * @param string $actual |
|
441 | + */ |
|
437 | 442 | protected function assertHTMLSame($expected, $actual, $message = '') |
438 | 443 | { |
439 | 444 | // Trim each line, strip empty lines |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | /** |
248 | 248 | * Assign value posted from form submission |
249 | 249 | * |
250 | - * @param mixed $value |
|
250 | + * @param string $value |
|
251 | 251 | * @param mixed $data |
252 | 252 | * @return $this |
253 | 253 | */ |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | /** |
265 | 265 | * Set time assigned from database value |
266 | 266 | * |
267 | - * @param mixed $value |
|
267 | + * @param string $value |
|
268 | 268 | * @param mixed $data |
269 | 269 | * @return $this |
270 | 270 | */ |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | /** |
312 | 312 | * Assign value posted from form submission |
313 | 313 | * |
314 | - * @param mixed $value |
|
314 | + * @param string $value |
|
315 | 315 | * @param mixed $data |
316 | 316 | * @return $this |
317 | 317 | */ |
@@ -336,7 +336,7 @@ discard block |
||
336 | 336 | * |
337 | 337 | * When $html5=true, assign value from ISO 8601 string. |
338 | 338 | * |
339 | - * @param mixed $value |
|
339 | + * @param string $value |
|
340 | 340 | * @param mixed $data |
341 | 341 | * @return $this |
342 | 342 | */ |
@@ -479,6 +479,7 @@ |
||
479 | 479 | * |
480 | 480 | * @When /^(?:|I )fill in the "(?P<field>(?:[^"]|\\")*)" dropdown with "(?P<value>(?:[^"]|\\")*)"$/ |
481 | 481 | * @When /^(?:|I )fill in "(?P<value>(?:[^"]|\\")*)" for the "(?P<field>(?:[^"]|\\")*)" dropdown$/ |
482 | + * @param string $field |
|
482 | 483 | */ |
483 | 484 | public function theIFillInTheDropdownWith($field, $value) |
484 | 485 | { |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | } |
136 | 136 | |
137 | 137 | /** |
138 | - * @param $bool |
|
138 | + * @param boolean $bool |
|
139 | 139 | * @return $this |
140 | 140 | */ |
141 | 141 | public function setHTML5($bool) |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | * Assign value posted from form submission, based on {@link $datetimeFormat}. |
149 | 149 | * When $html5=true, this needs to be normalised ISO format (with "T" separator). |
150 | 150 | * |
151 | - * @param mixed $value |
|
151 | + * @param string $value |
|
152 | 152 | * @param mixed $data |
153 | 153 | * @return $this |
154 | 154 | */ |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | * When $html5=true, assign value from ISO 8601 normalised string (with a "T" separator). |
315 | 315 | * Falls back to an ISO 8601 string (with a whitespace separator). |
316 | 316 | * |
317 | - * @param mixed $value |
|
317 | + * @param string $value |
|
318 | 318 | * @param mixed $data |
319 | 319 | * @return $this |
320 | 320 | */ |
@@ -489,6 +489,9 @@ discard block |
||
489 | 489 | return $this; |
490 | 490 | } |
491 | 491 | |
492 | + /** |
|
493 | + * @param boolean $bool |
|
494 | + */ |
|
492 | 495 | public function setReadonly($bool) |
493 | 496 | { |
494 | 497 | parent::setReadonly($bool); |
@@ -270,6 +270,9 @@ discard block |
||
270 | 270 | |
271 | 271 | |
272 | 272 | |
273 | + /** |
|
274 | + * @param boolean $disabled |
|
275 | + */ |
|
273 | 276 | public function setDisabled($disabled) |
274 | 277 | { |
275 | 278 | parent::setDisabled($disabled); |
@@ -279,6 +282,9 @@ discard block |
||
279 | 282 | return $this; |
280 | 283 | } |
281 | 284 | |
285 | + /** |
|
286 | + * @param boolean $readonly |
|
287 | + */ |
|
282 | 288 | public function setReadonly($readonly) |
283 | 289 | { |
284 | 290 | parent::setReadonly($readonly); |
@@ -371,6 +377,10 @@ discard block |
||
371 | 377 | $this->children->removeByName($fieldName, $dataFieldOnly); |
372 | 378 | } |
373 | 379 | |
380 | + /** |
|
381 | + * @param string $fieldName |
|
382 | + * @param FormField $newField |
|
383 | + */ |
|
374 | 384 | public function replaceField($fieldName, $newField) |
375 | 385 | { |
376 | 386 | return $this->children->replaceField($fieldName, $newField); |
@@ -456,6 +466,7 @@ discard block |
||
456 | 466 | * the children collection. Doesn't work recursively. |
457 | 467 | * |
458 | 468 | * @param string|FormField |
469 | + * @param string $field |
|
459 | 470 | * @return int Position in children collection (first position starts with 0). Returns FALSE if the field can't |
460 | 471 | * be found. |
461 | 472 | */ |
@@ -88,6 +88,9 @@ |
||
88 | 88 | $this->mockButtonFragments($list, null); |
89 | 89 | } |
90 | 90 | |
91 | + /** |
|
92 | + * @param \SilverStripe\ORM\DataObject $parent |
|
93 | + */ |
|
91 | 94 | protected function mockButtonFragments(SS_List $list, $parent = null) |
92 | 95 | { |
93 | 96 | $form = Form::create( |
@@ -86,7 +86,7 @@ |
||
86 | 86 | /** |
87 | 87 | * Global permissions required to edit |
88 | 88 | * |
89 | - * @param array $permissions |
|
89 | + * @param string[] $permissions |
|
90 | 90 | * @return $this |
91 | 91 | */ |
92 | 92 | public function setGlobalEditPermissions($permissions) |