sminnee / silverstripe-framework

model/fieldtypes/CompositeDBField.php

Doc Comments +3 added lines

@@ -208,6 +208,9 @@
 		return null;
 	}
 
+	/**
+	 * @param string $field
+	 */
 	public function hasField($field) {
 		$fields = $this->compositeDatabaseFields();
 		return isset($fields[$field]);

model/fieldtypes/Currency.php

Doc Comments +6 added lines

@@ -28,6 +28,9 @@ 
 	 */
 	private static $currency_symbol = '$';
 
+	/**
+	 * @param string $name
+	 */
 	public function __construct($name = null, $wholeSize = 9, $decimalSize = 2, $defaultValue = 0) {
 		parent::__construct($name, $wholeSize, $decimalSize, $defaultValue);
 	}
@@ -51,6 +54,9 @@ 
 		else return $val;
 	}
 
+	/**
+	 * @param string $value
+	 */
 	public function setValue($value, $record = null, $markChanged = true) {
 		$matches = null;
 		if(is_numeric($value)) {

model/fieldtypes/Date.php

Doc Comments +4 added lines, -1 removed lines

@@ -31,6 +31,9 @@ 
  */
 class DBDate extends DBField {
 
+	/**
+	 * @param string $value
+	 */
 	public function setValue($value, $record = null, $markChanged = true) {
 		if($value === false || $value === null || (is_string($value) && !strlen($value))) {
 			// don't try to evaluate empty values with strtotime() below, as it returns "1970-01-01" when it should be
@@ -113,7 +116,7 @@ 
 
 	/**
 	 * Returns the day of the month.
-	 * @param boolean $includeOrdinals Include ordinal suffix to day, e.g. "th" or "rd"
+	 * @param boolean $includeOrdinal Include ordinal suffix to day, e.g. "th" or "rd"
 	 * @return string
 	 */
 	public function DayOfMonth($includeOrdinal = false) {

model/fieldtypes/Datetime.php

Doc Comments +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
 	 * Return a date and time formatted as per a CMS user's settings.
 	 *
 	 * @param Member $member
-	 * @return boolean | string A time and date pair formatted as per user-defined settings.
+	 * @return false|string | string A time and date pair formatted as per user-defined settings.
 	 */
 	public function FormatFromSettings($member = null) {
 		require_once 'Zend/Date.php';

model/fieldtypes/DBField.php

Doc Comments +4 added lines, -3 removed lines

@@ -236,7 +236,7 @@ 
 	/**
 	 * Get the table this field belongs to, if assigned
 	 *
-	 * @return string|null
+	 * @return string
 	 */
 	public function getTable() {
 		return $this->tableName;
@@ -293,6 +293,7 @@ 
 
 	/**
 	 * Saves this field to the given data object.
+	 * @param \DataObject $dataObject
 	 */
 	public function saveInto($dataObject) {
 		$fieldName = $this->name;
@@ -310,7 +311,7 @@ 
 	 * Used by {@link SearchContext}, {@link ModelAdmin}, {@link DataObject::scaffoldFormFields()}
 	 *
 	 * @param string $title Optional. Localized title of the generated instance
-	 * @return FormField
+	 * @return TextField
 	 */
 	public function scaffoldFormField($title = null) {
 		$field = new TextField($this->name, $title);
@@ -325,7 +326,7 @@ 
 	 * Used by {@link SearchContext}, {@link ModelAdmin}, {@link DataObject::scaffoldFormFields()}.
 	 *
 	 * @param string $title Optional. Localized title of the generated instance
-	 * @return FormField
+	 * @return TextField
 	 */
 	public function scaffoldSearchField($title = null) {
 		return $this->scaffoldFormField($title);

model/fieldtypes/Decimal.php

Doc Comments +4 added lines, -4 removed lines

@@ -21,7 +21,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;
@@ -33,14 +33,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);
@@ -86,7 +86,7 @@ 
 	}
 
 	/**
-	 * @return float
+	 * @return integer
 	 */
 	public function nullValue() {
 		return 0;

model/fieldtypes/HTMLText.php

Doc Comments +3 added lines

@@ -47,6 +47,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 +8 added lines, -1 removed lines

@@ -101,6 +101,7 @@ 
 
 	/**
 	 * @param string
+	 * @param string|null $currency
 	 */
 	public function setCurrency($currency, $markChanged = true) {
 		$this->setField('Currency', $currency, $markChanged);
@@ -151,6 +152,8 @@ 
 	}
 
 	/**
+	 * @param string $currency
+	 * @param string $locale
 	 * @return string
 	 */
 	public function getSymbol($currency = null, $locale = null) {
@@ -162,6 +165,8 @@ 
 	}
 
 	/**
+	 * @param string $currency
+	 * @param string $locale
 	 * @return string
 	 */
 	public function getShortName($currency = null, $locale = null) {
@@ -172,6 +177,8 @@ 
 	}
 
 	/**
+	 * @param string $currency
+	 * @param string $locale
 	 * @return string
 	 */
 	public function getCurrencyName($currency = null, $locale = null) {
@@ -202,7 +209,7 @@ 
 	 * Used by {@link SearchContext}, {@link ModelAdmin}, {@link DataObject::scaffoldFormFields()}
 	 *
 	 * @param string $title Optional. Localized title of the generated instance
-	 * @return FormField
+	 * @return MoneyField
 	 */
 	public function scaffoldFormField($title = null) {
 		$field = new MoneyField($this->getName());

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace SilverStripe\Model\FieldType;
 
-use DB;
 use i18n;
 use Zend_Currency;
 use MoneyField;

model/fieldtypes/Time.php

Doc Comments +3 added lines

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