@@ -165,6 +165,11 @@ |
||
165 | 165 | return sprintf('%02d', self::$cost) . '$' . substr($generator->randomToken('sha1'), 0, 22); |
166 | 166 | } |
167 | 167 | |
168 | + /** |
|
169 | + * @param string|false $hash |
|
170 | + * @param string $password |
|
171 | + * @param string $salt |
|
172 | + */ |
|
168 | 173 | public function check($hash, $password, $salt = null, $member = null) |
169 | 174 | { |
170 | 175 | if (strpos($hash, '$2y$') === 0) { |
@@ -390,7 +390,7 @@ |
||
390 | 390 | /** |
391 | 391 | * Fields can have action to, let's check if anyone of the responds to $funcname them |
392 | 392 | * |
393 | - * @param SS_List|array $fields |
|
393 | + * @param FieldList $fields |
|
394 | 394 | * @param callable $funcName |
395 | 395 | * @return FormField |
396 | 396 | */ |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | /** |
79 | 79 | * Determine if apcu is supported |
80 | 80 | * |
81 | - * @return bool |
|
81 | + * @return boolean|null |
|
82 | 82 | */ |
83 | 83 | protected function isAPCUSupported() |
84 | 84 | { |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | /** |
93 | 93 | * Determine if PHP files is supported |
94 | 94 | * |
95 | - * @return bool |
|
95 | + * @return boolean|null |
|
96 | 96 | */ |
97 | 97 | protected function isPHPFilesSupported() |
98 | 98 | { |
@@ -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 | { |