@@ -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") |