@@ -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 | * |
@@ -161,6 +161,9 @@ discard block |
||
161 | 161 | return Injector::inst()->get($className); |
162 | 162 | } |
163 | 163 | |
164 | +/** |
|
165 | + * @return string |
|
166 | + */ |
|
164 | 167 | function project() { |
165 | 168 | global $project; |
166 | 169 | return $project; |
@@ -184,7 +187,7 @@ discard block |
||
184 | 187 | * Only increases up to the maximum defined in {@link set_increase_memory_limit_max()}, |
185 | 188 | * and defaults to the 'memory_limit' setting in the PHP configuration. |
186 | 189 | * |
187 | - * @param string|int $memoryLimit A memory limit string, such as "64M". If omitted, unlimited memory will be set. |
|
190 | + * @param integer $memoryLimit A memory limit string, such as "64M". If omitted, unlimited memory will be set. |
|
188 | 191 | * @return Boolean TRUE indicates a successful change, FALSE a denied change. |
189 | 192 | */ |
190 | 193 | 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) { |
@@ -379,7 +379,7 @@ |
||
379 | 379 | * @param string $method the method name to call |
380 | 380 | * @param mixed $a1 |
381 | 381 | * @param mixed $a2 |
382 | - * @param mixed $a3 |
|
382 | + * @param boolean $a3 |
|
383 | 383 | * @param mixed $a4 |
384 | 384 | * @param mixed $a5 |
385 | 385 | * @param mixed $a6 |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | * |
358 | 358 | * @param string $property |
359 | 359 | * the name of the property |
360 | - * @param object $object |
|
360 | + * @param string $object |
|
361 | 361 | * the object to be set |
362 | 362 | * @return $this |
363 | 363 | */ |
@@ -451,7 +451,7 @@ discard block |
||
451 | 451 | * The name of the service to update the definition for |
452 | 452 | * @param string $property |
453 | 453 | * The name of the property to update. |
454 | - * @param mixed $value |
|
454 | + * @param string $value |
|
455 | 455 | * The value to set |
456 | 456 | * @param boolean $append |
457 | 457 | * Whether to append (the default) when the property is an array |
@@ -500,7 +500,7 @@ |
||
500 | 500 | * Returns false if the prefilterable parts of the rule aren't met, and true if they are |
501 | 501 | * |
502 | 502 | * @param $rules array - A hash of rules as allowed in the only or except portion of a config fragment header |
503 | - * @return bool - True if the rules are met, false if not. (Note that depending on whether we were passed an |
|
503 | + * @return boolean|string - True if the rules are met, false if not. (Note that depending on whether we were passed an |
|
504 | 504 | * only or an except rule, |
505 | 505 | * which values means accept or reject a fragment |
506 | 506 | */ |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | /** |
101 | 101 | * Get value of display_errors ini value |
102 | 102 | * |
103 | - * @return mixed |
|
103 | + * @return string |
|
104 | 104 | */ |
105 | 105 | protected function getDisplayErrors() { |
106 | 106 | return ini_get('display_errors'); |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | * Add this callback to the chain of callbacks to call along with the state |
111 | 111 | * that $error must be in this point in the chain for the callback to be called |
112 | 112 | * |
113 | - * @param $callback - The callback to call |
|
113 | + * @param callable $callback - The callback to call |
|
114 | 114 | * @param $onErrorState - false if only call if no errors yet, true if only call if already errors, null for either |
115 | 115 | * @return $this |
116 | 116 | */ |
@@ -36,6 +36,9 @@ discard block |
||
36 | 36 | */ |
37 | 37 | protected $token = null; |
38 | 38 | |
39 | + /** |
|
40 | + * @param string $token |
|
41 | + */ |
|
39 | 42 | protected function pathForToken($token) { |
40 | 43 | return TEMP_FOLDER.'/token_'.preg_replace('/[^a-z0-9]+/', '', $token); |
41 | 44 | } |
@@ -235,7 +238,7 @@ discard block |
||
235 | 238 | * Given a list of token names, suppress all tokens that have not been validated, and |
236 | 239 | * return the non-validated token with the highest priority |
237 | 240 | * |
238 | - * @param array $keys List of token keys in ascending priority (low to high) |
|
241 | + * @param string[] $keys List of token keys in ascending priority (low to high) |
|
239 | 242 | * @return ParameterConfirmationToken The token container for the unvalidated $key given with the highest priority |
240 | 243 | */ |
241 | 244 | public static function prepare_tokens($keys) { |
@@ -116,7 +116,7 @@ |
||
116 | 116 | * @param mixed $returnVal |
117 | 117 | * @param bool $ignoreAjax |
118 | 118 | * @param array $ignoredFunctions |
119 | - * @return mixed |
|
119 | + * @return string|null |
|
120 | 120 | */ |
121 | 121 | public static function backtrace($returnVal = false, $ignoreAjax = false, $ignoredFunctions = null) { |
122 | 122 | $plainText = Director::is_cli() || (Director::is_ajax() && !$ignoreAjax); |