@@ -59,6 +59,10 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | protected $config; |
| 61 | 61 | |
| 62 | + /** |
|
| 63 | + * @param string $name |
|
| 64 | + * @param string $title |
|
| 65 | + */ |
|
| 62 | 66 | public function __construct($name, $title = null, $value = ""){ |
| 63 | 67 | $this->config = $this->config()->default_config; |
| 64 | 68 | |
@@ -71,6 +75,9 @@ discard block |
||
| 71 | 75 | parent::__construct($name, $title, $value); |
| 72 | 76 | } |
| 73 | 77 | |
| 78 | + /** |
|
| 79 | + * @param Form $form |
|
| 80 | + */ |
|
| 74 | 81 | public function setForm($form) { |
| 75 | 82 | parent::setForm($form); |
| 76 | 83 | |
@@ -81,6 +88,9 @@ discard block |
||
| 81 | 88 | return $this; |
| 82 | 89 | } |
| 83 | 90 | |
| 91 | + /** |
|
| 92 | + * @param string $name |
|
| 93 | + */ |
|
| 84 | 94 | public function setName($name) { |
| 85 | 95 | parent::setName($name); |
| 86 | 96 | |
@@ -93,7 +103,7 @@ discard block |
||
| 93 | 103 | |
| 94 | 104 | /** |
| 95 | 105 | * @param array $properties |
| 96 | - * @return HTMLText |
|
| 106 | + * @return string |
|
| 97 | 107 | */ |
| 98 | 108 | public function FieldHolder($properties = array()) { |
| 99 | 109 | $config = array( |
@@ -108,7 +118,7 @@ discard block |
||
| 108 | 118 | |
| 109 | 119 | /** |
| 110 | 120 | * @param array $properties |
| 111 | - * @return HTMLText |
|
| 121 | + * @return DBField |
|
| 112 | 122 | */ |
| 113 | 123 | public function Field($properties = array()) { |
| 114 | 124 | Requirements::css(FRAMEWORK_DIR . '/css/DatetimeField.css'); |
@@ -243,6 +253,7 @@ discard block |
||
| 243 | 253 | |
| 244 | 254 | /** |
| 245 | 255 | * @param FormField |
| 256 | + * @param DateField $field |
|
| 246 | 257 | */ |
| 247 | 258 | public function setDateField($field) { |
| 248 | 259 | $expected = $this->getName() . '[date]'; |
@@ -268,6 +279,7 @@ discard block |
||
| 268 | 279 | |
| 269 | 280 | /** |
| 270 | 281 | * @param FormField |
| 282 | + * @param TimeField $field |
|
| 271 | 283 | */ |
| 272 | 284 | public function setTimeField($field) { |
| 273 | 285 | $expected = $this->getName() . '[time]'; |
@@ -306,7 +318,7 @@ discard block |
||
| 306 | 318 | * to set field-specific config options. |
| 307 | 319 | * |
| 308 | 320 | * @param string $name |
| 309 | - * @param mixed $val |
|
| 321 | + * @param string $val |
|
| 310 | 322 | */ |
| 311 | 323 | public function setConfig($name, $val) { |
| 312 | 324 | $this->config[$name] = $val; |
@@ -324,7 +336,7 @@ discard block |
||
| 324 | 336 | * to get field-specific config options. |
| 325 | 337 | * |
| 326 | 338 | * @param String $name Optional, returns the whole configuration array if empty |
| 327 | - * @return mixed |
|
| 339 | + * @return string|null |
|
| 328 | 340 | */ |
| 329 | 341 | public function getConfig($name = null) { |
| 330 | 342 | if($name) { |
@@ -334,6 +346,9 @@ discard block |
||
| 334 | 346 | } |
| 335 | 347 | } |
| 336 | 348 | |
| 349 | + /** |
|
| 350 | + * @param RequiredFields $validator |
|
| 351 | + */ |
|
| 337 | 352 | public function validate($validator) { |
| 338 | 353 | $dateValid = $this->dateField->validate($validator); |
| 339 | 354 | $timeValid = $this->timeField->validate($validator); |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | * |
| 200 | 200 | * @todo refactor this into GridFieldComponent |
| 201 | 201 | * |
| 202 | - * @param mixed $value |
|
| 202 | + * @param string $value |
|
| 203 | 203 | * @param string|array $castingDefinition |
| 204 | 204 | * |
| 205 | 205 | * @return mixed |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | * |
| 287 | 287 | * @param array $properties |
| 288 | 288 | * |
| 289 | - * @return HTMLText |
|
| 289 | + * @return DBField |
|
| 290 | 290 | */ |
| 291 | 291 | public function FieldHolder($properties = array()) { |
| 292 | 292 | Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css'); |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | * @param int $index |
| 572 | 572 | * @param DataObject $record |
| 573 | 573 | * |
| 574 | - * @return array |
|
| 574 | + * @return string[] |
|
| 575 | 575 | */ |
| 576 | 576 | protected function newRowClasses($total, $index, $record) { |
| 577 | 577 | $classes = array('ss-gridfield-item'); |
@@ -596,7 +596,7 @@ discard block |
||
| 596 | 596 | /** |
| 597 | 597 | * @param array $properties |
| 598 | 598 | * |
| 599 | - * @return HTMLText |
|
| 599 | + * @return DBField |
|
| 600 | 600 | */ |
| 601 | 601 | public function Field($properties = array()) { |
| 602 | 602 | return $this->FieldHolder($properties); |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | 19 | * Create a new action button. |
| 20 | - * @param action The method to call when the button is clicked |
|
| 20 | + * @param action string method to call when the button is clicked |
|
| 21 | 21 | * @param title The label on the button |
| 22 | 22 | * @param extraClass A CSS class to apply to the button in addition to 'action' |
| 23 | 23 | */ |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | 34 | * @param array $properties |
| 35 | - * @return HTMLText |
|
| 35 | + * @return DBField |
|
| 36 | 36 | */ |
| 37 | 37 | public function Field($properties = array()) { |
| 38 | 38 | if($this->includeDefaultJS) { |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | /** |
| 80 | 80 | * @param array $properties |
| 81 | - * @return HTMLText |
|
| 81 | + * @return DBField |
|
| 82 | 82 | */ |
| 83 | 83 | public function Field($properties = array()) { |
| 84 | 84 | return DBField::create_field('HTMLText', |
@@ -108,7 +108,7 @@ |
||
| 108 | 108 | * Return a date and time formatted as per a CMS user's settings. |
| 109 | 109 | * |
| 110 | 110 | * @param Member $member |
| 111 | - * @return boolean | string A time and date pair formatted as per user-defined settings. |
|
| 111 | + * @return false|string | string A time and date pair formatted as per user-defined settings. |
|
| 112 | 112 | */ |
| 113 | 113 | public function FormatFromSettings($member = null) { |
| 114 | 114 | require_once 'Zend/Date.php'; |
@@ -76,7 +76,7 @@ |
||
| 76 | 76 | |
| 77 | 77 | /** |
| 78 | 78 | * @param array $properties |
| 79 | - * @return HTMLText |
|
| 79 | + * @return DBField |
|
| 80 | 80 | */ |
| 81 | 81 | public function Field($properties = array()) { |
| 82 | 82 | Requirements::css(FRAMEWORK_DIR . '/css/CheckboxSetField.css'); |
@@ -338,7 +338,6 @@ discard block |
||
| 338 | 338 | /** |
| 339 | 339 | * Returns the modulus of the numerical position of the item in the data set. |
| 340 | 340 | * The count starts from $startIndex, which defaults to 1. |
| 341 | - * @param int $Mod The number to perform Mod operation to. |
|
| 342 | 341 | * @param int $startIndex Number to start count from. |
| 343 | 342 | * @return int |
| 344 | 343 | */ |
@@ -412,6 +411,10 @@ discard block |
||
| 412 | 411 | $this->underlay = $underlay ? $underlay : array(); |
| 413 | 412 | } |
| 414 | 413 | |
| 414 | + /** |
|
| 415 | + * @param string $interfaceToQuery |
|
| 416 | + * @param string $variableMethod |
|
| 417 | + */ |
|
| 415 | 418 | protected function createCallableArray(&$extraArray, $interfaceToQuery, $variableMethod, $createObject = false) { |
| 416 | 419 | $implementers = ClassInfo::implementorsOf($interfaceToQuery); |
| 417 | 420 | if($implementers) foreach($implementers as $implementer) { |
@@ -753,7 +756,7 @@ discard block |
||
| 753 | 756 | * |
| 754 | 757 | * @param $className string - valid class name |
| 755 | 758 | * @param $suffix string |
| 756 | - * @param $baseClass string |
|
| 759 | + * @param string $baseClass string |
|
| 757 | 760 | * |
| 758 | 761 | * @return array |
| 759 | 762 | */ |
@@ -1083,7 +1086,7 @@ discard block |
||
| 1083 | 1086 | * @param array|null $arguments - arguments to an included template |
| 1084 | 1087 | * @param Object $inheritedScope - the current scope of a parent template including a sub-template |
| 1085 | 1088 | * |
| 1086 | - * @return HTMLText Parsed template output. |
|
| 1089 | + * @return DBField Parsed template output. |
|
| 1087 | 1090 | */ |
| 1088 | 1091 | public function process($item, $arguments = null, $inheritedScope = null) { |
| 1089 | 1092 | SSViewer::$topLevel[] = $item; |
@@ -1158,7 +1161,7 @@ discard block |
||
| 1158 | 1161 | * @param string $template Template name |
| 1159 | 1162 | * @param mixed $data Data context |
| 1160 | 1163 | * @param array $arguments Additional arguments |
| 1161 | - * @return string Evaluated result |
|
| 1164 | + * @return DBField Evaluated result |
|
| 1162 | 1165 | */ |
| 1163 | 1166 | public static function execute_template($template, $data, $arguments = null, $scope = null) { |
| 1164 | 1167 | $v = new SSViewer($template); |
@@ -1184,6 +1187,9 @@ discard block |
||
| 1184 | 1187 | return $v->process($data, $arguments); |
| 1185 | 1188 | } |
| 1186 | 1189 | |
| 1190 | + /** |
|
| 1191 | + * @param string $content |
|
| 1192 | + */ |
|
| 1187 | 1193 | public function parseTemplateContent($content, $template="") { |
| 1188 | 1194 | return $this->getParser()->compileString( |
| 1189 | 1195 | $content, |
@@ -1212,7 +1218,7 @@ discard block |
||
| 1212 | 1218 | * Return an appropriate base tag for the given template. |
| 1213 | 1219 | * It will be closed on an XHTML document, and unclosed on an HTML document. |
| 1214 | 1220 | * |
| 1215 | - * @param $contentGeneratedSoFar The content of the template generated so far; it should contain |
|
| 1221 | + * @param string $contentGeneratedSoFar The content of the template generated so far; it should contain |
|
| 1216 | 1222 | * the DOCTYPE declaration. |
| 1217 | 1223 | */ |
| 1218 | 1224 | public static function get_base_tag($contentGeneratedSoFar) { |
@@ -1253,6 +1259,9 @@ discard block |
||
| 1253 | 1259 | */ |
| 1254 | 1260 | protected $cacheTemplate; |
| 1255 | 1261 | |
| 1262 | + /** |
|
| 1263 | + * @param string $content |
|
| 1264 | + */ |
|
| 1256 | 1265 | public function __construct($content, TemplateParser $parser = null) { |
| 1257 | 1266 | if ($parser) { |
| 1258 | 1267 | $this->setParser($parser); |
@@ -192,8 +192,6 @@ discard block |
||
| 192 | 192 | /** |
| 193 | 193 | * Method to facilitate deprecation of underscore-prefixed methods automatically being cached. |
| 194 | 194 | * |
| 195 | - * @param string $field |
|
| 196 | - * @param array $arguments |
|
| 197 | 195 | * @param string $identifier an optional custom cache identifier |
| 198 | 196 | * @return unknown |
| 199 | 197 | */ |
@@ -254,7 +252,7 @@ discard block |
||
| 254 | 252 | * - castingHelper: the casting helper for casting the field (e.g. "return new Varchar($fieldName)") |
| 255 | 253 | * |
| 256 | 254 | * @param string $field |
| 257 | - * @return array |
|
| 255 | + * @return string |
|
| 258 | 256 | */ |
| 259 | 257 | public function castingHelperPair($field) { |
| 260 | 258 | Deprecation::notice('2.5', 'use castingHelper() instead'); |
@@ -346,7 +344,7 @@ discard block |
||
| 346 | 344 | * |
| 347 | 345 | * @param string|array|SSViewer $template the template to render into |
| 348 | 346 | * @param array $customFields fields to customise() the object with before rendering |
| 349 | - * @return HTMLText |
|
| 347 | + * @return DBField |
|
| 350 | 348 | */ |
| 351 | 349 | public function renderWith($template, $customFields = null) { |
| 352 | 350 | if(!is_object($template)) { |
@@ -506,6 +504,7 @@ discard block |
||
| 506 | 504 | |
| 507 | 505 | /** |
| 508 | 506 | * Return the value of a field in an SQL-safe format. |
| 507 | + * @param string $field |
|
| 509 | 508 | */ |
| 510 | 509 | public function SQL_val($field, $arguments = null, $cache = true) { |
| 511 | 510 | return Convert::raw2sql($this->RAW_val($field, $arguments, $cache)); |
@@ -513,6 +512,7 @@ discard block |
||
| 513 | 512 | |
| 514 | 513 | /** |
| 515 | 514 | * Return the value of a field in a JavaScript-save format. |
| 515 | + * @param string $field |
|
| 516 | 516 | */ |
| 517 | 517 | public function JS_val($field, $arguments = null, $cache = true) { |
| 518 | 518 | return Convert::raw2js($this->RAW_val($field, $arguments, $cache)); |
@@ -520,6 +520,7 @@ discard block |
||
| 520 | 520 | |
| 521 | 521 | /** |
| 522 | 522 | * Return the value of a field escaped suitable to be inserted into an XML node attribute. |
| 523 | + * @param string $field |
|
| 523 | 524 | */ |
| 524 | 525 | public function ATT_val($field, $arguments = null, $cache = true) { |
| 525 | 526 | return Convert::raw2att($this->RAW_val($field, $arguments, $cache)); |
@@ -530,7 +531,6 @@ discard block |
||
| 530 | 531 | /** |
| 531 | 532 | * Get an array of XML-escaped values by field name |
| 532 | 533 | * |
| 533 | - * @param array $elements an array of field names |
|
| 534 | 534 | * @return array |
| 535 | 535 | */ |
| 536 | 536 | public function getXMLValues($fields) { |
@@ -36,6 +36,10 @@ discard block |
||
| 36 | 36 | */ |
| 37 | 37 | protected $fieldCurrency = null; |
| 38 | 38 | |
| 39 | + /** |
|
| 40 | + * @param string $name |
|
| 41 | + * @param string $title |
|
| 42 | + */ |
|
| 39 | 43 | public function __construct($name, $title = null, $value = "") { |
| 40 | 44 | // naming with underscores to prevent values from actually being saved somewhere |
| 41 | 45 | $this->fieldAmount = new NumericField("{$name}[Amount]", _t('MoneyField.FIELDLABELAMOUNT', 'Amount')); |
@@ -46,7 +50,7 @@ discard block |
||
| 46 | 50 | |
| 47 | 51 | /** |
| 48 | 52 | * @param array |
| 49 | - * @return HTMLText |
|
| 53 | + * @return DBField |
|
| 50 | 54 | */ |
| 51 | 55 | public function Field($properties = array()) { |
| 52 | 56 | return DBField::create_field('HTMLText', |
@@ -139,6 +143,7 @@ discard block |
||
| 139 | 143 | /** |
| 140 | 144 | * @todo Implement removal of readonly state with $bool=false |
| 141 | 145 | * @todo Set readonly state whenever field is recreated, e.g. in setAllowedCurrencies() |
| 146 | + * @param boolean $bool |
|
| 142 | 147 | */ |
| 143 | 148 | public function setReadonly($bool) { |
| 144 | 149 | parent::setReadonly($bool); |
@@ -179,6 +184,9 @@ discard block |
||
| 179 | 184 | return $this->allowedCurrencies; |
| 180 | 185 | } |
| 181 | 186 | |
| 187 | + /** |
|
| 188 | + * @param string $locale |
|
| 189 | + */ |
|
| 182 | 190 | public function setLocale($locale) { |
| 183 | 191 | $this->_locale = $locale; |
| 184 | 192 | return $this; |
@@ -186,6 +186,9 @@ |
||
| 186 | 186 | return $classNames; |
| 187 | 187 | } |
| 188 | 188 | |
| 189 | + /** |
|
| 190 | + * @param \DBClassNameTest_ObjectSubClass $record |
|
| 191 | + */ |
|
| 189 | 192 | public function setValue($value, $record = null, $markChanged = true) { |
| 190 | 193 | parent::setValue($value, $record, $markChanged); |
| 191 | 194 | |