@@ -50,6 +50,7 @@ discard block |
||
50 | 50 | * Create a new UnsavedRelationList |
51 | 51 | * |
52 | 52 | * @param string $dataClass The DataObject class used in the relation |
53 | + * @param string $relationName |
|
53 | 54 | */ |
54 | 55 | public function __construct($baseClass, $relationName, $dataClass) { |
55 | 56 | $this->baseClass = $baseClass; |
@@ -142,7 +143,7 @@ discard block |
||
142 | 143 | * Add a number of items to the relation. |
143 | 144 | * |
144 | 145 | * @param array $items Items to add, as either DataObjects or IDs. |
145 | - * @return DataList |
|
146 | + * @return UnsavedRelationList |
|
146 | 147 | */ |
147 | 148 | public function addMany($items) { |
148 | 149 | foreach($items as $item) { |
@@ -177,7 +178,6 @@ discard block |
||
177 | 178 | /** |
178 | 179 | * Remove the items from this list with the given IDs |
179 | 180 | * |
180 | - * @param array $idList |
|
181 | 181 | */ |
182 | 182 | public function removeMany($items) { |
183 | 183 | $this->items = array_diff($this->items, $items); |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | protected $transliterator; |
107 | 107 | |
108 | 108 | /** |
109 | - * @return SS_Transliterator|NULL |
|
109 | + * @return SS_Transliterator |
|
110 | 110 | */ |
111 | 111 | public function getTransliterator() { |
112 | 112 | if($this->transliterator === null && $this->config()->default_use_transliterator) { |
@@ -129,6 +129,7 @@ discard block |
||
129 | 129 | |
130 | 130 | /** |
131 | 131 | * @param boolean |
132 | + * @param boolean $bool |
|
132 | 133 | */ |
133 | 134 | public function setAllowMultibyte($bool) { |
134 | 135 | $this->allowMultibyte = $bool; |
@@ -46,6 +46,7 @@ discard block |
||
46 | 46 | * |
47 | 47 | * @param $url Human-readable URL. |
48 | 48 | * @returns string/bool URL of an endpoint, or false if no matching provider exists. |
49 | + * @return string |
|
49 | 50 | */ |
50 | 51 | protected static function find_endpoint($url) { |
51 | 52 | foreach(self::get_providers() as $scheme=>$endpoint) { |
@@ -261,6 +262,9 @@ discard block |
||
261 | 262 | parent::__construct(); |
262 | 263 | } |
263 | 264 | |
265 | + /** |
|
266 | + * @return string |
|
267 | + */ |
|
264 | 268 | public function getOembedURL() { |
265 | 269 | return $this->url; |
266 | 270 | } |
@@ -319,6 +323,7 @@ discard block |
||
319 | 323 | |
320 | 324 | /** |
321 | 325 | * Wrap the check for looking into Oembed JSON within $this->data. |
326 | + * @param string $field |
|
322 | 327 | */ |
323 | 328 | public function hasField($field) { |
324 | 329 | $this->loadData(); |
@@ -165,7 +165,7 @@ |
||
165 | 165 | * Main BBCode parser method. This takes plain jane content and |
166 | 166 | * runs it through so many filters |
167 | 167 | * |
168 | - * @return Text |
|
168 | + * @return string |
|
169 | 169 | */ |
170 | 170 | public function parse() { |
171 | 171 | $this->content = str_replace(array('&', '<', '>'), array('&', '<', '>'), $this->content); |
@@ -177,6 +177,10 @@ discard block |
||
177 | 177 | $this->addFilters($this->_options['filters']); |
178 | 178 | } |
179 | 179 | |
180 | + /** |
|
181 | + * @param string $class |
|
182 | + * @param string $var |
|
183 | + */ |
|
180 | 184 | static function &getStaticProperty($class, $var) |
181 | 185 | { |
182 | 186 | static $properties; |
@@ -406,6 +410,7 @@ discard block |
||
406 | 410 | * array as an associative array. |
407 | 411 | * |
408 | 412 | * @param string string to build tag from |
413 | + * @param string $str |
|
409 | 414 | * @return array tag in array format |
410 | 415 | * @access private |
411 | 416 | * @see _buildTagArray() |
@@ -840,7 +845,7 @@ discard block |
||
840 | 845 | /** |
841 | 846 | * Quick method to do setText(), parse() and getParsed at once |
842 | 847 | * |
843 | - * @return none |
|
848 | + * @return string |
|
844 | 849 | * @access public |
845 | 850 | * @see parse() |
846 | 851 | * @see $_text |
@@ -856,7 +861,7 @@ discard block |
||
856 | 861 | /** |
857 | 862 | * Quick static method to do setText(), parse() and getParsed at once |
858 | 863 | * |
859 | - * @return none |
|
864 | + * @return string |
|
860 | 865 | * @access public |
861 | 866 | * @see parse() |
862 | 867 | * @see $_text |
@@ -152,6 +152,9 @@ discard block |
||
152 | 152 | |
153 | 153 | // -------------------------------------------------------------------------------------------------------------- |
154 | 154 | |
155 | + /** |
|
156 | + * @param DOMElement $node |
|
157 | + */ |
|
155 | 158 | protected function removeNode($node) { |
156 | 159 | $node->parentNode->removeChild($node); |
157 | 160 | } |
@@ -167,6 +170,9 @@ discard block |
||
167 | 170 | } |
168 | 171 | } |
169 | 172 | |
173 | + /** |
|
174 | + * @param DOMElement $after |
|
175 | + */ |
|
170 | 176 | protected function insertListAfter($new, $after) { |
171 | 177 | $doc = $after->ownerDocument; $parent = $after->parentNode; $next = $after->nextSibling; |
172 | 178 | |
@@ -347,6 +353,7 @@ discard block |
||
347 | 353 | * |
348 | 354 | * @param string $content - The HTML string with [tag] style shortcodes embedded |
349 | 355 | * @param array $tags - The tags extracted by extractTags |
356 | + * @param Closure $generator |
|
350 | 357 | * @return string - The HTML string with [tag] style shortcodes replaced by markers |
351 | 358 | */ |
352 | 359 | protected function replaceTagsWithText($content, $tags, $generator) { |
@@ -379,7 +386,6 @@ discard block |
||
379 | 386 | * We don't use markers with attributes because there's no point, it's easier to do all the matching |
380 | 387 | * in-DOM after the XML parse |
381 | 388 | * |
382 | - * @param DOMDocument $doc |
|
383 | 389 | */ |
384 | 390 | protected function replaceAttributeTagsWithContent($htmlvalue) { |
385 | 391 | $attributes = $htmlvalue->query('//@*[contains(.,"[")][contains(.,"]")]'); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | * Handles SQL escaping for both numeric and string values |
35 | 35 | * |
36 | 36 | * @param DataQuery $query |
37 | - * @return $this|DataQuery |
|
37 | + * @return DataQuery |
|
38 | 38 | */ |
39 | 39 | protected function applyOne(DataQuery $query) { |
40 | 40 | $this->model = $query->applyRelation($this->relation); |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | * Handles SQL escaping for both numeric and string values |
51 | 51 | * |
52 | 52 | * @param DataQuery $query |
53 | - * @return $this|DataQuery |
|
53 | + * @return DataQuery |
|
54 | 54 | */ |
55 | 55 | protected function excludeOne(DataQuery $query) { |
56 | 56 | $this->model = $query->applyRelation($this->relation); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | * column. Can contain a relation name in dot notation, which will automatically join |
48 | 48 | * the necessary tables (e.g. "Comments.Name" to join the "Comments" has-many relationship and |
49 | 49 | * search the "Name" column when applying this filter to a SiteTree class). |
50 | - * @param mixed $value |
|
50 | + * @param string $value |
|
51 | 51 | * @param array $modifiers |
52 | 52 | */ |
53 | 53 | public function __construct($fullName, $value = false, array $modifiers = array()) { |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | /** |
288 | 288 | * Determines case sensitivity based on {@link getModifiers()}. |
289 | 289 | * |
290 | - * @return Mixed TRUE or FALSE to enforce sensitivity, NULL to use field collation. |
|
290 | + * @return boolean|null TRUE or FALSE to enforce sensitivity, NULL to use field collation. |
|
291 | 291 | */ |
292 | 292 | protected function getCaseSensitive() { |
293 | 293 | $modifiers = $this->getModifiers(); |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | /** |
44 | 44 | * Method that creates the login form for this authentication method |
45 | 45 | * |
46 | - * @param Controller The parent controller, necessary to create the |
|
46 | + * @param Controller Controller parent controller, necessary to create the |
|
47 | 47 | * appropriate form action tag |
48 | 48 | * @return Form Returns the login form to use with this authentication |
49 | 49 | * method |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | * Remove a previously registered authenticator |
122 | 122 | * |
123 | 123 | * @param string $authenticator Name of the authenticator class to register |
124 | - * @return bool Returns TRUE on success, FALSE otherwise. |
|
124 | + * @return boolean|null Returns TRUE on success, FALSE otherwise. |
|
125 | 125 | */ |
126 | 126 | public static function unregister_authenticator($authenticator) { |
127 | 127 | if(call_user_func(array($authenticator, 'on_unregister')) === true) { |
@@ -164,6 +164,7 @@ discard block |
||
164 | 164 | * Set a default authenticator (shows first in tabs) |
165 | 165 | * |
166 | 166 | * @param string |
167 | + * @param string $authenticator |
|
167 | 168 | */ |
168 | 169 | public static function set_default_authenticator($authenticator) { |
169 | 170 | self::$default_authenticator = $authenticator; |