@@ -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) { |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * |
95 | 95 | * @todo Move this into {@see DataObjectSchema} |
96 | 96 | * |
97 | - * @param string|object $nameOrObject Class or object instance |
|
97 | + * @param string $nameOrObject Class or object instance |
|
98 | 98 | * @return array |
99 | 99 | */ |
100 | 100 | public static function dataClassesFor($nameOrObject) { |
@@ -276,6 +276,9 @@ discard block |
||
276 | 276 | |
277 | 277 | private static $method_from_cache = array(); |
278 | 278 | |
279 | + /** |
|
280 | + * @param string $method |
|
281 | + */ |
|
279 | 282 | public static function has_method_from($class, $method, $compclass) { |
280 | 283 | $lClass = strtolower($class); |
281 | 284 | $lMethod = strtolower($method); |
@@ -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 | * |
@@ -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) { |
@@ -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 |
@@ -235,7 +235,7 @@ |
||
235 | 235 | * Returns an array containing all the descendants (direct and indirect) |
236 | 236 | * of a class. |
237 | 237 | * |
238 | - * @param string|object $class |
|
238 | + * @param string $class |
|
239 | 239 | * @return array |
240 | 240 | */ |
241 | 241 | public function getDescendantsOf($class) { |