silverstripe / silverstripe-framework

model/fieldtypes/Decimal.php

Doc Comments +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
 	 * @param string $name
 	 * @param int $wholeSize
 	 * @param int $decimalSize
-	 * @param float $defaultValue
+	 * @param integer $defaultValue
 	 */
 	public function __construct($name = null, $wholeSize = 9, $decimalSize = 2, $defaultValue = 0) {
 		$this->wholeSize = is_int($wholeSize) ? $wholeSize : 9;
@@ -27,14 +27,14 @@ 
 	}
 
 	/**
-	 * @return float
+	 * @return string
 	 */
 	public function Nice() {
 		return number_format($this->value, $this->decimalSize);
 	}
 
 	/**
-	 * @return int
+	 * @return double
 	 */
 	public function Int() {
 		return floor($this->value);
@@ -80,7 +80,7 @@ 
 	}
 
 	/**
-	 * @return float
+	 * @return integer
 	 */
 	public function nullValue() {
 		return 0;

model/fieldtypes/HTMLText.php

Doc Comments +3 added lines

@@ -36,6 +36,9 @@
 
 	protected $whitelist = false;
 
+	/**
+	 * @param string $name
+	 */
 	public function __construct($name = null, $options = array()) {
 		if(is_string($options)) {
 			$options = array('whitelist' => $options);

model/fieldtypes/Money.php

Doc Comments +7 added lines

@@ -92,6 +92,7 @@ 
 
 	/**
 	 * @param string
+	 * @param string|null $currency
 	 */
 	public function setCurrency($currency, $markChanged = true) {
 		$this->setField('Currency', $currency, $markChanged);
@@ -142,6 +143,8 @@ 
 	}
 
 	/**
+	 * @param string $currency
+	 * @param string $locale
 	 * @return string
 	 */
 	public function getSymbol($currency = null, $locale = null) {
@@ -153,6 +156,8 @@ 
 	}
 
 	/**
+	 * @param string $currency
+	 * @param string $locale
 	 * @return string
 	 */
 	public function getShortName($currency = null, $locale = null) {
@@ -163,6 +168,8 @@ 
 	}
 
 	/**
+	 * @param string $currency
+	 * @param string $locale
 	 * @return string
 	 */
 	public function getCurrencyName($currency = null, $locale = null) {

model/fieldtypes/PrimaryKey.php

Doc Comments +3 added lines

@@ -20,6 +20,9 @@
 	 */
 	protected $autoIncrement = true;
 
+	/**
+	 * @param boolean $autoIncrement
+	 */
 	public function setAutoIncrement($autoIncrement) {
 		$this->autoIncrement = $autoIncrement;
 		return $this;

model/fieldtypes/Time.php

Doc Comments +3 added lines

@@ -55,6 +55,9 @@
 		if($this->value) return date($format, strtotime($this->value));
 	}
 
+	/**
+	 * @param string[] $parts
+	 */
 	public function TwelveHour( $parts ) {
 		$hour = $parts[1];
 		$min = $parts[2];

model/fieldtypes/Year.php

Doc Comments +3 added lines

@@ -18,6 +18,9 @@
 		DB::require_field($this->tableName, $this->name, $values);
 	}
 
+	/**
+	 * @param string $title
+	 */
 	public function scaffoldFormField($title = null, $params = null) {
 		$selectBox = new DropdownField($this->name, $title);
 		$selectBox->setSource($this->getDefaultOptions());

model/Hierarchy.php

Doc Comments +1 added lines, -1 removed lines

@@ -707,7 +707,7 @@
 	 * Get the next node in the tree of the type. If there is no instance of the className descended from this node,
 	 * then search the parents.
 	 * @param string $className Class name of the node to find.
-	 * @param string|int $root ID/ClassName of the node to limit the search to
+	 * @param integer $root ID/ClassName of the node to limit the search to
 	 * @param DataObject afterNode Used for recursive calls to this function
 	 * @return DataObject
 	 */

model/HTMLValue.php

Doc Comments +1 added lines, -2 removed lines

@@ -20,7 +20,6 @@ 
 	abstract public function setContent($fragment);
 
 	/**
-	 * @param string $content
 	 * @return string
 	 */
 	public function getContent() {
@@ -140,7 +139,7 @@ 
 	/**
 	 * Make an xpath query against this HTML
 	 *
-	 * @param $query string - The xpath query string
+	 * @param string $query string - The xpath query string
 	 * @return DOMNodeList
 	 */
 	public function query($query) {

model/queries/SQLAssignmentRow.php

Doc Comments -3 removed lines

@@ -74,9 +74,6 @@
 	 * Given a list of assignments in any user-acceptible format, normalise the
 	 * value to a common array('SQL' => array(parameters)) format
 	 *
-	 * @param array $predicates List of assignments.
-	 * The key of this array should be the field name, and the value the assigned
-	 * literal value, or an array with parameterised information.
 	 * @return array List of normalised assignments
 	 */
 	protected function normaliseAssignments(array $assignments) {