@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | * table, or column name. Supports encoding of multi identfiers separated by |
204 | 204 | * a delimiter (e.g. ".") |
205 | 205 | * |
206 | - * @param string|array $identifier The identifier to escape. E.g. 'SiteTree.Title' or list of identifiers |
|
206 | + * @param string $identifier The identifier to escape. E.g. 'SiteTree.Title' or list of identifiers |
|
207 | 207 | * to be joined via the separator. |
208 | 208 | * @param string $separator The string that delimits subsequent identifiers |
209 | 209 | * @return string The escaped identifier. E.g. '"SiteTree"."Title"' |
@@ -304,6 +304,7 @@ discard block |
||
304 | 304 | * call this function directly, Please use {@link Convert::xml2array()} |
305 | 305 | * |
306 | 306 | * @param SimpleXMLElement |
307 | + * @param SimpleXMLElement $xml |
|
307 | 308 | * |
308 | 309 | * @return mixed |
309 | 310 | */ |
@@ -517,7 +518,7 @@ discard block |
||
517 | 518 | * - IDField => idField |
518 | 519 | * - iDField => iDField |
519 | 520 | * |
520 | - * @param $str |
|
521 | + * @param string $str |
|
521 | 522 | * @return string |
522 | 523 | */ |
523 | 524 | public static function upperCamelToLowerCamel($str) |
@@ -140,6 +140,10 @@ |
||
140 | 140 | * |
141 | 141 | * @return BulkLoader_Result See {@link self::processAll()} |
142 | 142 | */ |
143 | + |
|
144 | + /** |
|
145 | + * @param string $filepath |
|
146 | + */ |
|
143 | 147 | public function load($filepath) |
144 | 148 | { |
145 | 149 | increase_time_limit_to(3600); |
@@ -151,7 +151,7 @@ |
||
151 | 151 | * Get the current value of an option |
152 | 152 | * |
153 | 153 | * @param string $key The key of the option to get |
154 | - * @return mixed The value of the specified option |
|
154 | + * @return string The value of the specified option |
|
155 | 155 | */ |
156 | 156 | abstract public function getOption($key); |
157 | 157 |
@@ -36,7 +36,7 @@ |
||
36 | 36 | |
37 | 37 | /** |
38 | 38 | * @param string $name |
39 | - * @param string|FormField $content |
|
39 | + * @param string $content |
|
40 | 40 | */ |
41 | 41 | public function __construct($name, $content) |
42 | 42 | { |
@@ -141,12 +141,7 @@ |
||
141 | 141 | * @param string $entity Entity that identifies the string. It must be in the form |
142 | 142 | * "Namespace.Entity" where Namespace will be usually the class name where this |
143 | 143 | * string is used and Entity identifies the string inside the namespace. |
144 | - * @param mixed $arg,... Additional arguments are parsed as such: |
|
145 | - * - Next string argument is a default. Pass in a `|` pipe-delimited value with `{count}` |
|
146 | - * to do pluralisation. |
|
147 | - * - Any other string argument after default is context for i18nTextCollector |
|
148 | - * - Any array argument in any order is an injection parameter list. Pass in a `count` |
|
149 | - * injection parameter to pluralise. |
|
144 | + * @param string $arg |
|
150 | 145 | * @return string |
151 | 146 | */ |
152 | 147 | public static function _t($entity, $arg = null) |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | * column. Can contain a relation name in dot notation, which will automatically join |
75 | 75 | * the necessary tables (e.g. "Comments.Name" to join the "Comments" has-many relationship and |
76 | 76 | * search the "Name" column when applying this filter to a SiteTree class). |
77 | - * @param mixed $value |
|
77 | + * @param string $value |
|
78 | 78 | * @param array $modifiers |
79 | 79 | */ |
80 | 80 | public function __construct($fullName = null, $value = false, array $modifiers = array()) |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | /** |
189 | 189 | * Gets supported modifiers for this filter |
190 | 190 | * |
191 | - * @return array |
|
191 | + * @return string[] |
|
192 | 192 | */ |
193 | 193 | public function getSupportedModifiers() |
194 | 194 | { |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | /** |
429 | 429 | * Determines case sensitivity based on {@link getModifiers()}. |
430 | 430 | * |
431 | - * @return Mixed TRUE or FALSE to enforce sensitivity, NULL to use field collation. |
|
431 | + * @return boolean|null TRUE or FALSE to enforce sensitivity, NULL to use field collation. |
|
432 | 432 | */ |
433 | 433 | protected function getCaseSensitive() |
434 | 434 | { |
@@ -349,7 +349,7 @@ discard block |
||
349 | 349 | * Remove an existing HTTP header |
350 | 350 | * |
351 | 351 | * @param string $header |
352 | - * @return mixed |
|
352 | + * @return string |
|
353 | 353 | */ |
354 | 354 | public function getHeader($header) |
355 | 355 | { |
@@ -458,9 +458,9 @@ discard block |
||
458 | 458 | * it's only advisable to send small files through this method. |
459 | 459 | * |
460 | 460 | * @static |
461 | - * @param $fileData |
|
461 | + * @param string $fileData |
|
462 | 462 | * @param $fileName |
463 | - * @param null $mimeType |
|
463 | + * @param string $mimeType |
|
464 | 464 | * @return HTTPResponse |
465 | 465 | */ |
466 | 466 | public static function send_file($fileData, $fileName, $mimeType = null) |
@@ -596,6 +596,7 @@ discard block |
||
596 | 596 | * Set actions that are exempt from validation |
597 | 597 | * |
598 | 598 | * @param array |
599 | + * @param string[] $actions |
|
599 | 600 | * @return $this |
600 | 601 | */ |
601 | 602 | public function setValidationExemptActions($actions) |
@@ -1043,7 +1044,7 @@ discard block |
||
1043 | 1044 | * If set to false (the default), then the form method is only used to construct the default |
1044 | 1045 | * form. |
1045 | 1046 | * |
1046 | - * @param $bool boolean |
|
1047 | + * @param boolean $bool boolean |
|
1047 | 1048 | * @return $this |
1048 | 1049 | */ |
1049 | 1050 | public function setStrictFormMethodCheck($bool) |
@@ -883,9 +883,9 @@ discard block |
||
883 | 883 | * }); |
884 | 884 | * </code> |
885 | 885 | * |
886 | - * @param Member|null|int $member Member or member ID to log in as. |
|
886 | + * @param Member|null $member Member or member ID to log in as. |
|
887 | 887 | * Set to null or 0 to act as a logged out user. |
888 | - * @param $callback |
|
888 | + * @param \Closure $callback |
|
889 | 889 | */ |
890 | 890 | public static function actAs($member, $callback) |
891 | 891 | { |
@@ -1732,7 +1732,7 @@ discard block |
||
1732 | 1732 | * This is likely to be customized for social sites etc. with a looser permission model. |
1733 | 1733 | * |
1734 | 1734 | * @param Member $member |
1735 | - * @return bool |
|
1735 | + * @return boolean|string |
|
1736 | 1736 | */ |
1737 | 1737 | public function canView($member = null) |
1738 | 1738 | { |
@@ -1763,7 +1763,7 @@ discard block |
||
1763 | 1763 | * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions |
1764 | 1764 | * |
1765 | 1765 | * @param Member $member |
1766 | - * @return bool |
|
1766 | + * @return boolean|string |
|
1767 | 1767 | */ |
1768 | 1768 | public function canEdit($member = null) |
1769 | 1769 | { |
@@ -1798,7 +1798,7 @@ discard block |
||
1798 | 1798 | * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions |
1799 | 1799 | * |
1800 | 1800 | * @param Member $member |
1801 | - * @return bool |
|
1801 | + * @return boolean|string |
|
1802 | 1802 | */ |
1803 | 1803 | public function canDelete($member = null) |
1804 | 1804 | { |