@@ -762,7 +762,6 @@ |
||
762 | 762 | * Name a variant based on a format with arbitrary parameters |
763 | 763 | * |
764 | 764 | * @param string $format The format name. |
765 | - * @param mixed $arg,... Additional arguments |
|
766 | 765 | * @return string |
767 | 766 | * @throws InvalidArgumentException |
768 | 767 | */ |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | * Set a different instance than {@link Upload_Validator} |
115 | 115 | * for this upload session. |
116 | 116 | * |
117 | - * @param object $validator |
|
117 | + * @param Upload_Validator $validator |
|
118 | 118 | */ |
119 | 119 | public function setValidator($validator) { |
120 | 120 | $this->validator = $validator; |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | /** |
364 | 364 | * Determines wether previous operations caused an error. |
365 | 365 | * |
366 | - * @return boolean |
|
366 | + * @return integer |
|
367 | 367 | */ |
368 | 368 | public function isError() { |
369 | 369 | return (count($this->errors)); |
@@ -147,7 +147,7 @@ |
||
147 | 147 | * @see http://uk3.php.net/manual/en/function.setcookie.php |
148 | 148 | * |
149 | 149 | * @param string $name The name of the cookie |
150 | - * @param string|array $value The value for the cookie to hold |
|
150 | + * @param false|string $value The value for the cookie to hold |
|
151 | 151 | * @param int $expiry The number of days until expiry |
152 | 152 | * @param string $path The path to save the cookie on (falls back to site base) |
153 | 153 | * @param string $domain The domain to make the cookie available on |
@@ -534,7 +534,7 @@ discard block |
||
534 | 534 | * Returns the domain part of the URL 'http://www.mysite.com'. Returns FALSE is this environment |
535 | 535 | * variable isn't set. |
536 | 536 | * |
537 | - * @return bool|string |
|
537 | + * @return string|false |
|
538 | 538 | */ |
539 | 539 | public static function protocolAndHost() { |
540 | 540 | $alternate = Config::inst()->get('Director', 'alternate_base_url'); |
@@ -869,7 +869,7 @@ discard block |
||
869 | 869 | /** |
870 | 870 | * Returns true if the given file exists. Filename should be relative to the site root. |
871 | 871 | * |
872 | - * @param $file |
|
872 | + * @param string $file |
|
873 | 873 | * |
874 | 874 | * @return bool |
875 | 875 | */ |
@@ -1087,7 +1087,7 @@ discard block |
||
1087 | 1087 | * Can also be checked with {@link Director::isDev()}, {@link Director::isTest()}, and |
1088 | 1088 | * {@link Director::isLive()}. |
1089 | 1089 | * |
1090 | - * @return bool|string |
|
1090 | + * @return string|false |
|
1091 | 1091 | */ |
1092 | 1092 | public static function get_environment_type() { |
1093 | 1093 | if(Director::isLive()) { |
@@ -390,7 +390,7 @@ |
||
390 | 390 | } |
391 | 391 | |
392 | 392 | /** |
393 | - * @return Email|ViewableData_Customised |
|
393 | + * @return ViewableData |
|
394 | 394 | */ |
395 | 395 | protected function templateData() { |
396 | 396 | if($this->template_data) { |
@@ -321,7 +321,7 @@ |
||
321 | 321 | /** |
322 | 322 | * Encode an array of parts using multipart |
323 | 323 | * |
324 | - * @param array $parts List of parts |
|
324 | + * @param string[] $parts List of parts |
|
325 | 325 | * @param string $contentType Content-type of parts |
326 | 326 | * @param array $headers Existing headers to include in response |
327 | 327 | * @return array Array with two items, the body followed by headers |
@@ -227,6 +227,7 @@ |
||
227 | 227 | * via the standard template inclusion process. |
228 | 228 | * |
229 | 229 | * @param string |
230 | + * @param string|null $template |
|
230 | 231 | */ |
231 | 232 | public function setTemplate($template) { |
232 | 233 | $this->template = $template; |
@@ -297,6 +297,9 @@ discard block |
||
297 | 297 | } |
298 | 298 | } |
299 | 299 | |
300 | + /** |
|
301 | + * @param string $name |
|
302 | + */ |
|
300 | 303 | public function inst_set($name, $val) { |
301 | 304 | // Quicker execution path for "."-free names |
302 | 305 | if(strpos($name, '.') === false) { |
@@ -345,6 +348,9 @@ discard block |
||
345 | 348 | $diffVar[sizeof($var)-1] = $val; |
346 | 349 | } |
347 | 350 | |
351 | + /** |
|
352 | + * @param string $name |
|
353 | + */ |
|
348 | 354 | public function inst_get($name) { |
349 | 355 | // Quicker execution path for "."-free names |
350 | 356 | if(strpos($name, '.') === false) { |
@@ -483,11 +483,17 @@ discard block |
||
483 | 483 | |
484 | 484 | protected $extraConfigSources = array(); |
485 | 485 | |
486 | + /** |
|
487 | + * @param string $class |
|
488 | + */ |
|
486 | 489 | public function extraConfigSourcesChanged($class) { |
487 | 490 | unset($this->extraConfigSources[$class]); |
488 | 491 | $this->cache->clean("__{$class}"); |
489 | 492 | } |
490 | 493 | |
494 | + /** |
|
495 | + * @param integer $sourceOptions |
|
496 | + */ |
|
491 | 497 | protected function getUncached($class, $name, $sourceOptions, &$result, $suppress, &$tags) { |
492 | 498 | $tags[] = "__{$class}"; |
493 | 499 | $tags[] = "__{$class}__{$name}"; |
@@ -575,7 +581,7 @@ discard block |
||
575 | 581 | * caching heavily here. |
576 | 582 | * |
577 | 583 | * @param $class string - The name of the class to get the value for |
578 | - * @param $name string - The property to get the value for |
|
584 | + * @param string $name string - The property to get the value for |
|
579 | 585 | * @param int $sourceOptions Bitmask which can be set to some combintain of Config::UNINHERITED, |
580 | 586 | * Config::FIRST_SET, and Config::EXCLUDE_EXTENSIONS. |
581 | 587 | * |