silverstripe / silverstripe-framework

forms/FormField.php

Doc Comments +4 added lines, -3 removed lines

@@ -587,6 +587,7 @@ 
 	 *
 	 * Caution: this doesn't work on all fields, see {@link setAttribute()}.
 	 *
+	 * @param string $name
 	 * @return null|string
 	 */
 	public function getAttribute($name) {
@@ -698,7 +699,6 @@ 
 	 * Set the field value.
 	 *
 	 * @param mixed $value
-	 * @param null|array|DataObject $data {@see Form::loadDataFrom}
 	 *
 	 * @return $this
 	 */
@@ -1179,6 +1179,7 @@ 
 	 * @todo Make this abstract.
 	 *
 	 * @param Validator
+	 * @param RequiredFields $validator
 	 *
 	 * @return bool
 	 */
@@ -1248,7 +1249,7 @@ 
 	 *
 	 * @param FieldList $containerFieldList
 	 *
-	 * @return FieldList
+	 * @return FormField
 	 */
 	public function setContainerFieldList($containerFieldList) {
 		$this->containerFieldList = $containerFieldList;
@@ -1433,7 +1434,7 @@ 
 	 * Any passed keys that are not defined in {@link getSchemaDataDefaults()} are ignored.
 	 * If you want to pass around ad hoc data use the `data` array e.g. pass `['data' => ['myCustomKey' => 'yolo']]`.
 	 *
-	 * @param array $schemaData - The data to be merged with $this->schemaData.
+	 * @param array $schemaState - The data to be merged with $this->schemaData.
 	 * @return FormField
 	 *
 	 * @todo Add deep merging of arrays like `data` and `attributes`.

tests/model/ChangeSetTest.php

Doc Comments +3 added lines

@@ -27,6 +27,9 @@
 		return $this->can(__FUNCTION__, $member, $context);
 	}
 
+	/**
+	 * @param string $perm
+	 */
 	public function can($perm, $member = null, $context = array()) {
 		$perms = [
 			"PERM_{$perm}",

thirdparty/tinymce/tiny_mce_gzip.php

Doc Comments +1 added lines, -2 removed lines

@@ -83,7 +83,6 @@ 
 	/**
 	 * Adds a file to the concatenation/compression process.
 	 *
-	 * @param String $path Path to the file to include in the compressed package/output.
 	 */
 	public function &addFile($file) {
 		$this->files .= ($this->files ? "," : "") . $file;
@@ -256,7 +255,7 @@ 
 	/**
 	 * Renders a script tag that loads the TinyMCE script.
 	 *
-	 * @param Array $settings Name/value array with settings for the script tag.
+	 * @param Array $tagSettings Name/value array with settings for the script tag.
 	 * @param Bool  $return   The script tag is return instead of being output if true
 	 * @return String the tag is returned if $return is true
 	 */

dev/SapphireTest.php

Doc Comments +9 added lines, -8 removed lines

@@ -139,6 +139,7 @@ 
 
 	/**
 	 * Set the manifest to be used to look up test classes by helper functions
+	 * @param SS_ClassManifest $manifest
 	 */
 	public static function set_test_class_manifest($manifest) {
 		self::$test_class_manifest = $manifest;
@@ -422,7 +423,7 @@ 
 	 * Will collate all IDs form all fixtures if multiple fixtures are provided.
 	 *
 	 * @param string $className
-	 * @return array A map of fixture-identifier => object-id
+	 * @return A A map of fixture-identifier => object-id
 	 */
 	protected function allFixtureIDs($className) {
 		return $this->getFixtureFactory()->getIds($className);
@@ -582,10 +583,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'
 	 */
@@ -753,7 +754,7 @@ 
 	 * @param string $expectedSQL
 	 * @param string $actualSQL
 	 * @param string $message
-	 * @param float $delta
+	 * @param integer $delta
 	 * @param integer $maxDepth
 	 * @param boolean $canonicalize
 	 * @param boolean $ignoreCase
@@ -1039,9 +1040,9 @@ 
 	/**
 	 * Test against a theme.
 	 *
-	 * @param $themeBaseDir string - themes directory
-	 * @param $theme string - theme name
-	 * @param $callback Closure
+	 * @param string $themeBaseDir string - themes directory
+	 * @param string $theme string - theme name
+	 * @param Closure $callback Closure
 	 */
 	protected function useTestTheme($themeBaseDir, $theme, $callback) {
 		Config::nest();

email/Email.php

Doc Comments +22 added lines, -2 removed lines

@@ -150,6 +150,12 @@ 
 
 	/**
 	 * Create a new email.
+	 * @param string $from
+	 * @param string $to
+	 * @param string $subject
+	 * @param string $body
+	 * @param string $cc
+	 * @param string $bcc
 	 */
 	public function __construct($from = null, $to = null, $subject = null, $body = null, $bounceHandlerURL = null,
 			$cc = null, $bcc = null) {
@@ -168,6 +174,9 @@ 
 		parent::__construct();
 	}
 
+	/**
+	 * @param string $data
+	 */
 	public function attachFileFromString($data, $filename, $mimetype = null) {
 		$this->attachments[] = array(
 			'contents' => $data,
@@ -184,6 +193,10 @@ 
 		Deprecation::notice('4.0', 'Use "emailbouncehandler" module');
 	}
 
+	/**
+	 * @param string $filename
+	 * @param string $mimetype
+	 */
 	public function attachFile($filename, $attachedFilename = null, $mimetype = null) {
 		if(!$attachedFilename) $attachedFilename = basename($filename);
 		$absoluteFileName = Director::getAbsFile($filename);
@@ -219,6 +232,9 @@ 
 		return $this->bcc;
 	}
 
+	/**
+	 * @param string $val
+	 */
 	public function setSubject($val) {
 		$this->subject = $val;
 		return $this;
@@ -311,6 +327,9 @@ 
 		return $this->ss_template;
 	}
 
+	/**
+	 * @return ViewableData
+	 */
 	protected function templateData() {
 		if($this->template_data) {
 			return $this->template_data->customise(array(
@@ -390,6 +409,7 @@ 
 
 	/**
 	 * Validates the email address. Returns true of false
+	 * @param string $address
 	 */
 	public static function validEmailAddress($address) {
 		if (function_exists('filter_var')) {
@@ -611,8 +631,8 @@ 
 	/**
 	 * Checks for RFC822-valid email format.
 	 *
-	 * @param string $str
-	 * @return boolean
+	 * @param string $email
+	 * @return integer
 	 *
 	 * @copyright Cal Henderson <cal@iamcal.com>
 	 * 	This code is licensed under a Creative Commons Attribution-ShareAlike 2.5 License

core/Injectable.php

Doc Comments -2 removed lines

@@ -23,8 +23,6 @@
 	 *    $list = DataList::create('SiteTree');
 	 *	  $list = SiteTree::get();
 	 *
-	 * @param string $class the class name
-	 * @param mixed $arguments,... arguments to pass to the constructor
 	 * @return static
 	 */
 	public static function create() {

view/Requirements.php

Doc Comments +3 added lines, -1 removed lines

@@ -65,6 +65,7 @@ 
 	 * while automatically busting this cache every time the file is changed.
 	 *
 	 * @param bool
+	 * @param boolean $var
 	 */
 	public static function set_suffix_requirements($var) {
 		self::backend()->setSuffixRequirements($var);
@@ -336,7 +337,7 @@ 
 	 * </code>
 	 *
 	 * @param string $combinedFileName Filename of the combined file relative to docroot
-	 * @param array  $files            Array of filenames relative to docroot
+	 * @param string[]  $files            Array of filenames relative to docroot
 	 * @param string $media
 	 *
 	 * @return bool|void
@@ -761,6 +762,7 @@ 
 	 * Forces the JavaScript requirements to the end of the body, right before the closing tag
 	 *
 	 * @param bool
+	 * @param boolean $var
 	 * @return $this
 	 */
 	public function setForceJSToBottom($var) {

admin/code/ModelAdmin.php

Doc Comments +3 added lines

@@ -117,6 +117,9 @@
 		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/ModelAdmin.js');
 	}
 
+	/**
+	 * @param string $action
+	 */
 	public function Link($action = null) {
 		if(!$action) $action = $this->sanitiseClassName($this->modelClass);
 		return parent::Link($action);

forms/htmleditor/HTMLEditorConfig.php

Doc Comments +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
 	 * Get the current value of an option
      *
 	 * @param string $key The key of the option to get
-	 * @return mixed The value of the specified option
+	 * @return string The value of the specified option
 	 */
 	abstract public function getOption($key);