@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | * Returns a new DataList instance with the specified query parameter assigned |
180 | 180 | * |
181 | 181 | * @param string|array $keyOrArray Either the single key to set, or an array of key value pairs to set |
182 | - * @param mixed $val If $keyOrArray is not an array, this is the value to set |
|
182 | + * @param string $val If $keyOrArray is not an array, this is the value to set |
|
183 | 183 | * @return static |
184 | 184 | */ |
185 | 185 | public function setDataQueryParam($keyOrArray, $val = null) |
@@ -556,7 +556,7 @@ discard block |
||
556 | 556 | * Check if the given field specification could be interpreted as an unquoted relation name |
557 | 557 | * |
558 | 558 | * @param string $field |
559 | - * @return bool |
|
559 | + * @return integer |
|
560 | 560 | */ |
561 | 561 | protected function isValidRelationName($field) |
562 | 562 | { |
@@ -669,7 +669,7 @@ discard block |
||
669 | 669 | * @param int $order A numerical index to control the order that joins are added to the query; lower order values |
670 | 670 | * will cause the query to appear first. The default is 20, and joins created automatically by the |
671 | 671 | * ORM have a value of 10. |
672 | - * @param array $parameters Any additional parameters if the join is a parameterised subquery |
|
672 | + * @param string[] $parameters Any additional parameters if the join is a parameterised subquery |
|
673 | 673 | * @return static |
674 | 674 | */ |
675 | 675 | public function innerJoin($table, $onClause, $alias = null, $order = 20, $parameters = array()) |
@@ -688,7 +688,7 @@ discard block |
||
688 | 688 | * @param int $order A numerical index to control the order that joins are added to the query; lower order values |
689 | 689 | * will cause the query to appear first. The default is 20, and joins created automatically by the |
690 | 690 | * ORM have a value of 10. |
691 | - * @param array $parameters Any additional parameters if the join is a parameterised subquery |
|
691 | + * @param string[] $parameters Any additional parameters if the join is a parameterised subquery |
|
692 | 692 | * @return static |
693 | 693 | */ |
694 | 694 | public function leftJoin($table, $onClause, $alias = null, $order = 20, $parameters = array()) |
@@ -815,7 +815,7 @@ discard block |
||
815 | 815 | * Returns an Iterator for this DataList. |
816 | 816 | * This function allows you to use DataLists in foreach loops |
817 | 817 | * |
818 | - * @return Generator |
|
818 | + * @return \Generator |
|
819 | 819 | */ |
820 | 820 | public function getIterator() |
821 | 821 | { |
@@ -838,7 +838,7 @@ discard block |
||
838 | 838 | * Return the maximum value of the given field in this DataList |
839 | 839 | * |
840 | 840 | * @param string $fieldName |
841 | - * @return mixed |
|
841 | + * @return string |
|
842 | 842 | */ |
843 | 843 | public function max($fieldName) |
844 | 844 | { |
@@ -849,7 +849,7 @@ discard block |
||
849 | 849 | * Return the minimum value of the given field in this DataList |
850 | 850 | * |
851 | 851 | * @param string $fieldName |
852 | - * @return mixed |
|
852 | + * @return string |
|
853 | 853 | */ |
854 | 854 | public function min($fieldName) |
855 | 855 | { |
@@ -860,7 +860,7 @@ discard block |
||
860 | 860 | * Return the average value of the given field in this DataList |
861 | 861 | * |
862 | 862 | * @param string $fieldName |
863 | - * @return mixed |
|
863 | + * @return string |
|
864 | 864 | */ |
865 | 865 | public function avg($fieldName) |
866 | 866 | { |
@@ -871,7 +871,7 @@ discard block |
||
871 | 871 | * Return the sum of the values of the given field in this DataList |
872 | 872 | * |
873 | 873 | * @param string $fieldName |
874 | - * @return mixed |
|
874 | + * @return string |
|
875 | 875 | */ |
876 | 876 | public function sum($fieldName) |
877 | 877 | { |
@@ -930,7 +930,7 @@ discard block |
||
930 | 930 | /** |
931 | 931 | * Restrict the columns to fetch into this DataList |
932 | 932 | * |
933 | - * @param array $queriedColumns |
|
933 | + * @param string[] $queriedColumns |
|
934 | 934 | * @return static |
935 | 935 | */ |
936 | 936 | public function setQueriedColumns($queriedColumns) |
@@ -1176,7 +1176,7 @@ discard block |
||
1176 | 1176 | /** |
1177 | 1177 | * Returns item stored in list with index $key |
1178 | 1178 | * |
1179 | - * @param mixed $key |
|
1179 | + * @param integer $key |
|
1180 | 1180 | * @return DataObject |
1181 | 1181 | */ |
1182 | 1182 | public function offsetGet($key) |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * Returns an Iterator for this ArrayList. |
81 | 81 | * This function allows you to use ArrayList in foreach loops |
82 | 82 | * |
83 | - * @return ArrayIterator |
|
83 | + * @return \Generator |
|
84 | 84 | */ |
85 | 85 | public function getIterator() |
86 | 86 | { |
@@ -746,7 +746,7 @@ discard block |
||
746 | 746 | /** |
747 | 747 | * Returns item stored in list with index $key |
748 | 748 | * |
749 | - * @param mixed $offset |
|
749 | + * @param integer $offset |
|
750 | 750 | * @return DataObject |
751 | 751 | */ |
752 | 752 | public function offsetGet($offset) |
@@ -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 | { |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | * @param array $attributes an array of attributes to include on the link. |
118 | 118 | * @param string $iconClass |
119 | 119 | * |
120 | - * @return boolean The result of the operation. |
|
120 | + * @return boolean|null The result of the operation. |
|
121 | 121 | */ |
122 | 122 | public static function add_link($code, $menuTitle, $url, $priority = -1, $attributes = null, $iconClass = null) |
123 | 123 | { |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | * @param array $attributes an array of attributes to include on the link. |
141 | 141 | * @param string $iconClass |
142 | 142 | * |
143 | - * @return bool Success |
|
143 | + * @return boolean|null Success |
|
144 | 144 | */ |
145 | 145 | public static function add_menu_item( |
146 | 146 | $code, |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | * @param array $attributes an array of attributes to include on the link. |
323 | 323 | * @param string $iconClass |
324 | 324 | * |
325 | - * @return bool Success |
|
325 | + * @return boolean|null Success |
|
326 | 326 | */ |
327 | 327 | public static function replace_menu_item( |
328 | 328 | $code, |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | /** |
265 | 265 | * Gets the combined configuration of all LeafAndMain subclasses required by the client app. |
266 | 266 | * |
267 | - * @return array |
|
267 | + * @return string |
|
268 | 268 | * |
269 | 269 | * WARNING: Experimental API |
270 | 270 | */ |
@@ -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 | { |
@@ -1006,7 +1006,7 @@ discard block |
||
1006 | 1006 | * {@link SSViewer::get_templates_by_class()} |
1007 | 1007 | * |
1008 | 1008 | * @param string $suffix |
1009 | - * @return array |
|
1009 | + * @return string |
|
1010 | 1010 | */ |
1011 | 1011 | public function getTemplatesWithSuffix($suffix) |
1012 | 1012 | { |
@@ -2159,7 +2159,7 @@ discard block |
||
2159 | 2159 | } |
2160 | 2160 | |
2161 | 2161 | /** |
2162 | - * @return String |
|
2162 | + * @return DBField |
|
2163 | 2163 | */ |
2164 | 2164 | public function Locale() |
2165 | 2165 | { |
@@ -42,6 +42,9 @@ |
||
42 | 42 | ] |
43 | 43 | ); |
44 | 44 | |
45 | + /** |
|
46 | + * @param string $root |
|
47 | + */ |
|
45 | 48 | public function __construct($root = null, $writeFlags = LOCK_EX, $linkHandling = self::DISALLOW_LINKS) |
46 | 49 | { |
47 | 50 | // Get root path, and ensure that this exists and is safe |