Completed
Pull Request — master (#5119)
by Nicolaas
10:42
created
model/fieldtypes/PrimaryKey.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -20,6 +20,9 @@
 block discarded – undo
20 20
 	 */
21 21
 	protected $autoIncrement = true;
22 22
 
23
+	/**
24
+	 * @param boolean $autoIncrement
25
+	 */
23 26
 	public function setAutoIncrement($autoIncrement) {
24 27
 		$this->autoIncrement = $autoIncrement;
25 28
 		return $this;
Please login to merge, or discard this patch.
model/fieldtypes/Time.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -55,6 +55,9 @@
 block discarded – undo
55 55
 		if($this->value) return date($format, strtotime($this->value));
56 56
 	}
57 57
 
58
+	/**
59
+	 * @param string[] $parts
60
+	 */
58 61
 	public function TwelveHour( $parts ) {
59 62
 		$hour = $parts[1];
60 63
 		$min = $parts[2];
Please login to merge, or discard this patch.
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/queries/SQLAssignmentRow.php 1 patch
Doc Comments   -3 removed lines patch added patch discarded remove patch
@@ -74,9 +74,6 @@
 block discarded – undo
74 74
 	 * Given a list of assignments in any user-acceptible format, normalise the
75 75
 	 * value to a common array('SQL' => array(parameters)) format
76 76
 	 *
77
-	 * @param array $predicates List of assignments.
78
-	 * The key of this array should be the field name, and the value the assigned
79
-	 * literal value, or an array with parameterised information.
80 77
 	 * @return array List of normalised assignments
81 78
 	 */
82 79
 	protected function normaliseAssignments(array $assignments) {
Please login to merge, or discard this patch.
model/queries/SQLConditionalExpression.php 1 patch
Doc Comments   -4 removed lines patch added patch discarded remove patch
@@ -374,7 +374,6 @@  discard block
 block discarded – undo
374 374
 	 * @see SQLConditionalExpression::addWhere() for syntax examples
375 375
 	 *
376 376
 	 * @param mixed $where Predicate(s) to set, as escaped SQL statements or paramaterised queries
377
-	 * @param mixed $where,... Unlimited additional predicates
378 377
 	 * @return self Self reference
379 378
 	 */
380 379
 	public function setWhere($where) {
@@ -460,7 +459,6 @@  discard block
 block discarded – undo
460 459
 	 * </code>
461 460
 	 *
462 461
 	 * @param mixed $where Predicate(s) to set, as escaped SQL statements or paramaterised queries
463
-	 * @param mixed $where,... Unlimited additional predicates
464 462
 	 * @return self Self reference
465 463
 	 */
466 464
 	public function addWhere($where) {
@@ -476,7 +474,6 @@  discard block
 block discarded – undo
476 474
 	 * @see SQLConditionalExpression::addWhere()
477 475
 	 *
478 476
 	 * @param mixed $filters Predicate(s) to set, as escaped SQL statements or paramaterised queries
479
-	 * @param mixed $filters,... Unlimited additional predicates
480 477
 	 * @return self Self reference
481 478
 	 */
482 479
 	public function setWhereAny($filters) {
@@ -490,7 +487,6 @@  discard block
 block discarded – undo
490 487
 	 * @see SQLConditionalExpression::addWhere()
491 488
 	 *
492 489
 	 * @param mixed $filters Predicate(s) to set, as escaped SQL statements or paramaterised queries
493
-	 * @param mixed $filters,... Unlimited additional predicates
494 490
 	 * @return self Self reference
495 491
 	 */
496 492
 	public function addWhereAny($filters) {
Please login to merge, or discard this patch.
model/queries/SQLExpression.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -125,7 +125,6 @@
 block discarded – undo
125 125
 	 * Copies the query parameters contained in this object to another
126 126
 	 * SQLExpression
127 127
 	 *
128
-	 * @param SQLExpression $expression The object to copy properties to
129 128
 	 */
130 129
 	protected function copyTo(SQLExpression $object) {
131 130
 		$target = array_keys(get_object_vars($object));
Please login to merge, or discard this patch.
model/queries/SQLSelect.php 1 patch
Doc Comments   +1 added lines, -4 removed lines patch added patch discarded remove patch
@@ -115,7 +115,6 @@  discard block
 block discarded – undo
115 115
 	 * </code>
116 116
 	 *
117 117
 	 * @param string|array $fields Field names should be ANSI SQL quoted. Array keys should be unquoted.
118
-	 * @param boolean $clear Clear existing select fields?
119 118
 	 * @return $this Self reference
120 119
 	 */
121 120
 	public function setSelect($fields) {
@@ -352,7 +351,7 @@  discard block
 block discarded – undo
352 351
 	 *
353 352
 	 * @param string $value
354 353
 	 * @param string $defaultDirection
355
-	 * @return array A two element array: array($column, $direction)
354
+	 * @return string[] A two element array: array($column, $direction)
356 355
 	 */
357 356
 	private function getDirectionFromString($value, $defaultDirection = null) {
358 357
 		if(preg_match('/^(.*)(asc|desc)$/i', $value, $matches)) {
@@ -447,7 +446,6 @@  discard block
 block discarded – undo
447 446
 	 * @see SQLSelect::addWhere() for syntax examples
448 447
 	 *
449 448
 	 * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries
450
-	 * @param mixed $having,... Unlimited additional predicates
451 449
 	 * @return self Self reference
452 450
 	 */
453 451
 	public function setHaving($having) {
@@ -462,7 +460,6 @@  discard block
 block discarded – undo
462 460
 	 * @see SQLSelect::addWhere() for syntax examples
463 461
 	 *
464 462
 	 * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries
465
-	 * @param mixed $having,... Unlimited additional predicates
466 463
 	 * @return self Self reference
467 464
 	 */
468 465
 	public function addHaving($having) {
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.