@@ -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()); |
@@ -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 | } |
@@ -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 | } |
@@ -61,9 +61,17 @@ discard block |
||
61 | 61 | return $path; |
62 | 62 | } |
63 | 63 | |
64 | + /** |
|
65 | + * @param integer $parent |
|
66 | + * @param integer $position |
|
67 | + */ |
|
64 | 68 | function _create($parent, $position) { |
65 | 69 | return $this->_move(0, $parent, $position); |
66 | 70 | } |
71 | + |
|
72 | + /** |
|
73 | + * @param integer $id |
|
74 | + */ |
|
67 | 75 | function _remove($id) { |
68 | 76 | if((int)$id === 1) { return false; } |
69 | 77 | $data = $this->_get_node($id); |
@@ -100,6 +108,10 @@ discard block |
||
100 | 108 | ); |
101 | 109 | return true; |
102 | 110 | } |
111 | + |
|
112 | + /** |
|
113 | + * @param integer $id |
|
114 | + */ |
|
103 | 115 | function _move($id, $ref_id, $position = 0, $is_copy = false) { |
104 | 116 | if((int)$ref_id === 0 || (int)$id === 1) { return false; } |
105 | 117 | $sql = array(); // Queries executed at the end |
@@ -238,6 +250,10 @@ discard block |
||
238 | 250 | if($is_copy) $this->_fix_copy($ind, $position); |
239 | 251 | return $node === false || $is_copy ? $ind : true; |
240 | 252 | } |
253 | + |
|
254 | + /** |
|
255 | + * @param integer $position |
|
256 | + */ |
|
241 | 257 | function _fix_copy($id, $position) { |
242 | 258 | $node = $this->_get_node($id); |
243 | 259 | $children = $this->_get_children($id, true); |