sminnee / silverstripe-framework

Dev/SapphireTest.php

Doc Comments +4 added lines, -4 removed lines

@@ -617,10 +617,10 @@ 
 	/**
 	 * Assert that the matching email was sent since the last call to clearEmails()
 	 * All of the parameters can either be a string, or, if they start with "/", a PREG-compatible regular expression.
-	 * @param $to
+	 * @param string $to
 	 * @param $from
-	 * @param $subject
-	 * @param $content
+	 * @param string $subject
+	 * @param string $content
 	 * @return array Contains the keys: 'type', 'to', 'from', 'subject', 'content', 'plainContent', 'attachedFiles',
 	 *               'customHeaders', 'htmlContent', inlineImages'
 	 */
@@ -794,7 +794,7 @@ 
 	 * @param string $expectedSQL
 	 * @param string $actualSQL
 	 * @param string $message
-	 * @param float|int $delta
+	 * @param integer $delta
 	 * @param integer $maxDepth
 	 * @param boolean $canonicalize
 	 * @param boolean $ignoreCase

Dev/SapphireTestReporter.php

Doc Comments +4 added lines, -1 removed lines

@@ -319,7 +319,7 @@ 
 	 * @access private
 	 * @param obj PHPUnit_Framework_Test, current test that is being run
 	 * @param obj PHPUnit_Framework_AssertationFailedError, PHPUnit error
-	 * @return array
+	 * @return string
 	 */
 	private function getTestException(PHPUnit_Framework_Test $test, Exception $e) {
 		// get the name of the testFile from the test
@@ -406,6 +406,9 @@ 
 
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function testNameToPhrase($name) {
 		return ucfirst(preg_replace("/([a-z])([A-Z])/", "$1 $2", $name));
 	}

Dev/TestMailer.php

Doc Comments +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
 	 * @param string $plainContent
 	 * @param bool $attachedFiles
 	 * @param bool $customHeaders
-	 * @return bool|mixed
+	 * @return boolean
 	 */
 	public function sendPlain($to, $from, $subject, $plainContent, $attachedFiles = false, $customHeaders = false) {
 		$this->emailsSent[] = array(
@@ -48,7 +48,7 @@ 
 	 * @param bool $customHeaders
 	 * @param bool $plainContent
 	 * @param bool $inlineImages
-	 * @return bool|mixed
+	 * @return boolean
 	 */
 	public function sendHTML($to, $from, $subject, $htmlContent, $attachedFiles = false, $customHeaders = false,
 			$plainContent = false, $inlineImages = false) {

Forms/AssetField.php

Doc Comments +6 added lines, -2 removed lines

@@ -195,7 +195,7 @@ 
 	/**
 	 * Determine if the target folder for new uploads in is visible the field UI.
 	 *
-	 * @return boolean
+	 * @return boolean|string
 	 */
 	public function canPreviewFolder() {
 		if(!$this->isActive()) {
@@ -264,6 +264,10 @@ 
 		return $this->record;
 	}
 
+	/**
+	 * @param null|DataObject $value
+	 * @param DataObject $record
+	 */
 	public function setValue($value, $record = null) {
 		// Extract value from underlying record
 		if(empty($value) && $this->getName() && $record instanceof DataObject) {
@@ -370,7 +374,7 @@ 
 	/**
 	 * Determine if the user has permission to upload.
 	 *
-	 * @return boolean
+	 * @return boolean|string
 	 */
 	public function canUpload() {
 		if(!$this->isActive()) {

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use SilverStripe\ORM\SS_List;
 use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataObjectInterface;
-use SilverStripe\View\Requirements;
 use InvalidArgumentException;
 
 /**

Forms/CompositeField.php

Doc Comments +14 added lines

@@ -209,6 +209,9 @@ 
 
 
 
+	/**
+	 * @param boolean $disabled
+	 */
 	public function setDisabled($disabled) {
 		parent::setDisabled($disabled);
 		foreach($this->getChildren() as $child) {
@@ -217,6 +220,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param boolean $readonly
+	 */
 	public function setReadonly($readonly)
 	{
 		parent::setReadonly($readonly);
@@ -299,6 +305,10 @@ 
 		$this->children->removeByName($fieldName, $dataFieldOnly);
 	}
 
+	/**
+	 * @param string $fieldName
+	 * @param FormField $newField
+	 */
 	public function replaceField($fieldName, $newField) {
 		return $this->children->replaceField($fieldName, $newField);
 	}
@@ -362,6 +372,9 @@ 
 		return $clone;
 	}
 
+	/**
+	 * @return boolean
+	 */
 	public function IsReadonly() {
 		return $this->readonly;
 	}
@@ -371,6 +384,7 @@ 
 	 * the children collection. Doesn't work recursively.
 	 *
 	 * @param string|FormField
+	 * @param string $field
 	 * @return int Position in children collection (first position starts with 0). Returns FALSE if the field can't
 	 *             be found.
 	 */

Forms/DateField.php

Doc Comments +6 added lines, -1 removed lines

@@ -99,6 +99,11 @@ 
 	 */
 	protected $valueObj = null;
 
+	/**
+	 * @param string $name
+	 * @param string $title
+	 * @param string $value
+	 */
 	public function __construct($name, $title = null, $value = null) {
 		if(!$this->locale) {
 			$this->locale = i18n::get_locale();
@@ -300,7 +305,7 @@ 
 	}
 
 	/**
-	 * @param mixed $class
+	 * @param string $class
 	 * @return FormField
 	 */
 	public function castedCopy($class) {

Forms/DatetimeField.php

Doc Comments +20 added lines, -4 removed lines

@@ -69,6 +69,10 @@ 
 	 */
 	protected $config;
 
+	/**
+	 * @param string $name
+	 * @param string $title
+	 */
 	public function __construct($name, $title = null, $value = ""){
 		$this->config = $this->config()->default_config;
 
@@ -79,6 +83,9 @@ 
 		parent::__construct($name, $title, $value);
 	}
 
+	/**
+	 * @param Form $form
+	 */
 	public function setForm($form) {
 		parent::setForm($form);
 
@@ -89,6 +96,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function setName($name) {
 		parent::setName($name);
 
@@ -101,7 +111,7 @@ 
 
 	/**
 	 * @param array $properties
-	 * @return string
+	 * @return \SilverStripe\ORM\FieldType\DBHTMLText
 	 */
 	public function FieldHolder($properties = array()) {
 		$config = array(
@@ -115,7 +125,7 @@ 
 
 	/**
 	 * @param array $properties
-	 * @return string
+	 * @return \SilverStripe\ORM\FieldType\DBHTMLText
 	 */
 	public function Field($properties = array()) {
 		Requirements::css(FRAMEWORK_DIR . '/client/dist/styles/DatetimeField.css');
@@ -228,6 +238,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param boolean $bool
+	 */
 	public function setReadonly($bool) {
 		parent::setReadonly($bool);
 		$this->dateField->setReadonly($bool);
@@ -317,7 +330,7 @@ 
 	 * to set field-specific config options.
 	 *
 	 * @param string $name
-	 * @param mixed $val
+	 * @param string $val
 	 * @return $this
 	 */
 	public function setConfig($name, $val) {
@@ -336,7 +349,7 @@ 
 	 * to get field-specific config options.
 	 *
 	 * @param String $name Optional, returns the whole configuration array if empty
-	 * @return mixed
+	 * @return string
 	 */
 	public function getConfig($name = null) {
 		if($name) {
@@ -346,6 +359,9 @@ 
 		}
 	}
 
+	/**
+	 * @param RequiredFields $validator
+	 */
 	public function validate($validator) {
 		$dateValid = $this->dateField->validate($validator);
 		$timeValid = $this->timeField->validate($validator);

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use SilverStripe\ORM\SS_List;
 use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataObjectInterface;
-use SilverStripe\View\Requirements;
 use InvalidArgumentException;
 
 /**

Forms/FieldList.php

Doc Comments +6 added lines, -2 removed lines

@@ -79,6 +79,9 @@ 
 		$this->sequentialSaveableSet = null;
 	}
 
+	/**
+	 * @param FormField[] $list
+	 */
 	protected function collateDataFields(&$list, $saveableOnly = false) {
 		foreach($this as $field) {
 			if($field instanceof CompositeField) {
@@ -175,7 +178,7 @@ 
 	 * Removes a number of fields from a Tab/TabSet within this FieldList.
 	 *
 	 * @param string $tabName The name of the Tab or TabSet field
-	 * @param array $fields A list of fields, e.g. array('Name', 'Email')
+	 * @param string[] $fields A list of fields, e.g. array('Name', 'Email')
 	 */
 	public function removeFieldsFromTab($tabName, $fields) {
 		$this->flushFieldsCache();
@@ -568,7 +571,7 @@ 
 	}
 
 	/**
-	 * @param $field
+	 * @param CompositeField $field
 	 * @return $this
 	 */
 	public function setContainerField($field) {
@@ -638,6 +641,7 @@ 
 	 * the children collection. Doesn't work recursively.
 	 *
 	 * @param string|FormField
+	 * @param string $field
 	 * @return int Position in children collection (first position starts with 0).
 	 * Returns FALSE if the field can't be found.
 	 */

Forms/FileField.php

Doc Comments +1 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
 
 	/**
 	 * @param array $properties
-	 * @return string
+	 * @return \SilverStripe\ORM\FieldType\DBHTMLText
 	 */
 	public function Field($properties = array()) {
 		$properties = array_merge($properties, array(
@@ -259,7 +259,6 @@ 
 	 * for each of these categories
 	 *
 	 * @param string $category Category name
-	 * @param string,... $categories Additional category names
 	 * @return $this
 	 */
 	public function setAllowedFileCategories($category) {