@@ -130,7 +130,7 @@ |
||
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | /** |
| 133 | - * @param mixed $item |
|
| 133 | + * @param Tests\ManyManyThroughListTest\Item $item |
|
| 134 | 134 | * @param array $extraFields |
| 135 | 135 | */ |
| 136 | 136 | public function add($item, $extraFields = []) |
@@ -380,7 +380,7 @@ discard block |
||
| 380 | 380 | * |
| 381 | 381 | * @param string $value |
| 382 | 382 | * @param string $defaultDirection |
| 383 | - * @return array A two element array: array($column, $direction) |
|
| 383 | + * @return string[] A two element array: array($column, $direction) |
|
| 384 | 384 | */ |
| 385 | 385 | private function getDirectionFromString($value, $defaultDirection = null) |
| 386 | 386 | { |
@@ -482,7 +482,6 @@ discard block |
||
| 482 | 482 | * @see SQLSelect::addWhere() for syntax examples |
| 483 | 483 | * |
| 484 | 484 | * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries |
| 485 | - * @param mixed $having,... Unlimited additional predicates |
|
| 486 | 485 | * @return $this Self reference |
| 487 | 486 | */ |
| 488 | 487 | public function setHaving($having) |
@@ -498,7 +497,6 @@ discard block |
||
| 498 | 497 | * @see SQLSelect::addWhere() for syntax examples |
| 499 | 498 | * |
| 500 | 499 | * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries |
| 501 | - * @param mixed $having,... Unlimited additional predicates |
|
| 502 | 500 | * @return $this Self reference |
| 503 | 501 | */ |
| 504 | 502 | public function addHaving($having) |
@@ -208,6 +208,10 @@ |
||
| 208 | 208 | $this->assertEquals('', $this->parser->parse('[test_shortcode][test_shortcode]')); |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | + /** |
|
| 212 | + * @param string $a |
|
| 213 | + * @param string $b |
|
| 214 | + */ |
|
| 211 | 215 | protected function assertEqualsIgnoringWhitespace($a, $b, $message = null) |
| 212 | 216 | { |
| 213 | 217 | $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b), $message); |
@@ -1048,6 +1048,10 @@ |
||
| 1048 | 1048 | } |
| 1049 | 1049 | } |
| 1050 | 1050 | |
| 1051 | + /** |
|
| 1052 | + * @param Requirements_Backend $backend |
|
| 1053 | + * @param string $type |
|
| 1054 | + */ |
|
| 1051 | 1055 | public function assertFileNotIncluded($backend, $type, $files) |
| 1052 | 1056 | { |
| 1053 | 1057 | $includedFiles = $this->getBackendFiles($backend, $type); |
@@ -143,7 +143,7 @@ |
||
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | /** |
| 146 | - * @return AdapterInterface |
|
| 146 | + * @return Adapter |
|
| 147 | 147 | */ |
| 148 | 148 | public function getEmbed() |
| 149 | 149 | { |
@@ -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 |
@@ -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 | */ |