@@ -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 | { |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | * |
250 | 250 | * @param string $url The URL to visit. |
251 | 251 | * @param array $postVars The $_POST & $_FILES variables. |
252 | - * @param array|Session $session The {@link Session} object representing the current session. |
|
252 | + * @param Session|null $session The {@link Session} object representing the current session. |
|
253 | 253 | * By passing the same object to multiple calls of Director::test(), you can simulate a persisted |
254 | 254 | * session. |
255 | 255 | * @param string $httpMethod The HTTP method, such as GET or POST. It will default to POST if |
@@ -928,7 +928,7 @@ discard block |
||
928 | 928 | /** |
929 | 929 | * Returns true if the given file exists. Filename should be relative to the site root. |
930 | 930 | * |
931 | - * @param $file |
|
931 | + * @param string $file |
|
932 | 932 | * |
933 | 933 | * @return bool |
934 | 934 | */ |
@@ -1156,7 +1156,7 @@ discard block |
||
1156 | 1156 | * Can also be checked with {@link Director::isDev()}, {@link Director::isTest()}, and |
1157 | 1157 | * {@link Director::isLive()}. |
1158 | 1158 | * |
1159 | - * @return bool |
|
1159 | + * @return string |
|
1160 | 1160 | */ |
1161 | 1161 | public static function get_environment_type() |
1162 | 1162 | { |
@@ -184,6 +184,9 @@ discard block |
||
184 | 184 | return self::$is_running_test; |
185 | 185 | } |
186 | 186 | |
187 | + /** |
|
188 | + * @param boolean $bool |
|
189 | + */ |
|
187 | 190 | public static function set_is_running_test($bool) |
188 | 191 | { |
189 | 192 | self::$is_running_test = $bool; |
@@ -662,10 +665,10 @@ discard block |
||
662 | 665 | /** |
663 | 666 | * Assert that the matching email was sent since the last call to clearEmails() |
664 | 667 | * All of the parameters can either be a string, or, if they start with "/", a PREG-compatible regular expression. |
665 | - * @param $to |
|
668 | + * @param string $to |
|
666 | 669 | * @param $from |
667 | - * @param $subject |
|
668 | - * @param $content |
|
670 | + * @param string $subject |
|
671 | + * @param string $content |
|
669 | 672 | * @return array Contains the keys: 'type', 'to', 'from', 'subject', 'content', 'plainContent', 'attachedFiles', |
670 | 673 | * 'customHeaders', 'htmlContent', inlineImages' |
671 | 674 | */ |
@@ -898,7 +901,7 @@ discard block |
||
898 | 901 | * @param string $expectedSQL |
899 | 902 | * @param string $actualSQL |
900 | 903 | * @param string $message |
901 | - * @param float|int $delta |
|
904 | + * @param integer $delta |
|
902 | 905 | * @param integer $maxDepth |
903 | 906 | * @param boolean $canonicalize |
904 | 907 | * @param boolean $ignoreCase |
@@ -1186,7 +1189,7 @@ discard block |
||
1186 | 1189 | * Create a member and group with the given permission code, and log in with it. |
1187 | 1190 | * Returns the member ID. |
1188 | 1191 | * |
1189 | - * @param string|array $permCode Either a permission, or list of permissions |
|
1192 | + * @param string $permCode Either a permission, or list of permissions |
|
1190 | 1193 | * @return int Member ID |
1191 | 1194 | */ |
1192 | 1195 | public function logInWithPermission($permCode = "ADMIN") |
@@ -556,7 +556,7 @@ discard block |
||
556 | 556 | * Check if the given field specification could be interpreted as an unquoted relation name |
557 | 557 | * |
558 | 558 | * @param string $field |
559 | - * @return bool |
|
559 | + * @return integer |
|
560 | 560 | */ |
561 | 561 | protected function isValidRelationName($field) |
562 | 562 | { |
@@ -669,7 +669,7 @@ discard block |
||
669 | 669 | * @param int $order A numerical index to control the order that joins are added to the query; lower order values |
670 | 670 | * will cause the query to appear first. The default is 20, and joins created automatically by the |
671 | 671 | * ORM have a value of 10. |
672 | - * @param array $parameters Any additional parameters if the join is a parameterised subquery |
|
672 | + * @param string[] $parameters Any additional parameters if the join is a parameterised subquery |
|
673 | 673 | * @return static |
674 | 674 | */ |
675 | 675 | public function innerJoin($table, $onClause, $alias = null, $order = 20, $parameters = array()) |
@@ -688,7 +688,7 @@ discard block |
||
688 | 688 | * @param int $order A numerical index to control the order that joins are added to the query; lower order values |
689 | 689 | * will cause the query to appear first. The default is 20, and joins created automatically by the |
690 | 690 | * ORM have a value of 10. |
691 | - * @param array $parameters Any additional parameters if the join is a parameterised subquery |
|
691 | + * @param string[] $parameters Any additional parameters if the join is a parameterised subquery |
|
692 | 692 | * @return static |
693 | 693 | */ |
694 | 694 | public function leftJoin($table, $onClause, $alias = null, $order = 20, $parameters = array()) |
@@ -836,7 +836,7 @@ discard block |
||
836 | 836 | * Return the maximum value of the given field in this DataList |
837 | 837 | * |
838 | 838 | * @param string $fieldName |
839 | - * @return mixed |
|
839 | + * @return string |
|
840 | 840 | */ |
841 | 841 | public function max($fieldName) |
842 | 842 | { |
@@ -847,7 +847,7 @@ discard block |
||
847 | 847 | * Return the minimum value of the given field in this DataList |
848 | 848 | * |
849 | 849 | * @param string $fieldName |
850 | - * @return mixed |
|
850 | + * @return string |
|
851 | 851 | */ |
852 | 852 | public function min($fieldName) |
853 | 853 | { |
@@ -858,7 +858,7 @@ discard block |
||
858 | 858 | * Return the average value of the given field in this DataList |
859 | 859 | * |
860 | 860 | * @param string $fieldName |
861 | - * @return mixed |
|
861 | + * @return string |
|
862 | 862 | */ |
863 | 863 | public function avg($fieldName) |
864 | 864 | { |
@@ -869,7 +869,7 @@ discard block |
||
869 | 869 | * Return the sum of the values of the given field in this DataList |
870 | 870 | * |
871 | 871 | * @param string $fieldName |
872 | - * @return mixed |
|
872 | + * @return string |
|
873 | 873 | */ |
874 | 874 | public function sum($fieldName) |
875 | 875 | { |
@@ -928,7 +928,7 @@ discard block |
||
928 | 928 | /** |
929 | 929 | * Restrict the columns to fetch into this DataList |
930 | 930 | * |
931 | - * @param array $queriedColumns |
|
931 | + * @param string[] $queriedColumns |
|
932 | 932 | * @return static |
933 | 933 | */ |
934 | 934 | public function setQueriedColumns($queriedColumns) |
@@ -1174,7 +1174,7 @@ discard block |
||
1174 | 1174 | /** |
1175 | 1175 | * Returns item stored in list with index $key |
1176 | 1176 | * |
1177 | - * @param mixed $key |
|
1177 | + * @param integer $key |
|
1178 | 1178 | * @return DataObject |
1179 | 1179 | */ |
1180 | 1180 | public function offsetGet($key) |