@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | |
314 | 314 | /** |
315 | 315 | * @param array $properties |
316 | - * @return string |
|
316 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
317 | 317 | */ |
318 | 318 | public function Field($properties = array()) |
319 | 319 | { |
@@ -479,7 +479,7 @@ discard block |
||
479 | 479 | |
480 | 480 | /** |
481 | 481 | * Marking a specific node in the tree as disabled |
482 | - * @param $node |
|
482 | + * @param DataObject $node |
|
483 | 483 | * @return boolean |
484 | 484 | */ |
485 | 485 | public function nodeIsDisabled($node) |
@@ -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 |
@@ -330,6 +330,9 @@ |
||
330 | 330 | } |
331 | 331 | } |
332 | 332 | |
333 | + /** |
|
334 | + * @param string $name |
|
335 | + */ |
|
333 | 336 | public function inst_set($name, $val) |
334 | 337 | { |
335 | 338 | // Quicker execution path for "."-free names |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | * Find an attribute in a SimpleXMLElement object by name. |
227 | 227 | * @param SimpleXMLElement $object |
228 | 228 | * @param string $attribute Name of attribute to find |
229 | - * @return SimpleXMLElement object of the attribute |
|
229 | + * @return boolean object of the attribute |
|
230 | 230 | */ |
231 | 231 | public function findAttribute($object, $attribute) |
232 | 232 | { |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | * Note: characters are stripped from the content; make sure that your assertions take this into account. |
261 | 261 | * |
262 | 262 | * @param string $selector A basic CSS selector, e.g. 'li.jobs h3' |
263 | - * @param array|string $expectedMatches The content of at least one of the matched tags |
|
263 | + * @param string[] $expectedMatches The content of at least one of the matched tags |
|
264 | 264 | * @param string $message |
265 | 265 | * @throws PHPUnit_Framework_AssertionFailedError |
266 | 266 | */ |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | /** |
398 | 398 | * Log in as the given member |
399 | 399 | * |
400 | - * @param Member|int|string $member The ID, fixture codename, or Member object of the member that you want to log in |
|
400 | + * @param \SilverStripe\ORM\DataObject|null $member The ID, fixture codename, or Member object of the member that you want to log in |
|
401 | 401 | */ |
402 | 402 | public function logInAs($member) |
403 | 403 | { |
@@ -135,7 +135,7 @@ |
||
135 | 135 | * Remove a previously registered authenticator |
136 | 136 | * |
137 | 137 | * @param string $authenticator Name of the authenticator class to register |
138 | - * @return bool Returns TRUE on success, FALSE otherwise. |
|
138 | + * @return boolean|null Returns TRUE on success, FALSE otherwise. |
|
139 | 139 | * @deprecated Use Authenticator.authenticators instead. |
140 | 140 | */ |
141 | 141 | public static function unregister_authenticator($authenticator) |