@@ -46,6 +46,7 @@ discard block |
||
46 | 46 | * Set the key field for this map. |
47 | 47 | * |
48 | 48 | * @var string $keyField |
49 | + * @param string $keyField |
|
49 | 50 | */ |
50 | 51 | public function setKeyField($keyField) |
51 | 52 | { |
@@ -56,6 +57,7 @@ discard block |
||
56 | 57 | * Set the value field for this map. |
57 | 58 | * |
58 | 59 | * @var string $valueField |
60 | + * @param string $valueField |
|
59 | 61 | */ |
60 | 62 | public function setValueField($valueField) |
61 | 63 | { |
@@ -105,6 +107,7 @@ discard block |
||
105 | 107 | * |
106 | 108 | * @var string $key |
107 | 109 | * @var mixed $value |
110 | + * @param string $value |
|
108 | 111 | * @return $this |
109 | 112 | */ |
110 | 113 | public function unshift($key, $value) |
@@ -126,6 +129,7 @@ discard block |
||
126 | 129 | * |
127 | 130 | * @var string $key |
128 | 131 | * @var mixed $value |
132 | + * @param string $value |
|
129 | 133 | * @return $this |
130 | 134 | */ |
131 | 135 | public function push($key, $value) |
@@ -255,7 +259,7 @@ discard block |
||
255 | 259 | * |
256 | 260 | * Satisfies the IteratorAggreagte interface. |
257 | 261 | * |
258 | - * @return Map_Iterator |
|
262 | + * @return \Generator |
|
259 | 263 | */ |
260 | 264 | public function getIterator() |
261 | 265 | { |
@@ -7,7 +7,6 @@ |
||
7 | 7 | use SilverStripe\ORM\Filters\SearchFilter; |
8 | 8 | use SilverStripe\ORM\Queries\SQLConditionGroup; |
9 | 9 | use SilverStripe\View\ViewableData; |
10 | -use ArrayIterator; |
|
11 | 10 | use Exception; |
12 | 11 | use InvalidArgumentException; |
13 | 12 | use LogicException; |
@@ -541,7 +541,7 @@ discard block |
||
541 | 541 | * Check if the given field specification could be interpreted as an unquoted relation name |
542 | 542 | * |
543 | 543 | * @param string $field |
544 | - * @return bool |
|
544 | + * @return integer |
|
545 | 545 | */ |
546 | 546 | protected function isValidRelationName($field) |
547 | 547 | { |
@@ -654,7 +654,7 @@ discard block |
||
654 | 654 | * @param int $order A numerical index to control the order that joins are added to the query; lower order values |
655 | 655 | * will cause the query to appear first. The default is 20, and joins created automatically by the |
656 | 656 | * ORM have a value of 10. |
657 | - * @param array $parameters Any additional parameters if the join is a parameterised subquery |
|
657 | + * @param string[] $parameters Any additional parameters if the join is a parameterised subquery |
|
658 | 658 | * @return static |
659 | 659 | */ |
660 | 660 | public function innerJoin($table, $onClause, $alias = null, $order = 20, $parameters = array()) |
@@ -673,7 +673,7 @@ discard block |
||
673 | 673 | * @param int $order A numerical index to control the order that joins are added to the query; lower order values |
674 | 674 | * will cause the query to appear first. The default is 20, and joins created automatically by the |
675 | 675 | * ORM have a value of 10. |
676 | - * @param array $parameters Any additional parameters if the join is a parameterised subquery |
|
676 | + * @param string[] $parameters Any additional parameters if the join is a parameterised subquery |
|
677 | 677 | * @return static |
678 | 678 | */ |
679 | 679 | public function leftJoin($table, $onClause, $alias = null, $order = 20, $parameters = array()) |
@@ -799,7 +799,7 @@ discard block |
||
799 | 799 | * Returns an Iterator for this DataList. |
800 | 800 | * This function allows you to use DataLists in foreach loops |
801 | 801 | * |
802 | - * @return Generator |
|
802 | + * @return \Generator |
|
803 | 803 | */ |
804 | 804 | public function getIterator() |
805 | 805 | { |
@@ -822,7 +822,7 @@ discard block |
||
822 | 822 | * Return the maximum value of the given field in this DataList |
823 | 823 | * |
824 | 824 | * @param string $fieldName |
825 | - * @return mixed |
|
825 | + * @return string |
|
826 | 826 | */ |
827 | 827 | public function max($fieldName) |
828 | 828 | { |
@@ -833,7 +833,7 @@ discard block |
||
833 | 833 | * Return the minimum value of the given field in this DataList |
834 | 834 | * |
835 | 835 | * @param string $fieldName |
836 | - * @return mixed |
|
836 | + * @return string |
|
837 | 837 | */ |
838 | 838 | public function min($fieldName) |
839 | 839 | { |
@@ -844,7 +844,7 @@ discard block |
||
844 | 844 | * Return the average value of the given field in this DataList |
845 | 845 | * |
846 | 846 | * @param string $fieldName |
847 | - * @return mixed |
|
847 | + * @return string |
|
848 | 848 | */ |
849 | 849 | public function avg($fieldName) |
850 | 850 | { |
@@ -855,7 +855,7 @@ discard block |
||
855 | 855 | * Return the sum of the values of the given field in this DataList |
856 | 856 | * |
857 | 857 | * @param string $fieldName |
858 | - * @return mixed |
|
858 | + * @return string |
|
859 | 859 | */ |
860 | 860 | public function sum($fieldName) |
861 | 861 | { |
@@ -914,7 +914,7 @@ discard block |
||
914 | 914 | /** |
915 | 915 | * Restrict the columns to fetch into this DataList |
916 | 916 | * |
917 | - * @param array $queriedColumns |
|
917 | + * @param string[] $queriedColumns |
|
918 | 918 | * @return static |
919 | 919 | */ |
920 | 920 | public function setQueriedColumns($queriedColumns) |
@@ -1160,7 +1160,7 @@ discard block |
||
1160 | 1160 | /** |
1161 | 1161 | * Returns item stored in list with index $key |
1162 | 1162 | * |
1163 | - * @param mixed $key |
|
1163 | + * @param integer $key |
|
1164 | 1164 | * @return DataObject |
1165 | 1165 | */ |
1166 | 1166 | public function offsetGet($key) |
@@ -89,6 +89,9 @@ discard block |
||
89 | 89 | $this->sequentialSaveableSet = null; |
90 | 90 | } |
91 | 91 | |
92 | + /** |
|
93 | + * @param FormField[] $list |
|
94 | + */ |
|
92 | 95 | protected function collateDataFields(&$list, $saveableOnly = false) |
93 | 96 | { |
94 | 97 | if (!isset($list)) { |
@@ -198,7 +201,7 @@ discard block |
||
198 | 201 | * Removes a number of fields from a Tab/TabSet within this FieldList. |
199 | 202 | * |
200 | 203 | * @param string $tabName The name of the Tab or TabSet field |
201 | - * @param array $fields A list of fields, e.g. array('Name', 'Email') |
|
204 | + * @param string[] $fields A list of fields, e.g. array('Name', 'Email') |
|
202 | 205 | */ |
203 | 206 | public function removeFieldsFromTab($tabName, $fields) |
204 | 207 | { |
@@ -625,7 +628,7 @@ discard block |
||
625 | 628 | } |
626 | 629 | |
627 | 630 | /** |
628 | - * @param $field |
|
631 | + * @param CompositeField $field |
|
629 | 632 | * @return $this |
630 | 633 | */ |
631 | 634 | public function setContainerField($field) |
@@ -707,6 +710,7 @@ discard block |
||
707 | 710 | * the children collection. Doesn't work recursively. |
708 | 711 | * |
709 | 712 | * @param string|FormField |
713 | + * @param string $field |
|
710 | 714 | * @return int Position in children collection (first position starts with 0). |
711 | 715 | * Returns FALSE if the field can't be found. |
712 | 716 | */ |
@@ -77,7 +77,7 @@ |
||
77 | 77 | * |
78 | 78 | * @param GridField |
79 | 79 | * |
80 | - * @return array |
|
80 | + * @return string[] |
|
81 | 81 | */ |
82 | 82 | public function getActions($gridField) |
83 | 83 | { |
@@ -12,7 +12,7 @@ |
||
12 | 12 | |
13 | 13 | /** |
14 | 14 | * @param array $properties |
15 | - * @return string |
|
15 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
16 | 16 | */ |
17 | 17 | public function FieldHolder($properties = array()) |
18 | 18 | { |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use SilverStripe\Core\Convert; |
6 | 6 | use SilverStripe\ORM\FieldType\DBHTMLText; |
7 | -use SilverStripe\View\Requirements; |
|
8 | 7 | use InvalidArgumentException; |
9 | 8 | |
10 | 9 | /** |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use InvalidArgumentException; |
6 | 6 | use Serializable; |
7 | -use SilverStripe\Core\Convert; |
|
8 | 7 | use SilverStripe\Core\Injector\Injectable; |
9 | 8 | use SilverStripe\Dev\Deprecation; |
10 | 9 |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace SilverStripe\Forms\Tests; |
4 | 4 | |
5 | -use SilverStripe\Core\Config\Config; |
|
6 | 5 | use SilverStripe\Dev\SapphireTest; |
7 | 6 | use SilverStripe\Forms\CurrencyField; |
8 | 7 | use SilverStripe\Forms\RequiredFields; |
@@ -39,7 +39,7 @@ |
||
39 | 39 | /** |
40 | 40 | * @skipUpgrade |
41 | 41 | * @param GridField $gridField |
42 | - * @return array |
|
42 | + * @return string[] |
|
43 | 43 | */ |
44 | 44 | public function getColumnsHandled($gridField) |
45 | 45 | { |