@@ -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 |
@@ -427,9 +427,9 @@ |
||
| 427 | 427 | * it's only advisable to send small files through this method. |
| 428 | 428 | * |
| 429 | 429 | * @static |
| 430 | - * @param $fileData |
|
| 430 | + * @param string $fileData |
|
| 431 | 431 | * @param $fileName |
| 432 | - * @param null $mimeType |
|
| 432 | + * @param string $mimeType |
|
| 433 | 433 | * @return HTTPResponse |
| 434 | 434 | */ |
| 435 | 435 | public static function send_file($fileData, $fileName, $mimeType = null) { |
@@ -289,7 +289,7 @@ |
||
| 289 | 289 | * |
| 290 | 290 | * Must not raise HTTPResponse_Exceptions - instead it should return |
| 291 | 291 | * |
| 292 | - * @param $request |
|
| 292 | + * @param HTTPRequest $request |
|
| 293 | 293 | * @param $action |
| 294 | 294 | * @return HTTPResponse |
| 295 | 295 | */ |
@@ -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 | * |
@@ -50,9 +50,9 @@ discard block |
||
| 50 | 50 | * |
| 51 | 51 | * @see http://www.w3.org/TR/REC-html40/types.html#type-cdata |
| 52 | 52 | * |
| 53 | - * @param array|string $val String to escape, or array of strings |
|
| 53 | + * @param string $val String to escape, or array of strings |
|
| 54 | 54 | * |
| 55 | - * @return array|string |
|
| 55 | + * @return string |
|
| 56 | 56 | */ |
| 57 | 57 | public static function raw2htmlname($val) { |
| 58 | 58 | if(is_array($val)) { |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | * table, or column name. Supports encoding of multi identfiers separated by |
| 179 | 179 | * a delimiter (e.g. ".") |
| 180 | 180 | * |
| 181 | - * @param string|array $identifier The identifier to escape. E.g. 'SiteTree.Title' or list of identifiers |
|
| 181 | + * @param string $identifier The identifier to escape. E.g. 'SiteTree.Title' or list of identifiers |
|
| 182 | 182 | * to be joined via the separator. |
| 183 | 183 | * @param string $separator The string that delimits subsequent identifiers |
| 184 | 184 | * @return string The escaped identifier. E.g. '"SiteTree"."Title"' |
@@ -263,6 +263,7 @@ discard block |
||
| 263 | 263 | * call this function directly, Please use {@link Convert::xml2array()} |
| 264 | 264 | * |
| 265 | 265 | * @param SimpleXMLElement |
| 266 | + * @param SimpleXMLElement $xml |
|
| 266 | 267 | * |
| 267 | 268 | * @return mixed |
| 268 | 269 | */ |
@@ -456,7 +457,7 @@ discard block |
||
| 456 | 457 | * - IDField => idField |
| 457 | 458 | * - iDField => iDField |
| 458 | 459 | * |
| 459 | - * @param $str |
|
| 460 | + * @param string $str |
|
| 460 | 461 | * @return string |
| 461 | 462 | */ |
| 462 | 463 | public static function upperCamelToLowerCamel($str) { |
@@ -131,6 +131,9 @@ discard block |
||
| 131 | 131 | return Injector::inst()->get($className); |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | +/** |
|
| 135 | + * @return string |
|
| 136 | + */ |
|
| 134 | 137 | function project() { |
| 135 | 138 | global $project; |
| 136 | 139 | return $project; |
@@ -154,7 +157,7 @@ discard block |
||
| 154 | 157 | * Only increases up to the maximum defined in {@link set_increase_memory_limit_max()}, |
| 155 | 158 | * and defaults to the 'memory_limit' setting in the PHP configuration. |
| 156 | 159 | * |
| 157 | - * @param string|int $memoryLimit A memory limit string, such as "64M". If omitted, unlimited memory will be set. |
|
| 160 | + * @param integer $memoryLimit A memory limit string, such as "64M". If omitted, unlimited memory will be set. |
|
| 158 | 161 | * @return Boolean TRUE indicates a successful change, FALSE a denied change. |
| 159 | 162 | */ |
| 160 | 163 | function increase_memory_limit_to($memoryLimit = -1) { |
@@ -144,7 +144,7 @@ |
||
| 144 | 144 | /** |
| 145 | 145 | * Get meta-data details on a named method |
| 146 | 146 | * |
| 147 | - * @param array $method |
|
| 147 | + * @param string $method |
|
| 148 | 148 | * @return array List of custom method details, if defined for this method |
| 149 | 149 | */ |
| 150 | 150 | protected function getExtraMethodConfig($method) { |