@@ -47,6 +47,9 @@ discard block |
||
47 | 47 | */ |
48 | 48 | protected $token = null; |
49 | 49 | |
50 | + /** |
|
51 | + * @param string $token |
|
52 | + */ |
|
50 | 53 | protected function pathForToken($token) |
51 | 54 | { |
52 | 55 | return TEMP_FOLDER.'/token_'.preg_replace('/[^a-z0-9]+/', '', $token); |
@@ -222,7 +225,7 @@ discard block |
||
222 | 225 | * Given a list of token names, suppress all tokens that have not been validated, and |
223 | 226 | * return the non-validated token with the highest priority |
224 | 227 | * |
225 | - * @param array $keys List of token keys in ascending priority (low to high) |
|
228 | + * @param string[] $keys List of token keys in ascending priority (low to high) |
|
226 | 229 | * @param HTTPRequest $request |
227 | 230 | * @return ParameterConfirmationToken The token container for the unvalidated $key given with the highest priority |
228 | 231 | */ |
@@ -141,6 +141,10 @@ |
||
141 | 141 | * |
142 | 142 | * @return BulkLoader_Result See {@link self::processAll()} |
143 | 143 | */ |
144 | + |
|
145 | + /** |
|
146 | + * @param string $filepath |
|
147 | + */ |
|
144 | 148 | public function load($filepath) |
145 | 149 | { |
146 | 150 | Environment::increaseTimeLimitTo(3600); |
@@ -284,6 +284,9 @@ |
||
284 | 284 | return $this->errors; |
285 | 285 | } |
286 | 286 | |
287 | + /** |
|
288 | + * @param string $filename |
|
289 | + */ |
|
287 | 290 | public function writeToFile($filename, $content) |
288 | 291 | { |
289 | 292 | $base = $this->getBaseDir(); |
@@ -775,7 +775,7 @@ discard block |
||
775 | 775 | * @param string $expectedSQL |
776 | 776 | * @param string $actualSQL |
777 | 777 | * @param string $message |
778 | - * @param float|int $delta |
|
778 | + * @param integer $delta |
|
779 | 779 | * @param integer $maxDepth |
780 | 780 | * @param boolean $canonicalize |
781 | 781 | * @param boolean $ignoreCase |
@@ -1074,7 +1074,7 @@ discard block |
||
1074 | 1074 | * Create a member and group with the given permission code, and log in with it. |
1075 | 1075 | * Returns the member ID. |
1076 | 1076 | * |
1077 | - * @param string|array $permCode Either a permission, or list of permissions |
|
1077 | + * @param string $permCode Either a permission, or list of permissions |
|
1078 | 1078 | * @return int Member ID |
1079 | 1079 | */ |
1080 | 1080 | public function logInWithPermission($permCode = "ADMIN") |
@@ -53,12 +53,6 @@ |
||
53 | 53 | * @param string $entity Entity that identifies the string. It must be in the form |
54 | 54 | * "Namespace.Entity" where Namespace will be usually the class name where this |
55 | 55 | * string is used and Entity identifies the string inside the namespace. |
56 | - * @param mixed $arg,... Additional arguments are parsed as such: |
|
57 | - * - Next string argument is a default. Pass in a `|` pipe-delimeted value with `{count}` |
|
58 | - * to do pluralisation. |
|
59 | - * - Any other string argument after default is context for i18nTextCollector |
|
60 | - * - Any array argument in any order is an injection parameter list. Pass in a `count` |
|
61 | - * injection parameter to pluralise. |
|
62 | 56 | * @return string |
63 | 57 | */ |
64 | 58 | function _t($entity, $arg = null) |
@@ -2397,6 +2397,7 @@ discard block |
||
2397 | 2397 | |
2398 | 2398 | /** |
2399 | 2399 | * {@inheritdoc} |
2400 | + * @param string $field |
|
2400 | 2401 | */ |
2401 | 2402 | public function castingHelper($field) |
2402 | 2403 | { |
@@ -2502,7 +2503,7 @@ discard block |
||
2502 | 2503 | * </code> |
2503 | 2504 | * |
2504 | 2505 | * @param string $methodName Method on the same object, e.g. {@link canEdit()} |
2505 | - * @param Member|int $member |
|
2506 | + * @param null|Member $member |
|
2506 | 2507 | * @param array $context Optional context |
2507 | 2508 | * @return boolean|null |
2508 | 2509 | */ |
@@ -2525,7 +2526,7 @@ discard block |
||
2525 | 2526 | |
2526 | 2527 | /** |
2527 | 2528 | * @param Member $member |
2528 | - * @return boolean |
|
2529 | + * @return boolean|string |
|
2529 | 2530 | */ |
2530 | 2531 | public function canView($member = null) |
2531 | 2532 | { |
@@ -2538,7 +2539,7 @@ discard block |
||
2538 | 2539 | |
2539 | 2540 | /** |
2540 | 2541 | * @param Member $member |
2541 | - * @return boolean |
|
2542 | + * @return boolean|string |
|
2542 | 2543 | */ |
2543 | 2544 | public function canEdit($member = null) |
2544 | 2545 | { |
@@ -2551,7 +2552,7 @@ discard block |
||
2551 | 2552 | |
2552 | 2553 | /** |
2553 | 2554 | * @param Member $member |
2554 | - * @return boolean |
|
2555 | + * @return boolean|string |
|
2555 | 2556 | */ |
2556 | 2557 | public function canDelete($member = null) |
2557 | 2558 | { |
@@ -2566,7 +2567,7 @@ discard block |
||
2566 | 2567 | * @param Member $member |
2567 | 2568 | * @param array $context Additional context-specific data which might |
2568 | 2569 | * affect whether (or where) this object could be created. |
2569 | - * @return boolean |
|
2570 | + * @return boolean|string |
|
2570 | 2571 | */ |
2571 | 2572 | public function canCreate($member = null, $context = array()) |
2572 | 2573 | { |
@@ -2683,7 +2684,7 @@ discard block |
||
2683 | 2684 | * Traverses to a field referenced by relationships between data objects, returning the value |
2684 | 2685 | * The path to the related field is specified with dot separated syntax (eg: Parent.Child.Child.FieldName) |
2685 | 2686 | * |
2686 | - * @param $fieldName string |
|
2687 | + * @param string $fieldName string |
|
2687 | 2688 | * @return string | null - will return null on a missing value |
2688 | 2689 | */ |
2689 | 2690 | public function relField($fieldName) |
@@ -2762,7 +2763,7 @@ discard block |
||
2762 | 2763 | * @param string $callerClass The class of objects to be returned |
2763 | 2764 | * @param string|array $filter A filter to be inserted into the WHERE clause. |
2764 | 2765 | * Supports parameterised queries. See SQLSelect::addWhere() for syntax examples. |
2765 | - * @param string|array $sort A sort expression to be inserted into the ORDER |
|
2766 | + * @param string $sort A sort expression to be inserted into the ORDER |
|
2766 | 2767 | * BY clause. If omitted, self::$default_sort will be used. |
2767 | 2768 | * @param string $join Deprecated 3.0 Join clause. Use leftJoin($table, $joinClause) instead. |
2768 | 2769 | * @param string|array $limit A limit expression to be inserted into the LIMIT clause. |
@@ -20,6 +20,11 @@ |
||
20 | 20 | |
21 | 21 | protected $id; |
22 | 22 | |
23 | + /** |
|
24 | + * @param \SilverStripe\Forms\GridField\GridField $gridField |
|
25 | + * @param string $id |
|
26 | + * @param string $link |
|
27 | + */ |
|
23 | 28 | public function __construct($gridField, $id, $link) |
24 | 29 | { |
25 | 30 | $this->gridField = $gridField; |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | |
79 | 79 | /** |
80 | 80 | * @param Member $member |
81 | - * @return HTTPResponse |
|
81 | + * @return \SilverStripe\Control\HTTPResponse |
|
82 | 82 | */ |
83 | 83 | public function doLogOut($member) |
84 | 84 | { |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | } |
99 | 99 | |
100 | 100 | /** |
101 | - * @return HTTPResponse |
|
101 | + * @return \SilverStripe\Control\HTTPResponse |
|
102 | 102 | */ |
103 | 103 | protected function redirectAfterLogout() |
104 | 104 | { |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | * Only increases up to the maximum defined in {@link setMemoryLimitMax()}, |
52 | 52 | * and defaults to the 'memory_limit' setting in the PHP configuration. |
53 | 53 | * |
54 | - * @param string|float|int $memoryLimit A memory limit string, such as "64M". If omitted, unlimited memory will be set. |
|
54 | + * @param integer $memoryLimit A memory limit string, such as "64M". If omitted, unlimited memory will be set. |
|
55 | 55 | * @return bool true indicates a successful change, false a denied change. |
56 | 56 | */ |
57 | 57 | public static function increaseMemoryLimitTo($memoryLimit = -1) |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
99 | - * @return int Memory limit in bytes |
|
99 | + * @return double Memory limit in bytes |
|
100 | 100 | */ |
101 | 101 | public static function getMemoryLimitMax() |
102 | 102 | { |