@@ -1,6 +1,5 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -use SilverStripe\Dev\Debug; |
|
4 | 3 | use SilverStripe\ORM\DataObjectSchema; |
5 | 4 | use SilverStripe\ORM\DB; |
6 | 5 | use SilverStripe\ORM\HasManyList; |
@@ -408,7 +408,7 @@ discard block |
||
408 | 408 | * Check if this file can be modified |
409 | 409 | * |
410 | 410 | * @param Member $member |
411 | - * @return boolean |
|
411 | + * @return boolean|string |
|
412 | 412 | */ |
413 | 413 | public function canEdit($member = null) { |
414 | 414 | if(!$member) { |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | * |
429 | 429 | * @param Member $member |
430 | 430 | * @param array $context |
431 | - * @return boolean |
|
431 | + * @return boolean|string |
|
432 | 432 | */ |
433 | 433 | public function canCreate($member = null, $context = array()) { |
434 | 434 | if(!$member) { |
@@ -447,7 +447,7 @@ discard block |
||
447 | 447 | * Check if this file can be deleted |
448 | 448 | * |
449 | 449 | * @param Member $member |
450 | - * @return boolean |
|
450 | + * @return boolean|string |
|
451 | 451 | */ |
452 | 452 | public function canDelete($member = null) { |
453 | 453 | if(!$member) { |
@@ -643,7 +643,7 @@ discard block |
||
643 | 643 | * |
644 | 644 | * @param string $condition The PHP condition to be evaluated. The page will be called $item |
645 | 645 | * @param array $collator An array, passed by reference, to collect all of the matching descendants. |
646 | - * @return true|null |
|
646 | + * @return boolean|null |
|
647 | 647 | */ |
648 | 648 | public function collateDescendants($condition, &$collator) { |
649 | 649 | if($children = $this->Children()) { |
@@ -1016,6 +1016,7 @@ discard block |
||
1016 | 1016 | * |
1017 | 1017 | * @param String File extension, without dot prefix. Use an asterisk ('*') |
1018 | 1018 | * to specify a generic fallback if no mapping is found for an extension. |
1019 | + * @param string $ext |
|
1019 | 1020 | * @return String Classname for a subclass of {@link File} |
1020 | 1021 | */ |
1021 | 1022 | public static function get_class_for_file_extension($ext) { |
@@ -1159,7 +1160,6 @@ discard block |
||
1159 | 1160 | * Note that the result will not have a leading slash, and should not be used |
1160 | 1161 | * with local file paths. |
1161 | 1162 | * |
1162 | - * @param string $part,... Parts |
|
1163 | 1163 | * @return string |
1164 | 1164 | */ |
1165 | 1165 | public static function join_paths($part = null) { |
@@ -40,6 +40,9 @@ |
||
40 | 40 | ] |
41 | 41 | ); |
42 | 42 | |
43 | + /** |
|
44 | + * @param string $root |
|
45 | + */ |
|
43 | 46 | public function __construct($root = null, $writeFlags = LOCK_EX, $linkHandling = self::DISALLOW_LINKS) { |
44 | 47 | // Get root path |
45 | 48 | $root = $this->findRoot($root); |
@@ -57,7 +57,7 @@ |
||
57 | 57 | * Find the given folder or create it as a database record |
58 | 58 | * |
59 | 59 | * @param string $folderPath Directory path relative to assets root |
60 | - * @return Folder|null |
|
60 | + * @return null|\SilverStripe\ORM\DataObject |
|
61 | 61 | */ |
62 | 62 | public static function find_or_make($folderPath) { |
63 | 63 | // replace leading and trailing slashes |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | * Check if this image has previously crashed GD when attempting to open it - if it's opened |
192 | 192 | * successfully, the manipulation's cache key is removed. |
193 | 193 | * |
194 | - * @param string $arg,... Any number of args that identify this image |
|
194 | + * @param string $arg |
|
195 | 195 | * @return bool True if failed |
196 | 196 | */ |
197 | 197 | public function failedResample($arg = null) { |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | /** |
203 | 203 | * Mark a file as failed |
204 | 204 | * |
205 | - * @param string $arg,... Any number of args that identify this image |
|
205 | + * @param string $arg |
|
206 | 206 | */ |
207 | 207 | protected function markFailed($arg = null) { |
208 | 208 | $key = sha1(implode('|', func_get_args())); |
@@ -212,7 +212,6 @@ discard block |
||
212 | 212 | /** |
213 | 213 | * Mark a file as succeeded |
214 | 214 | * |
215 | - * @param string $arg,... Any number of args that identify this image |
|
216 | 215 | */ |
217 | 216 | protected function markSucceeded($arg = null) { |
218 | 217 | $key = sha1(implode('|', func_get_args())); |
@@ -363,7 +362,7 @@ discard block |
||
363 | 362 | * using built-in function. Used when imagerotate function is not available(i.e. Ubuntu) |
364 | 363 | * |
365 | 364 | * @param float $angle Angle in degrees |
366 | - * @return static |
|
365 | + * @return null|resource |
|
367 | 366 | */ |
368 | 367 | public function rotatePixelByPixel($angle) { |
369 | 368 | if(!$this->gd) { |
@@ -762,7 +762,6 @@ |
||
762 | 762 | * Name a variant based on a format with arbitrary parameters |
763 | 763 | * |
764 | 764 | * @param string $format The format name. |
765 | - * @param mixed $arg,... Additional arguments |
|
766 | 765 | * @return string |
767 | 766 | * @throws InvalidArgumentException |
768 | 767 | */ |
@@ -12,7 +12,6 @@ |
||
12 | 12 | use SilverStripe\ORM\ValidationException; |
13 | 13 | use SilverStripe\ORM\FieldType\DBComposite; |
14 | 14 | use SilverStripe\Security\Permission; |
15 | -use SilverStripe\Core\Convert; |
|
16 | 15 | |
17 | 16 | /** |
18 | 17 | * Represents a file reference stored in a database |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | * Set a different instance than {@link Upload_Validator} |
115 | 115 | * for this upload session. |
116 | 116 | * |
117 | - * @param object $validator |
|
117 | + * @param Upload_Validator $validator |
|
118 | 118 | */ |
119 | 119 | public function setValidator($validator) { |
120 | 120 | $this->validator = $validator; |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | /** |
364 | 364 | * Determines wether previous operations caused an error. |
365 | 365 | * |
366 | - * @return boolean |
|
366 | + * @return integer |
|
367 | 367 | */ |
368 | 368 | public function isError() { |
369 | 369 | return (count($this->errors)); |
@@ -142,6 +142,7 @@ discard block |
||
142 | 142 | * {@inheritdoc} |
143 | 143 | * |
144 | 144 | * Also set the URLParams |
145 | + * @param HTTPRequest $request |
|
145 | 146 | */ |
146 | 147 | public function setRequest($request) { |
147 | 148 | $return = parent::setRequest($request); |
@@ -501,7 +502,7 @@ discard block |
||
501 | 502 | * |
502 | 503 | * @param array $params |
503 | 504 | * |
504 | - * @return string |
|
505 | + * @return DBHTMLText |
|
505 | 506 | */ |
506 | 507 | public function render($params = null) { |
507 | 508 | $template = $this->getViewer($this->getAction()); |
@@ -664,7 +665,7 @@ discard block |
||
664 | 665 | * Tests whether a redirection has been requested. If redirect() has been called, it will return |
665 | 666 | * the URL redirected to. Otherwise, it will return null. |
666 | 667 | * |
667 | - * @return null|string |
|
668 | + * @return boolean |
|
668 | 669 | */ |
669 | 670 | public function redirectedTo() { |
670 | 671 | return $this->getResponse() && $this->getResponse()->getHeader('Location'); |
@@ -695,7 +696,6 @@ discard block |
||
695 | 696 | * |
696 | 697 | * Caution: All parameters are expected to be URI-encoded already. |
697 | 698 | * |
698 | - * @param string|array $arg,.. One or more link segments, or list of link segments as an array |
|
699 | 699 | * @return string |
700 | 700 | */ |
701 | 701 | public static function join_links($arg = null) { |