@@ -38,6 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | /** |
| 40 | 40 | * @todo Move this to SS_Database or DB |
| 41 | + * @param string $class |
|
| 41 | 42 | */ |
| 42 | 43 | public static function hasTable($class) { |
| 43 | 44 | // Cache the list of all table names to reduce on DB traffic |
@@ -219,6 +220,7 @@ discard block |
||
| 219 | 220 | |
| 220 | 221 | /** |
| 221 | 222 | * Returns true if the given class implements the given interface |
| 223 | + * @param string $interfaceName |
|
| 222 | 224 | */ |
| 223 | 225 | public static function classImplements($className, $interfaceName) { |
| 224 | 226 | return in_array($className, self::implementorsOf($interfaceName)); |
@@ -269,6 +271,9 @@ discard block |
||
| 269 | 271 | |
| 270 | 272 | private static $method_from_cache = array(); |
| 271 | 273 | |
| 274 | + /** |
|
| 275 | + * @param string $method |
|
| 276 | + */ |
|
| 272 | 277 | public static function has_method_from($class, $method, $compclass) { |
| 273 | 278 | $lClass = strtolower($class); |
| 274 | 279 | $lMethod = strtolower($method); |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | * Returns a new DataList instance with the specified query parameter assigned |
| 158 | 158 | * |
| 159 | 159 | * @param string|array $keyOrArray Either the single key to set, or an array of key value pairs to set |
| 160 | - * @param mixed $val If $keyOrArray is not an array, this is the value to set |
|
| 160 | + * @param string $val If $keyOrArray is not an array, this is the value to set |
|
| 161 | 161 | * @return DataList |
| 162 | 162 | */ |
| 163 | 163 | public function setDataQueryParam($keyOrArray, $val = null) { |
@@ -520,7 +520,7 @@ discard block |
||
| 520 | 520 | * Check if the given field specification could be interpreted as an unquoted relation name |
| 521 | 521 | * |
| 522 | 522 | * @param string $field |
| 523 | - * @return bool |
|
| 523 | + * @return integer |
|
| 524 | 524 | */ |
| 525 | 525 | protected function isValidRelationName($field) { |
| 526 | 526 | return preg_match('/^[A-Z0-9._]+$/i', $field); |
@@ -635,7 +635,7 @@ discard block |
||
| 635 | 635 | * @param int $order A numerical index to control the order that joins are added to the query; lower order values |
| 636 | 636 | * will cause the query to appear first. The default is 20, and joins created automatically by the |
| 637 | 637 | * ORM have a value of 10. |
| 638 | - * @param array $parameters Any additional parameters if the join is a parameterised subquery |
|
| 638 | + * @param string[] $parameters Any additional parameters if the join is a parameterised subquery |
|
| 639 | 639 | * @return DataList |
| 640 | 640 | */ |
| 641 | 641 | public function innerJoin($table, $onClause, $alias = null, $order = 20, $parameters = array()) { |
@@ -653,7 +653,7 @@ discard block |
||
| 653 | 653 | * @param int $order A numerical index to control the order that joins are added to the query; lower order values |
| 654 | 654 | * will cause the query to appear first. The default is 20, and joins created automatically by the |
| 655 | 655 | * ORM have a value of 10. |
| 656 | - * @param array $parameters Any additional parameters if the join is a parameterised subquery |
|
| 656 | + * @param string[] $parameters Any additional parameters if the join is a parameterised subquery |
|
| 657 | 657 | * @return DataList |
| 658 | 658 | */ |
| 659 | 659 | public function leftJoin($table, $onClause, $alias = null, $order = 20, $parameters = array()) { |
@@ -780,7 +780,7 @@ discard block |
||
| 780 | 780 | * Return the maximum value of the given field in this DataList |
| 781 | 781 | * |
| 782 | 782 | * @param string $fieldName |
| 783 | - * @return mixed |
|
| 783 | + * @return string |
|
| 784 | 784 | */ |
| 785 | 785 | public function max($fieldName) { |
| 786 | 786 | return $this->dataQuery->max($fieldName); |
@@ -790,7 +790,7 @@ discard block |
||
| 790 | 790 | * Return the minimum value of the given field in this DataList |
| 791 | 791 | * |
| 792 | 792 | * @param string $fieldName |
| 793 | - * @return mixed |
|
| 793 | + * @return string |
|
| 794 | 794 | */ |
| 795 | 795 | public function min($fieldName) { |
| 796 | 796 | return $this->dataQuery->min($fieldName); |
@@ -800,7 +800,7 @@ discard block |
||
| 800 | 800 | * Return the average value of the given field in this DataList |
| 801 | 801 | * |
| 802 | 802 | * @param string $fieldName |
| 803 | - * @return mixed |
|
| 803 | + * @return string |
|
| 804 | 804 | */ |
| 805 | 805 | public function avg($fieldName) { |
| 806 | 806 | return $this->dataQuery->avg($fieldName); |
@@ -810,7 +810,7 @@ discard block |
||
| 810 | 810 | * Return the sum of the values of the given field in this DataList |
| 811 | 811 | * |
| 812 | 812 | * @param string $fieldName |
| 813 | - * @return mixed |
|
| 813 | + * @return string |
|
| 814 | 814 | */ |
| 815 | 815 | public function sum($fieldName) { |
| 816 | 816 | return $this->dataQuery->sum($fieldName); |
@@ -862,7 +862,7 @@ discard block |
||
| 862 | 862 | /** |
| 863 | 863 | * Restrict the columns to fetch into this DataList |
| 864 | 864 | * |
| 865 | - * @param array $queriedColumns |
|
| 865 | + * @param string[] $queriedColumns |
|
| 866 | 866 | * @return DataList |
| 867 | 867 | */ |
| 868 | 868 | public function setQueriedColumns($queriedColumns) { |
@@ -1135,7 +1135,7 @@ discard block |
||
| 1135 | 1135 | /** |
| 1136 | 1136 | * Returns item stored in list with index $key |
| 1137 | 1137 | * |
| 1138 | - * @param mixed $key |
|
| 1138 | + * @param integer $key |
|
| 1139 | 1139 | * @return DataObject |
| 1140 | 1140 | */ |
| 1141 | 1141 | public function offsetGet($key) { |
@@ -732,6 +732,9 @@ discard block |
||
| 732 | 732 | return $result; |
| 733 | 733 | } |
| 734 | 734 | |
| 735 | + /** |
|
| 736 | + * @param string $mode |
|
| 737 | + */ |
|
| 735 | 738 | protected function _get($dir, $mode, $tags = array()) |
| 736 | 739 | { |
| 737 | 740 | if (!is_dir($dir)) { |
@@ -819,6 +822,7 @@ discard block |
||
| 819 | 822 | /** |
| 820 | 823 | * Compute & return the expire time |
| 821 | 824 | * |
| 825 | + * @param integer $lifetime |
|
| 822 | 826 | * @return int expire time (unix timestamp) |
| 823 | 827 | */ |
| 824 | 828 | protected function _expireTime($lifetime) |
@@ -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); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | * Which columns are handled by this component |
| 56 | 56 | * |
| 57 | 57 | * @param GridField $gridField |
| 58 | - * @return array |
|
| 58 | + * @return string[] |
|
| 59 | 59 | */ |
| 60 | 60 | public function getColumnsHandled($gridField) { |
| 61 | 61 | return array('Actions'); |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | * @param DataObject $record |
| 77 | 77 | * @param string $columnName |
| 78 | 78 | * |
| 79 | - * @return string - the HTML for the column |
|
| 79 | + * @return DBField - the HTML for the column |
|
| 80 | 80 | */ |
| 81 | 81 | public function getColumnContent($gridField, $record, $columnName) { |
| 82 | 82 | // No permission checks, handled through GridFieldDetailForm, |
@@ -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', |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | * |
| 77 | 77 | * @param string $name the field name |
| 78 | 78 | * @param string $title the field label |
| 79 | - * @param string|array $sourceObject The object-type to list in the tree. This could |
|
| 79 | + * @param string $sourceObject The object-type to list in the tree. This could |
|
| 80 | 80 | * be one of the following: |
| 81 | 81 | * - A DataObject class name with the {@link Hierarchy} extension. |
| 82 | 82 | * - An array of key/value pairs, like a {@link DropdownField} source. In |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | /** |
| 207 | - * @return HTMLText |
|
| 207 | + * @return DBField |
|
| 208 | 208 | */ |
| 209 | 209 | public function Field($properties = array()) { |
| 210 | 210 | Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/javascript/lang'); |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | * If a filter function has been set, that will be called. And if search text is set, |
| 386 | 386 | * filter on that too. Return true if all applicable conditions are true, false otherwise. |
| 387 | 387 | * @param $node |
| 388 | - * @return unknown_type |
|
| 388 | + * @return boolean |
|
| 389 | 389 | */ |
| 390 | 390 | public function filterMarking($node) { |
| 391 | 391 | if ($this->filterCallback && !call_user_func($this->filterCallback, $node)) return false; |
@@ -436,7 +436,6 @@ discard block |
||
| 436 | 436 | } |
| 437 | 437 | |
| 438 | 438 | /** |
| 439 | - * @param String $field |
|
| 440 | 439 | */ |
| 441 | 440 | public function setSourceObject($class) { |
| 442 | 441 | $this->sourceObject = $class; |
@@ -211,7 +211,6 @@ discard block |
||
| 211 | 211 | * @param string $title The field label. |
| 212 | 212 | * @param SS_List $items If no items are defined, the field will try to auto-detect an existing relation on |
| 213 | 213 | * @link $record}, with the same name as the field name. |
| 214 | - * @param Form $form Reference to the container form |
|
| 215 | 214 | */ |
| 216 | 215 | public function __construct($name, $title = null, SS_List $items = null) { |
| 217 | 216 | |
@@ -1078,7 +1077,7 @@ discard block |
||
| 1078 | 1077 | |
| 1079 | 1078 | /** |
| 1080 | 1079 | * @param SS_HTTPRequest $request |
| 1081 | - * @return UploadField_ItemHandler |
|
| 1080 | + * @return UploadField_SelectHandler |
|
| 1082 | 1081 | */ |
| 1083 | 1082 | public function handleSelect(SS_HTTPRequest $request) { |
| 1084 | 1083 | if(!$this->canAttachExisting()) return $this->httpError(403); |
@@ -1434,7 +1433,7 @@ discard block |
||
| 1434 | 1433 | * Action to handle editing of a single file |
| 1435 | 1434 | * |
| 1436 | 1435 | * @param SS_HTTPRequest $request |
| 1437 | - * @return ViewableData_Customised |
|
| 1436 | + * @return DBField |
|
| 1438 | 1437 | */ |
| 1439 | 1438 | public function edit(SS_HTTPRequest $request) { |
| 1440 | 1439 | // Check form field state |
@@ -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'); |