@@ -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) |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | * |
| 388 | 388 | * @param DataObject $node |
| 389 | 389 | * @param int $depth |
| 390 | - * @return array|string |
|
| 390 | + * @return callable |
|
| 391 | 391 | */ |
| 392 | 392 | protected function getSubtree($node, $depth = 0) |
| 393 | 393 | { |
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | /** |
| 621 | 621 | * Expose the given object in the tree, by marking this page and all it ancestors. |
| 622 | 622 | * |
| 623 | - * @param DataObject|Hierarchy $childObj |
|
| 623 | + * @param DataObject $childObj |
|
| 624 | 624 | * @return $this |
| 625 | 625 | */ |
| 626 | 626 | public function markToExpose(DataObject $childObj) |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | /** |
| 766 | 766 | * Check if this node has too many children |
| 767 | 767 | * |
| 768 | - * @param DataObject|Hierarchy $node |
|
| 768 | + * @param DataObject $node |
|
| 769 | 769 | * @param int $count Children count (if already calculated) |
| 770 | 770 | * @return bool |
| 771 | 771 | */ |
@@ -7,9 +7,7 @@ |
||
| 7 | 7 | use SilverStripe\ORM\FieldType\DBDate; |
| 8 | 8 | use SilverStripe\ORM\FieldType\DBField; |
| 9 | 9 | use SilverStripe\ORM\FieldType\DBDatetime; |
| 10 | -use SilverStripe\ORM\DataObject; |
|
| 11 | 10 | use SilverStripe\Dev\SapphireTest; |
| 12 | -use SilverStripe\Security\Member; |
|
| 13 | 11 | |
| 14 | 12 | class DBDateTest extends SapphireTest |
| 15 | 13 | { |
@@ -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 |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\ORM\Tests; |
| 4 | 4 | |
| 5 | -use DOMDocument; |
|
| 6 | 5 | use SilverStripe\Dev\CSSContentParser; |
| 7 | 6 | use SilverStripe\Dev\SapphireTest; |
| 8 | 7 | use SilverStripe\ORM\DataObject; |
@@ -55,6 +55,7 @@ discard block |
||
| 55 | 55 | /** |
| 56 | 56 | * Return a link to this request handler. |
| 57 | 57 | * The link returned is supplied in the constructor |
| 58 | + * @param string $action |
|
| 58 | 59 | * @return string |
| 59 | 60 | */ |
| 60 | 61 | public function link($action = null) |
@@ -115,7 +116,7 @@ discard block |
||
| 115 | 116 | * Factory method for the lost password form |
| 116 | 117 | * |
| 117 | 118 | * @skipUpgrade |
| 118 | - * @return Form Returns the lost password form |
|
| 119 | + * @return LoginForm Returns the lost password form |
|
| 119 | 120 | */ |
| 120 | 121 | public function lostPasswordForm() |
| 121 | 122 | { |
@@ -247,6 +248,8 @@ discard block |
||
| 247 | 248 | |
| 248 | 249 | /** |
| 249 | 250 | * @todo copypaste from FormRequestHandler - refactor |
| 251 | + * @param string $link |
|
| 252 | + * @return string |
|
| 250 | 253 | */ |
| 251 | 254 | protected function addBackURLParam($link) |
| 252 | 255 | { |
@@ -5,9 +5,7 @@ |
||
| 5 | 5 | use SilverStripe\Control\Controller; |
| 6 | 6 | use SilverStripe\Control\Email\Email; |
| 7 | 7 | use SilverStripe\Control\HTTPResponse; |
| 8 | -use SilverStripe\Control\Session; |
|
| 9 | 8 | use SilverStripe\Control\RequestHandler; |
| 10 | -use SilverStripe\ORM\ValidationResult; |
|
| 11 | 9 | use SilverStripe\Forms\FieldList; |
| 12 | 10 | use SilverStripe\Forms\EmailField; |
| 13 | 11 | use SilverStripe\Forms\FormAction; |
@@ -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 | */ |
@@ -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 | { |
@@ -330,6 +330,9 @@ discard block |
||
| 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 |
@@ -379,6 +382,11 @@ discard block |
||
| 379 | 382 | $diffVar[sizeof($var)-1] = $val; |
| 380 | 383 | } |
| 381 | 384 | |
| 385 | + /** |
|
| 386 | + * @param string $name |
|
| 387 | + * |
|
| 388 | + * @return string |
|
| 389 | + */ |
|
| 382 | 390 | public function inst_get($name) |
| 383 | 391 | { |
| 384 | 392 | // Quicker execution path for "."-free names |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use SilverStripe\Core\Config\Config; |
| 6 | 6 | use SilverStripe\Core\Injector\Injectable; |
| 7 | 7 | use SilverStripe\Core\Injector\Injector; |
| 8 | -use SilverStripe\Dev\Deprecation; |
|
| 9 | 8 | |
| 10 | 9 | /** |
| 11 | 10 | * Handles all manipulation of the session. |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | /** |
| 226 | 226 | * Returns a lowercase array of all the class names in the manifest. |
| 227 | 227 | * |
| 228 | - * @return array |
|
| 228 | + * @return string[] |
|
| 229 | 229 | */ |
| 230 | 230 | public function getClassNames() |
| 231 | 231 | { |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | * Returns an array containing all the descendants (direct and indirect) |
| 257 | 257 | * of a class. |
| 258 | 258 | * |
| 259 | - * @param string|object $class |
|
| 259 | + * @param string $class |
|
| 260 | 260 | * @return array |
| 261 | 261 | */ |
| 262 | 262 | public function getDescendantsOf($class) |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | /** |
| 176 | 176 | * Returns the value of this field. |
| 177 | 177 | * |
| 178 | - * @return mixed |
|
| 178 | + * @return string |
|
| 179 | 179 | */ |
| 180 | 180 | public function getValue() |
| 181 | 181 | { |
@@ -533,7 +533,7 @@ discard block |
||
| 533 | 533 | } |
| 534 | 534 | |
| 535 | 535 | /** |
| 536 | - * @param array $value |
|
| 536 | + * @param string $value |
|
| 537 | 537 | * @return $this |
| 538 | 538 | */ |
| 539 | 539 | public function setArrayValue($value) |