@@ -121,6 +121,7 @@ discard block |
||
121 | 121 | |
122 | 122 | /** |
123 | 123 | * Set the DataModel for this request. |
124 | + * @param DataModel $model |
|
124 | 125 | */ |
125 | 126 | public function setDataModel($model) { |
126 | 127 | $this->model = $model; |
@@ -238,6 +239,9 @@ discard block |
||
238 | 239 | return $this; |
239 | 240 | } |
240 | 241 | |
242 | + /** |
|
243 | + * @param SS_HTTPRequest $request |
|
244 | + */ |
|
241 | 245 | protected function findAction($request) { |
242 | 246 | $handlerClass = ($this->class) ? $this->class : get_class($this); |
243 | 247 | |
@@ -384,6 +388,7 @@ discard block |
||
384 | 388 | |
385 | 389 | /** |
386 | 390 | * Return the class that defines the given action, so that we know where to check allowed_actions. |
391 | + * @return string|null |
|
387 | 392 | */ |
388 | 393 | protected function definingClassForAction($actionOrigCasing) { |
389 | 394 | $action = strtolower($actionOrigCasing); |
@@ -492,6 +497,7 @@ discard block |
||
492 | 497 | * or {@link handleRequest()}, but in some based we want to set it manually. |
493 | 498 | * |
494 | 499 | * @param SS_HTTPRequest |
500 | + * @param SS_HTTPRequest $request |
|
495 | 501 | */ |
496 | 502 | public function setRequest($request) { |
497 | 503 | $this->request = $request; |
@@ -273,7 +273,6 @@ discard block |
||
273 | 273 | * |
274 | 274 | * @deprecated 4.0 Use the "Session.timeout_ips" config setting instead |
275 | 275 | * |
276 | - * @param array $session_ips Array of IPv4 rules. |
|
277 | 276 | */ |
278 | 277 | public static function set_timeout_ips($ips) { |
279 | 278 | Deprecation::notice('4.0', 'Use the "Session.timeout_ips" config setting instead'); |
@@ -410,6 +409,9 @@ discard block |
||
410 | 409 | } |
411 | 410 | } |
412 | 411 | |
412 | + /** |
|
413 | + * @param string $name |
|
414 | + */ |
|
413 | 415 | public function inst_set($name, $val) { |
414 | 416 | // Quicker execution path for "."-free names |
415 | 417 | if(strpos($name, '.') === false) { |
@@ -458,6 +460,9 @@ discard block |
||
458 | 460 | $diffVar[sizeof($var)-1] = $val; |
459 | 461 | } |
460 | 462 | |
463 | + /** |
|
464 | + * @param string $name |
|
465 | + */ |
|
461 | 466 | public function inst_get($name) { |
462 | 467 | // Quicker execution path for "."-free names |
463 | 468 | if(strpos($name, '.') === false) { |
@@ -168,7 +168,7 @@ |
||
168 | 168 | * |
169 | 169 | * Actually only one array argument is supported. |
170 | 170 | * |
171 | - * @param $f callback to apply |
|
171 | + * @param string $f callback to apply |
|
172 | 172 | * @param $array array |
173 | 173 | * @return array |
174 | 174 | */ |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | * |
51 | 51 | * @param array|string $val String to escape, or array of strings |
52 | 52 | * |
53 | - * @return array|string |
|
53 | + * @return string |
|
54 | 54 | */ |
55 | 55 | public static function raw2htmlname($val) { |
56 | 56 | if(is_array($val)) { |
@@ -176,9 +176,9 @@ discard block |
||
176 | 176 | * table, or column name. Supports encoding of multi identfiers separated by |
177 | 177 | * a delimiter (e.g. ".") |
178 | 178 | * |
179 | - * @param string|array $identifier The identifier to escape. E.g. 'SiteTree.Title' |
|
179 | + * @param string $identifier The identifier to escape. E.g. 'SiteTree.Title' |
|
180 | 180 | * @param string $separator The string that delimits subsequent identifiers |
181 | - * @return string|array The escaped identifier. E.g. '"SiteTree"."Title"' |
|
181 | + * @return string The escaped identifier. E.g. '"SiteTree"."Title"' |
|
182 | 182 | */ |
183 | 183 | public static function symbol2sql($identifier, $separator = '.') { |
184 | 184 | if(is_array($identifier)) { |
@@ -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 | */ |
@@ -247,6 +247,10 @@ discard block |
||
247 | 247 | * match. The caller must trim matching lines from the beginning and end |
248 | 248 | * of the portions it is going to specify. |
249 | 249 | */ |
250 | + |
|
251 | + /** |
|
252 | + * @param double $nchunks |
|
253 | + */ |
|
250 | 254 | public function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) { |
251 | 255 | $flip = false; |
252 | 256 | |
@@ -357,6 +361,11 @@ discard block |
||
357 | 361 | * Note that XLIM, YLIM are exclusive bounds. |
358 | 362 | * All line numbers are origin-0 and discarded lines are not counted. |
359 | 363 | */ |
364 | + |
|
365 | + /** |
|
366 | + * @param integer $xoff |
|
367 | + * @param integer $yoff |
|
368 | + */ |
|
360 | 369 | public function _compareseq ($xoff, $xlim, $yoff, $ylim) { |
361 | 370 | // Slide down the bottom initial diagonal. |
362 | 371 | while ($xoff < $xlim && $yoff < $ylim |
@@ -554,7 +563,7 @@ discard block |
||
554 | 563 | * |
555 | 564 | * $diff = new Diff($lines1, $lines2); |
556 | 565 | * $rev = $diff->reverse(); |
557 | - * @return object A Diff object representing the inverse of the |
|
566 | + * @return Diff A Diff object representing the inverse of the |
|
558 | 567 | * original diff. |
559 | 568 | */ |
560 | 569 | public function reverse () { |
@@ -55,7 +55,7 @@ |
||
55 | 55 | |
56 | 56 | /** |
57 | 57 | * Set the owner of this extension. |
58 | - * @param Object $owner The owner object, |
|
58 | + * @param Group $owner The owner object, |
|
59 | 59 | * @param string $ownerBaseClass The base class that the extension is applied to; this may be |
60 | 60 | * the class of owner, or it may be a parent. For example, if Versioned was applied to SiteTree, |
61 | 61 | * and then a Page object was instantiated, $owner would be a Page object, but $ownerBaseClass |
@@ -244,6 +244,9 @@ discard block |
||
244 | 244 | * splt/complete before and after matchers) |
245 | 245 | * |
246 | 246 | * Public so that ManifestFileFinder can call it. Not for general use. |
247 | + * @param string $basename |
|
248 | + * @param string $pathname |
|
249 | + * @param boolean $depth |
|
247 | 250 | */ |
248 | 251 | public function addYAMLConfigFile($basename, $pathname, $depth) { |
249 | 252 | if (!preg_match('{/([^/]+)/_config/}', $pathname, $match)) return; |
@@ -467,7 +470,7 @@ discard block |
||
467 | 470 | * Returns false if the prefilterable parts of the rule aren't met, and true if they are |
468 | 471 | * |
469 | 472 | * @param $rules array - A hash of rules as allowed in the only or except portion of a config fragment header |
470 | - * @return bool - True if the rules are met, false if not. (Note that depending on whether we were passed an |
|
473 | + * @return boolean|string - True if the rules are met, false if not. (Note that depending on whether we were passed an |
|
471 | 474 | * only or an except rule, |
472 | 475 | * which values means accept or reject a fragment |
473 | 476 | */ |
@@ -7,9 +7,21 @@ |
||
7 | 7 | * @subpackage manifest |
8 | 8 | */ |
9 | 9 | interface ManifestCache { |
10 | + |
|
11 | + /** |
|
12 | + * @return void |
|
13 | + */ |
|
10 | 14 | public function __construct($name); |
11 | 15 | public function load($key); |
16 | + |
|
17 | + /** |
|
18 | + * @return void |
|
19 | + */ |
|
12 | 20 | public function save($data, $key); |
21 | + |
|
22 | + /** |
|
23 | + * @return void |
|
24 | + */ |
|
13 | 25 | public function clear(); |
14 | 26 | } |
15 | 27 |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | /** |
57 | 57 | * Get a configuration accessor for this class. Short hand for Config::inst()->get($this->class, .....). |
58 | - * @return Config_ForClass|null |
|
58 | + * @return Config_ForClass |
|
59 | 59 | */ |
60 | 60 | static public function config() { |
61 | 61 | return Config::inst()->forClass(get_called_class()); |
@@ -125,8 +125,6 @@ discard block |
||
125 | 125 | * $list = DataList::create('SiteTree'); |
126 | 126 | * $list = SiteTree::get(); |
127 | 127 | * |
128 | - * @param string $class the class name |
|
129 | - * @param mixed $arguments,... arguments to pass to the constructor |
|
130 | 128 | * @return static |
131 | 129 | */ |
132 | 130 | public static function create() { |
@@ -149,7 +147,6 @@ discard block |
||
149 | 147 | * way to access instance methods which don't rely on instance |
150 | 148 | * data (e.g. the custom SilverStripe static handling). |
151 | 149 | * |
152 | - * @param string $className Optional classname (if called on Object directly) |
|
153 | 150 | * @return static The singleton instance |
154 | 151 | */ |
155 | 152 | public static function singleton() { |
@@ -297,8 +294,6 @@ discard block |
||
297 | 294 | * Similar to {@link Object::create()}, except that classes are only overloaded if you set the $strong parameter to |
298 | 295 | * TRUE when using {@link Object::useCustomClass()} |
299 | 296 | * |
300 | - * @param string $class the class name |
|
301 | - * @param mixed $arguments,... arguments to pass to the constructor |
|
302 | 297 | * @return static |
303 | 298 | */ |
304 | 299 | public static function strong_create() { |
@@ -350,8 +345,8 @@ discard block |
||
350 | 345 | * without any inheritance, merging or parent lookup if it doesn't exist on the given class. |
351 | 346 | * |
352 | 347 | * @static |
353 | - * @param $class - The class to get the static from |
|
354 | - * @param $name - The property to get from the class |
|
348 | + * @param string $class - The class to get the static from |
|
349 | + * @param string $name - The property to get from the class |
|
355 | 350 | * @param null $default - The value to return if property doesn't exist on class |
356 | 351 | * @return any - The value of the static property $name on class $class, or $default if that property is not |
357 | 352 | * defined |
@@ -823,6 +818,7 @@ discard block |
||
823 | 818 | |
824 | 819 | /** |
825 | 820 | * @see Object::get_static() |
821 | + * @param string $name |
|
826 | 822 | */ |
827 | 823 | public function stat($name, $uncached = false) { |
828 | 824 | return Config::inst()->get(($this->class ? $this->class : get_class($this)), $name, Config::FIRST_SET); |
@@ -830,6 +826,8 @@ discard block |
||
830 | 826 | |
831 | 827 | /** |
832 | 828 | * @see Object::set_static() |
829 | + * @param string $name |
|
830 | + * @param string $value |
|
833 | 831 | */ |
834 | 832 | public function set_stat($name, $value) { |
835 | 833 | Config::inst()->update(($this->class ? $this->class : get_class($this)), $name, $value); |
@@ -837,6 +835,7 @@ discard block |
||
837 | 835 | |
838 | 836 | /** |
839 | 837 | * @see Object::uninherited_static() |
838 | + * @param string $name |
|
840 | 839 | */ |
841 | 840 | public function uninherited($name) { |
842 | 841 | return Config::inst()->get(($this->class ? $this->class : get_class($this)), $name, Config::UNINHERITED); |
@@ -887,7 +886,7 @@ discard block |
||
887 | 886 | * all results into an array |
888 | 887 | * |
889 | 888 | * @param string $method the method name to call |
890 | - * @param mixed $argument a single argument to pass |
|
889 | + * @param string $argument a single argument to pass |
|
891 | 890 | * @return mixed |
892 | 891 | * @todo integrate inheritance rules |
893 | 892 | */ |
@@ -910,7 +909,6 @@ discard block |
||
910 | 909 | * The extension methods are defined during {@link __construct()} in {@link defineMethods()}. |
911 | 910 | * |
912 | 911 | * @param string $method the name of the method to call on each extension |
913 | - * @param mixed $a1,... up to 7 arguments to be passed to the method |
|
914 | 912 | * @return array |
915 | 913 | */ |
916 | 914 | public function extend($method, &$a1=null, &$a2=null, &$a3=null, &$a4=null, &$a5=null, &$a6=null, &$a7=null) { |