@@ -555,7 +555,7 @@ discard block |
||
555 | 555 | * Returns the domain part of the URL 'http://www.mysite.com'. Returns FALSE is this environment |
556 | 556 | * variable isn't set. |
557 | 557 | * |
558 | - * @return bool|string |
|
558 | + * @return string|false |
|
559 | 559 | */ |
560 | 560 | public static function protocolAndHost() |
561 | 561 | { |
@@ -912,7 +912,7 @@ discard block |
||
912 | 912 | /** |
913 | 913 | * Returns true if the given file exists. Filename should be relative to the site root. |
914 | 914 | * |
915 | - * @param $file |
|
915 | + * @param string $file |
|
916 | 916 | * |
917 | 917 | * @return bool |
918 | 918 | */ |
@@ -1145,7 +1145,7 @@ discard block |
||
1145 | 1145 | * Can also be checked with {@link Director::isDev()}, {@link Director::isTest()}, and |
1146 | 1146 | * {@link Director::isLive()}. |
1147 | 1147 | * |
1148 | - * @return bool|string |
|
1148 | + * @return string|false |
|
1149 | 1149 | */ |
1150 | 1150 | public static function get_environment_type() |
1151 | 1151 | { |
@@ -433,7 +433,7 @@ |
||
433 | 433 | } |
434 | 434 | |
435 | 435 | /** |
436 | - * @return Email|ViewableData_Customised |
|
436 | + * @return ViewableData |
|
437 | 437 | */ |
438 | 438 | protected function templateData() |
439 | 439 | { |
@@ -344,7 +344,7 @@ |
||
344 | 344 | /** |
345 | 345 | * Encode an array of parts using multipart |
346 | 346 | * |
347 | - * @param array $parts List of parts |
|
347 | + * @param string[] $parts List of parts |
|
348 | 348 | * @param string $contentType Content-type of parts |
349 | 349 | * @param array $headers Existing headers to include in response |
350 | 350 | * @return array Array with two items, the body followed by headers |
@@ -458,9 +458,9 @@ |
||
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) |
@@ -296,7 +296,7 @@ |
||
296 | 296 | * |
297 | 297 | * Must not raise HTTPResponse_Exceptions - instead it should return |
298 | 298 | * |
299 | - * @param $request |
|
299 | + * @param HTTPRequest $request |
|
300 | 300 | * @param $action |
301 | 301 | * @return HTTPResponse |
302 | 302 | */ |
@@ -248,6 +248,7 @@ |
||
248 | 248 | * via the standard template inclusion process. |
249 | 249 | * |
250 | 250 | * @param string |
251 | + * @param string|null $template |
|
251 | 252 | */ |
252 | 253 | public function setTemplate($template) |
253 | 254 | { |
@@ -330,6 +330,9 @@ discard block |
||
330 | 330 | } |
331 | 331 | } |
332 | 332 | |
333 | + /** |
|
334 | + * @param string $name |
|
335 | + */ |
|
333 | 336 | public function inst_set($name, $val) |
334 | 337 | { |
335 | 338 | // Quicker execution path for "."-free names |
@@ -379,6 +382,9 @@ discard block |
||
379 | 382 | $diffVar[sizeof($var)-1] = $val; |
380 | 383 | } |
381 | 384 | |
385 | + /** |
|
386 | + * @param string $name |
|
387 | + */ |
|
382 | 388 | public function inst_get($name) |
383 | 389 | { |
384 | 390 | // Quicker execution path for "."-free names |
@@ -297,6 +297,9 @@ discard block |
||
297 | 297 | |
298 | 298 | private static $method_from_cache = array(); |
299 | 299 | |
300 | + /** |
|
301 | + * @param string $method |
|
302 | + */ |
|
300 | 303 | public static function has_method_from($class, $method, $compclass) |
301 | 304 | { |
302 | 305 | $lClass = strtolower($class); |
@@ -322,6 +325,8 @@ discard block |
||
322 | 325 | |
323 | 326 | /** |
324 | 327 | * @deprecated 4.0..5.0 |
328 | + * @param string $candidateClass |
|
329 | + * @param string $fieldName |
|
325 | 330 | */ |
326 | 331 | public static function table_for_object_field($candidateClass, $fieldName) |
327 | 332 | { |
@@ -521,12 +521,18 @@ discard block |
||
521 | 521 | |
522 | 522 | protected $extraConfigSources = array(); |
523 | 523 | |
524 | + /** |
|
525 | + * @param string $class |
|
526 | + */ |
|
524 | 527 | public function extraConfigSourcesChanged($class) |
525 | 528 | { |
526 | 529 | unset($this->extraConfigSources[$class]); |
527 | 530 | $this->cache->clean("__{$class}"); |
528 | 531 | } |
529 | 532 | |
533 | + /** |
|
534 | + * @param integer $sourceOptions |
|
535 | + */ |
|
530 | 536 | protected function getUncached($class, $name, $sourceOptions, &$result, $suppress, &$tags) |
531 | 537 | { |
532 | 538 | $tags[] = "__{$class}"; |
@@ -627,7 +633,7 @@ discard block |
||
627 | 633 | * caching heavily here. |
628 | 634 | * |
629 | 635 | * @param $class string - The name of the class to get the value for |
630 | - * @param $name string - The property to get the value for |
|
636 | + * @param string $name string - The property to get the value for |
|
631 | 637 | * @param int $sourceOptions Bitmask which can be set to some combintain of Config::UNINHERITED, |
632 | 638 | * Config::FIRST_SET, and Config::EXCLUDE_EXTENSIONS. |
633 | 639 | * |