Completed
Pull Request — 3.1 (#5200)
by Daniel
12:18
created
model/fieldtypes/Year.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -18,6 +18,9 @@
 block discarded – undo
18 18
 		DB::require_field($this->tableName, $this->name, $values);
19 19
 	}
20 20
 
21
+	/**
22
+	 * @param string $title
23
+	 */
21 24
 	public function scaffoldFormField($title = null, $params = null) {
22 25
 		$selectBox = new DropdownField($this->name, $title);
23 26
 		$selectBox->setSource($this->getDefaultOptions());
Please login to merge, or discard this patch.
model/Hierarchy.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -707,7 +707,7 @@
 block discarded – undo
707 707
 	 * Get the next node in the tree of the type. If there is no instance of the className descended from this node,
708 708
 	 * then search the parents.
709 709
 	 * @param string $className Class name of the node to find.
710
-	 * @param string|int $root ID/ClassName of the node to limit the search to
710
+	 * @param integer $root ID/ClassName of the node to limit the search to
711 711
 	 * @param DataObject afterNode Used for recursive calls to this function
712 712
 	 * @return DataObject
713 713
 	 */
Please login to merge, or discard this patch.
model/HTMLValue.php 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,7 +20,6 @@  discard block
 block discarded – undo
20 20
 	abstract public function setContent($fragment);
21 21
 
22 22
 	/**
23
-	 * @param string $content
24 23
 	 * @return string
25 24
 	 */
26 25
 	public function getContent() {
@@ -140,7 +139,7 @@  discard block
 block discarded – undo
140 139
 	/**
141 140
 	 * Make an xpath query against this HTML
142 141
 	 *
143
-	 * @param $query string - The xpath query string
142
+	 * @param string $query string - The xpath query string
144 143
 	 * @return DOMNodeList
145 144
 	 */
146 145
 	public function query($query) {
Please login to merge, or discard this patch.
model/Map.php 1 patch
Doc Comments   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,6 +41,7 @@  discard block
 block discarded – undo
41 41
 	 * Set the key field for this map.
42 42
 	 *
43 43
 	 * @var string $keyField
44
+	 * @param string $keyField
44 45
 	 */
45 46
 	public function setKeyField($keyField) {
46 47
 		$this->keyField = $keyField;
@@ -50,6 +51,7 @@  discard block
 block discarded – undo
50 51
 	 * Set the value field for this map.
51 52
 	 *
52 53
 	 * @var string $valueField
54
+	 * @param string $valueField
53 55
 	 */
54 56
 	public function setValueField($valueField) {
55 57
 		$this->valueField = $valueField;
@@ -95,6 +97,7 @@  discard block
 block discarded – undo
95 97
 	 *
96 98
 	 * @var string $key
97 99
 	 * @var mixed $value
100
+	 * @param string $value
98 101
 	 */
99 102
 	public function unshift($key, $value) {
100 103
 		$oldItems = $this->firstItems;
@@ -114,6 +117,7 @@  discard block
 block discarded – undo
114 117
 	 *
115 118
 	 * @var string $key
116 119
 	 * @var mixed $value
120
+	 * @param string $value
117 121
 	 */
118 122
 	public function push($key, $value) {
119 123
 		$oldItems = $this->lastItems;
@@ -286,7 +290,7 @@  discard block
 block discarded – undo
286 290
 	 * @param Iterator $items The iterator to build this map from
287 291
 	 * @param string $keyField The field to use for the keys
288 292
 	 * @param string $titleField The field to use for the values
289
-	 * @param array $fristItems An optional map of items to show first
293
+	 * @param array $firstItems An optional map of items to show first
290 294
 	 * @param array $lastItems An optional map of items to show last
291 295
 	 */
292 296
 	public function __construct(Iterator $items, $keyField, $titleField, $firstItems = null, $lastItems = null) {
Please login to merge, or discard this patch.
model/UnsavedRelationList.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,6 +50,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
model/URLSegmentFilter.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
model/Versioned.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -786,7 +786,7 @@  discard block
 block discarded – undo
786 786
 	/**
787 787
 	 * Get the latest published DataObject.
788 788
 	 *
789
-	 * @return DataObject
789
+	 * @return string
790 790
 	 */
791 791
 	public function latestPublished() {
792 792
 		// Get the root data object class - this will have the version field
@@ -805,8 +805,8 @@  discard block
 block discarded – undo
805 805
 	/**
806 806
 	 * Move a database record from one stage to the other.
807 807
 	 *
808
-	 * @param fromStage Place to copy from.  Can be either a stage name or a version number.
809
-	 * @param toStage Place to copy to.  Must be a stage name.
808
+	 * @param fromStage integer to copy from.  Can be either a stage name or a version number.
809
+	 * @param toStage string to copy to.  Must be a stage name.
810 810
 	 * @param createNewVersion Set this to true to create a new version number.  By default, the existing version
811 811
 	 *                         number will be copied over.
812 812
 	 */
@@ -980,6 +980,7 @@  discard block
 block discarded – undo
980 980
 	/**
981 981
 	 * Return the base table - the class that directly extends DataObject.
982 982
 	 *
983
+	 * @param string $stage
983 984
 	 * @return string
984 985
 	 */
985 986
 	public function baseTable($stage = null) {
@@ -1134,7 +1135,6 @@  discard block
 block discarded – undo
1134 1135
 	 * @param string $stage The name of the stage.
1135 1136
 	 * @param string $filter A filter to be inserted into the WHERE clause.
1136 1137
 	 * @param boolean $cache Use caching.
1137
-	 * @param string $orderby A sort expression to be inserted into the ORDER BY clause.
1138 1138
 	 *
1139 1139
 	 * @return DataObject
1140 1140
 	 */
Please login to merge, or discard this patch.
oembed/Oembed.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -46,6 +46,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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();
Please login to merge, or discard this patch.
parsers/BBCodeParser.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -165,7 +165,7 @@
 block discarded – undo
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('&amp;', '&lt;', '&gt;'), $this->content);
Please login to merge, or discard this patch.