@@ -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 |