@@ -114,6 +114,8 @@ discard block |
||
114 | 114 | |
115 | 115 | /** |
116 | 116 | * Override the function that constructs the result arrays to also prepare a 'php' item in the array |
117 | + * @param string $matchrule |
|
118 | + * @param string $name |
|
117 | 119 | */ |
118 | 120 | function construct($matchrule, $name, $arguments = null) { |
119 | 121 | $res = parent::construct($matchrule, $name, $arguments); |
@@ -175,9 +177,9 @@ discard block |
||
175 | 177 | |
176 | 178 | /** |
177 | 179 | * Ensures that the arguments to addOpenBlock and addClosedBlock are valid |
178 | - * @param $name |
|
179 | - * @param $callable |
|
180 | - * @param $type |
|
180 | + * @param string $name |
|
181 | + * @param callable $callable |
|
182 | + * @param string $type |
|
181 | 183 | * @throws InvalidArgumentException |
182 | 184 | */ |
183 | 185 | protected function validateExtensionBlock($name, $callable, $type) { |
@@ -262,6 +264,7 @@ discard block |
||
262 | 264 | * The basic generated PHP of LookupStep and LastLookupStep is the same, except that LookupStep calls 'obj' to |
263 | 265 | * get the next ViewableData in the sequence, and LastLookupStep calls different methods (XML_val, hasValue, obj) |
264 | 266 | * depending on the context the lookup is used in. |
267 | + * @param string $method |
|
265 | 268 | */ |
266 | 269 | function Lookup_AddLookupStep(&$res, $sub, $method) { |
267 | 270 | $res['LookupSteps'][] = $sub; |
@@ -1174,6 +1177,7 @@ discard block |
||
1174 | 1177 | |
1175 | 1178 | /** |
1176 | 1179 | * @param string $code |
1180 | + * @param string $templateName |
|
1177 | 1181 | * @return string $code |
1178 | 1182 | */ |
1179 | 1183 | protected function includeDebuggingComments($code, $templateName) { |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | /** |
253 | 253 | * Gets the combined configuration of all LeafAndMain subclasses required by the client app. |
254 | 254 | * |
255 | - * @return array |
|
255 | + * @return string |
|
256 | 256 | * |
257 | 257 | * WARNING: Experimental API |
258 | 258 | */ |
@@ -691,7 +691,7 @@ discard block |
||
691 | 691 | * |
692 | 692 | * @param string $url |
693 | 693 | * @param int $code |
694 | - * @return HTTPResponse|string |
|
694 | + * @return string|null |
|
695 | 695 | */ |
696 | 696 | public function redirect($url, $code=302) { |
697 | 697 | if($this->getRequest()->isAjax()) { |
@@ -969,7 +969,7 @@ discard block |
||
969 | 969 | * {@link SSViewer::get_templates_by_class()} |
970 | 970 | * |
971 | 971 | * @param string $suffix |
972 | - * @return array |
|
972 | + * @return string |
|
973 | 973 | */ |
974 | 974 | public function getTemplatesWithSuffix($suffix) { |
975 | 975 | $templates = SSViewer::get_templates_by_class(get_class($this), $suffix, __CLASS__); |
@@ -2039,7 +2039,7 @@ discard block |
||
2039 | 2039 | } |
2040 | 2040 | |
2041 | 2041 | /** |
2042 | - * @return String |
|
2042 | + * @return DBField |
|
2043 | 2043 | */ |
2044 | 2044 | public function Locale() { |
2045 | 2045 | return DBField::create_field('Locale', i18n::get_locale()); |
@@ -142,6 +142,7 @@ discard block |
||
142 | 142 | * {@inheritdoc} |
143 | 143 | * |
144 | 144 | * Also set the URLParams |
145 | + * @param HTTPRequest $request |
|
145 | 146 | */ |
146 | 147 | public function setRequest($request) { |
147 | 148 | $return = parent::setRequest($request); |
@@ -501,7 +502,7 @@ discard block |
||
501 | 502 | * |
502 | 503 | * @param array $params |
503 | 504 | * |
504 | - * @return string |
|
505 | + * @return DBHTMLText |
|
505 | 506 | */ |
506 | 507 | public function render($params = null) { |
507 | 508 | $template = $this->getViewer($this->getAction()); |
@@ -664,7 +665,7 @@ discard block |
||
664 | 665 | * Tests whether a redirection has been requested. If redirect() has been called, it will return |
665 | 666 | * the URL redirected to. Otherwise, it will return null. |
666 | 667 | * |
667 | - * @return null|string |
|
668 | + * @return boolean |
|
668 | 669 | */ |
669 | 670 | public function redirectedTo() { |
670 | 671 | return $this->getResponse() && $this->getResponse()->getHeader('Location'); |
@@ -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 SS_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 | */ |
@@ -139,6 +139,7 @@ |
||
139 | 139 | /** |
140 | 140 | * Get the body element, or false if there isn't one (we haven't loaded any content |
141 | 141 | * or this instance is in an invalid state) |
142 | + * @return \DOMElement |
|
142 | 143 | */ |
143 | 144 | public function getBody() { |
144 | 145 | $doc = $this->getDocument(); |
@@ -60,7 +60,7 @@ |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
63 | - * @return FixtureFactory |
|
63 | + * @return \SilverStripe\Dev\FixtureFactory |
|
64 | 64 | */ |
65 | 65 | public function getFixtureFactory() { |
66 | 66 | if(!$this->fixtureFactory) { |
@@ -36,6 +36,7 @@ |
||
36 | 36 | |
37 | 37 | /** |
38 | 38 | * Get Mink session from MinkContext |
39 | + * @return \Behat\Mink\Session |
|
39 | 40 | */ |
40 | 41 | public function getSession($name = null) { |
41 | 42 | return $this->getMainContext()->getSession($name); |
@@ -97,6 +97,9 @@ |
||
97 | 97 | return $return; |
98 | 98 | } |
99 | 99 | |
100 | + /** |
|
101 | + * @param boolean $index |
|
102 | + */ |
|
100 | 103 | function f($index) { |
101 | 104 | return stripslashes($this->row[$index]); |
102 | 105 | } |