@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use SilverStripe\ORM\SS_List; |
| 8 | 8 | use SilverStripe\ORM\ArrayList; |
| 9 | 9 | use SilverStripe\ORM\DataObjectInterface; |
| 10 | -use SilverStripe\View\Requirements; |
|
| 11 | 10 | use InvalidArgumentException; |
| 12 | 11 | |
| 13 | 12 | /** |
@@ -238,7 +238,7 @@ |
||
| 238 | 238 | |
| 239 | 239 | /** |
| 240 | 240 | * @param array $properties |
| 241 | - * @return string |
|
| 241 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
| 242 | 242 | */ |
| 243 | 243 | public function Field($properties = array()) |
| 244 | 244 | { |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use SilverStripe\ORM\SS_List; |
| 8 | 8 | use SilverStripe\ORM\ArrayList; |
| 9 | 9 | use SilverStripe\ORM\DataObjectInterface; |
| 10 | -use SilverStripe\View\Requirements; |
|
| 11 | 10 | use InvalidArgumentException; |
| 12 | 11 | |
| 13 | 12 | /** |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use SilverStripe\ORM\SS_List; |
| 8 | 8 | use SilverStripe\ORM\ArrayList; |
| 9 | 9 | use SilverStripe\ORM\DataObjectInterface; |
| 10 | -use SilverStripe\View\Requirements; |
|
| 11 | 10 | use InvalidArgumentException; |
| 12 | 11 | |
| 13 | 12 | /** |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | /** |
| 305 | 305 | * Determine if the target folder for new uploads in is visible the field UI. |
| 306 | 306 | * |
| 307 | - * @return boolean |
|
| 307 | + * @return boolean|string |
|
| 308 | 308 | */ |
| 309 | 309 | public function canPreviewFolder() |
| 310 | 310 | { |
@@ -581,7 +581,7 @@ discard block |
||
| 581 | 581 | * Customises a file with additional details suitable for rendering in the |
| 582 | 582 | * UploadField.ss template |
| 583 | 583 | * |
| 584 | - * @param ViewableData|AssetContainer $file |
|
| 584 | + * @param AssetContainer $file |
|
| 585 | 585 | * @return ViewableData_Customised |
| 586 | 586 | */ |
| 587 | 587 | protected function customiseFile(AssetContainer $file) |
@@ -690,7 +690,7 @@ discard block |
||
| 690 | 690 | /** |
| 691 | 691 | * Determine if the user has permission to upload. |
| 692 | 692 | * |
| 693 | - * @return boolean |
|
| 693 | + * @return boolean|string |
|
| 694 | 694 | */ |
| 695 | 695 | public function canUpload() |
| 696 | 696 | { |
@@ -718,7 +718,7 @@ discard block |
||
| 718 | 718 | * Determine if the user has permission to attach existing files |
| 719 | 719 | * By default returns true if the user has the CMS_ACCESS_AssetAdmin permission |
| 720 | 720 | * |
| 721 | - * @return boolean |
|
| 721 | + * @return boolean|string |
|
| 722 | 722 | */ |
| 723 | 723 | public function canAttachExisting() |
| 724 | 724 | { |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use SilverStripe\Core\Config\Config; |
| 6 | 6 | use SilverStripe\Core\Convert; |
| 7 | -use SilverStripe\Core\Injector\Injector; |
|
| 8 | 7 | use SilverStripe\Forms\TextareaField; |
| 9 | 8 | use SilverStripe\Forms\NullableField; |
| 10 | 9 | use SilverStripe\Forms\TextField; |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use SilverStripe\ORM\DataQuery; |
| 6 | 6 | use SilverStripe\ORM\DB; |
| 7 | -use InvalidArgumentException; |
|
| 8 | 7 | |
| 9 | 8 | /** |
| 10 | 9 | * Matches textual content with a LIKE '%keyword%' construct. |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace SilverStripe\ORM\Queries; |
| 4 | 4 | |
| 5 | 5 | use SilverStripe\Core\Injector\Injector; |
| 6 | -use SilverStripe\Dev\Deprecation; |
|
| 7 | 6 | use SilverStripe\ORM\DB; |
| 8 | 7 | use InvalidArgumentException; |
| 9 | 8 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | /** |
| 67 | 67 | * Construct a new SQLSelect. |
| 68 | 68 | * |
| 69 | - * @param array|string $select An array of SELECT fields. |
|
| 69 | + * @param string $select An array of SELECT fields. |
|
| 70 | 70 | * @param array|string $from An array of FROM clauses. The first one should be just the table name. |
| 71 | 71 | * Each should be ANSI quoted. |
| 72 | 72 | * @param array $where An array of WHERE clauses. |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | * |
| 379 | 379 | * @param string $value |
| 380 | 380 | * @param string $defaultDirection |
| 381 | - * @return array A two element array: array($column, $direction) |
|
| 381 | + * @return string[] A two element array: array($column, $direction) |
|
| 382 | 382 | */ |
| 383 | 383 | private function getDirectionFromString($value, $defaultDirection = null) |
| 384 | 384 | { |
@@ -480,7 +480,6 @@ discard block |
||
| 480 | 480 | * @see SQLSelect::addWhere() for syntax examples |
| 481 | 481 | * |
| 482 | 482 | * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries |
| 483 | - * @param mixed $having,... Unlimited additional predicates |
|
| 484 | 483 | * @return $this Self reference |
| 485 | 484 | */ |
| 486 | 485 | public function setHaving($having) |
@@ -496,7 +495,6 @@ discard block |
||
| 496 | 495 | * @see SQLSelect::addWhere() for syntax examples |
| 497 | 496 | * |
| 498 | 497 | * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries |
| 499 | - * @param mixed $having,... Unlimited additional predicates |
|
| 500 | 498 | * @return $this Self reference |
| 501 | 499 | */ |
| 502 | 500 | public function addHaving($having) |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use SilverStripe\ORM\SS_List; |
| 8 | 8 | use SilverStripe\ORM\ArrayList; |
| 9 | 9 | use SilverStripe\ORM\DataObjectInterface; |
| 10 | -use SilverStripe\View\Requirements; |
|
| 11 | 10 | use InvalidArgumentException; |
| 12 | 11 | |
| 13 | 12 | /** |
@@ -409,6 +409,7 @@ |
||
| 409 | 409 | * Overloaded to ensure the code is always descent. |
| 410 | 410 | * |
| 411 | 411 | * @param string |
| 412 | + * @param string $val |
|
| 412 | 413 | */ |
| 413 | 414 | public function setCode($val) |
| 414 | 415 | { |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use SilverStripe\ORM\SS_List; |
| 8 | 8 | use SilverStripe\ORM\ArrayList; |
| 9 | 9 | use SilverStripe\ORM\DataObjectInterface; |
| 10 | -use SilverStripe\View\Requirements; |
|
| 11 | 10 | use InvalidArgumentException; |
| 12 | 11 | |
| 13 | 12 | /** |
@@ -423,7 +423,7 @@ discard block |
||
| 423 | 423 | * Check if this file can be modified |
| 424 | 424 | * |
| 425 | 425 | * @param Member $member |
| 426 | - * @return boolean |
|
| 426 | + * @return boolean|string |
|
| 427 | 427 | */ |
| 428 | 428 | public function canEdit($member = null) |
| 429 | 429 | { |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | * |
| 445 | 445 | * @param Member $member |
| 446 | 446 | * @param array $context |
| 447 | - * @return boolean |
|
| 447 | + * @return boolean|string |
|
| 448 | 448 | */ |
| 449 | 449 | public function canCreate($member = null, $context = array()) |
| 450 | 450 | { |
@@ -464,7 +464,7 @@ discard block |
||
| 464 | 464 | * Check if this file can be deleted |
| 465 | 465 | * |
| 466 | 466 | * @param Member $member |
| 467 | - * @return boolean |
|
| 467 | + * @return boolean|string |
|
| 468 | 468 | */ |
| 469 | 469 | public function canDelete($member = null) |
| 470 | 470 | { |
@@ -697,7 +697,7 @@ discard block |
||
| 697 | 697 | * |
| 698 | 698 | * @param string $condition The PHP condition to be evaluated. The page will be called $item |
| 699 | 699 | * @param array $collator An array, passed by reference, to collect all of the matching descendants. |
| 700 | - * @return true|null |
|
| 700 | + * @return boolean|null |
|
| 701 | 701 | */ |
| 702 | 702 | public function collateDescendants($condition, &$collator) |
| 703 | 703 | { |
@@ -1089,6 +1089,7 @@ discard block |
||
| 1089 | 1089 | * |
| 1090 | 1090 | * @param String File extension, without dot prefix. Use an asterisk ('*') |
| 1091 | 1091 | * to specify a generic fallback if no mapping is found for an extension. |
| 1092 | + * @param string $ext |
|
| 1092 | 1093 | * @return String Classname for a subclass of {@link File} |
| 1093 | 1094 | */ |
| 1094 | 1095 | public static function get_class_for_file_extension($ext) |
@@ -1248,7 +1249,6 @@ discard block |
||
| 1248 | 1249 | * Note that the result will not have a leading slash, and should not be used |
| 1249 | 1250 | * with local file paths. |
| 1250 | 1251 | * |
| 1251 | - * @param string $part,... Parts |
|
| 1252 | 1252 | * @return string |
| 1253 | 1253 | */ |
| 1254 | 1254 | public static function join_paths($part = null) |