@@ -14,6 +14,10 @@ |
||
14 | 14 | */ |
15 | 15 | protected $group; |
16 | 16 | |
17 | + /** |
|
18 | + * @param SecurityAdmin $controller |
|
19 | + * @param string $name |
|
20 | + */ |
|
17 | 21 | public function __construct($controller, $name, $fields = null, $actions = null, $validator = null) { |
18 | 22 | if(!$fields) { |
19 | 23 | $helpHtml = _t( |
@@ -109,6 +109,7 @@ |
||
109 | 109 | /** |
110 | 110 | * Returns true if negotiation is enabled for the given response. By default, negotiation is only |
111 | 111 | * enabled for pages that have the xml header. |
112 | + * @param SS_HTTPResponse $response |
|
112 | 113 | */ |
113 | 114 | public static function enabled_for($response) { |
114 | 115 | $contentType = $response->getHeader("Content-Type"); |
@@ -146,13 +146,13 @@ |
||
146 | 146 | * @see http://uk3.php.net/manual/en/function.setcookie.php |
147 | 147 | * |
148 | 148 | * @param string $name The name of the cookie |
149 | - * @param string|array $value The value for the cookie to hold |
|
149 | + * @param false|string $value The value for the cookie to hold |
|
150 | 150 | * @param int $expiry The number of days until expiry |
151 | 151 | * @param string $path The path to save the cookie on (falls back to site base) |
152 | 152 | * @param string $domain The domain to make the cookie available on |
153 | 153 | * @param boolean $secure Can the cookie only be sent over SSL? |
154 | 154 | * @param boolean $httpOnly Prevent the cookie being accessible by JS |
155 | - * @return boolean If the cookie was set or not; doesn't mean it's accepted by the browser |
|
155 | + * @return boolean|null If the cookie was set or not; doesn't mean it's accepted by the browser |
|
156 | 156 | */ |
157 | 157 | protected function outputCookie( |
158 | 158 | $name, $value, $expiry = 90, $path = null, $domain = null, $secure = false, $httpOnly = true |
@@ -534,7 +534,7 @@ discard block |
||
534 | 534 | * Returns the domain part of the URL 'http://www.mysite.com'. Returns FALSE is this environment |
535 | 535 | * variable isn't set. |
536 | 536 | * |
537 | - * @return bool|string |
|
537 | + * @return string|false |
|
538 | 538 | */ |
539 | 539 | public static function protocolAndHost() { |
540 | 540 | $alternate = Config::inst()->get('Director', 'alternate_base_url'); |
@@ -869,7 +869,7 @@ discard block |
||
869 | 869 | /** |
870 | 870 | * Returns true if the given file exists. Filename should be relative to the site root. |
871 | 871 | * |
872 | - * @param $file |
|
872 | + * @param string $file |
|
873 | 873 | * |
874 | 874 | * @return bool |
875 | 875 | */ |
@@ -1087,7 +1087,7 @@ discard block |
||
1087 | 1087 | * Can also be checked with {@link Director::isDev()}, {@link Director::isTest()}, and |
1088 | 1088 | * {@link Director::isLive()}. |
1089 | 1089 | * |
1090 | - * @return bool|string |
|
1090 | + * @return string|false |
|
1091 | 1091 | */ |
1092 | 1092 | public static function get_environment_type() { |
1093 | 1093 | if(Director::isLive()) { |
@@ -35,9 +35,9 @@ discard block |
||
35 | 35 | protected $fragmentOverride = null; |
36 | 36 | |
37 | 37 | /** |
38 | - * @param RequestHandler $controller |
|
39 | 38 | * @param SS_HTTPResponse An existing response to reuse (optional) |
40 | 39 | * @param Array $callbacks |
40 | + * @param SS_HTTPResponse $response |
|
41 | 41 | */ |
42 | 42 | public function __construct($callbacks = array(), $response = null) { |
43 | 43 | $this->callbacks = $callbacks; |
@@ -61,7 +61,6 @@ discard block |
||
61 | 61 | * @param array $extraCallbacks List of anonymous functions or callables returning either a string |
62 | 62 | * or SS_HTTPResponse, keyed by their fragment identifier. The 'default' key can |
63 | 63 | * be used as a fallback for non-ajax responses. |
64 | - * @param array $fragmentOverride Change the response fragments. |
|
65 | 64 | * @return SS_HTTPResponse |
66 | 65 | */ |
67 | 66 | public function respond(SS_HTTPRequest $request, $extraCallbacks = array()) { |
@@ -109,7 +108,7 @@ discard block |
||
109 | 108 | /** |
110 | 109 | * Set up fragment overriding - will completely replace the incoming fragments. |
111 | 110 | * |
112 | - * @param array $fragments Fragments to insert. |
|
111 | + * @param string[] $fragments Fragments to insert. |
|
113 | 112 | */ |
114 | 113 | public function setFragmentOverride($fragments) { |
115 | 114 | if (!is_array($fragments)) throw new InvalidArgumentException(); |
@@ -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 | */ |
@@ -242,6 +242,10 @@ discard block |
||
242 | 242 | * match. The caller must trim matching lines from the beginning and end |
243 | 243 | * of the portions it is going to specify. |
244 | 244 | */ |
245 | + |
|
246 | + /** |
|
247 | + * @param double $nchunks |
|
248 | + */ |
|
245 | 249 | public function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) { |
246 | 250 | $flip = false; |
247 | 251 | |
@@ -352,6 +356,11 @@ discard block |
||
352 | 356 | * Note that XLIM, YLIM are exclusive bounds. |
353 | 357 | * All line numbers are origin-0 and discarded lines are not counted. |
354 | 358 | */ |
359 | + |
|
360 | + /** |
|
361 | + * @param integer $xoff |
|
362 | + * @param integer $yoff |
|
363 | + */ |
|
355 | 364 | public function _compareseq ($xoff, $xlim, $yoff, $ylim) { |
356 | 365 | // Slide down the bottom initial diagonal. |
357 | 366 | while ($xoff < $xlim && $yoff < $ylim |
@@ -549,7 +558,7 @@ discard block |
||
549 | 558 | * |
550 | 559 | * $diff = new Diff($lines1, $lines2); |
551 | 560 | * $rev = $diff->reverse(); |
552 | - * @return object A Diff object representing the inverse of the |
|
561 | + * @return Diff A Diff object representing the inverse of the |
|
553 | 562 | * original diff. |
554 | 563 | */ |
555 | 564 | public function reverse () { |
@@ -83,6 +83,7 @@ |
||
83 | 83 | * Returns the path for a class or interface in the currently active manifest, |
84 | 84 | * or any previous ones if later manifests aren't set to "exclusive". |
85 | 85 | * |
86 | + * @param string $class |
|
86 | 87 | * @return String |
87 | 88 | */ |
88 | 89 | public function getItemPath($class) { |