silverstripe / silverstripe-framework

email/Email.php

Doc Comments +19 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);
@@ -311,6 +324,9 @@ 
 		return $this->ss_template;
 	}
 
+	/**
+	 * @return ViewableData
+	 */
 	protected function templateData() {
 		if($this->template_data) {
 			return $this->template_data->customise(array(
@@ -390,6 +406,7 @@ 
 
 	/**
 	 * Validates the email address. Returns true of false
+	 * @param string $address
 	 */
 	public static function validEmailAddress($address) {
 		if (function_exists('filter_var')) {
@@ -611,8 +628,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

filesystem/File.php

Doc Comments +1 added lines, -1 removed lines

@@ -922,6 +922,7 @@ 
 	 *
 	 * @param String File extension, without dot prefix. Use an asterisk ('*')
 	 * to specify a generic fallback if no mapping is found for an extension.
+	 * @param string $ext
 	 * @return String Classname for a subclass of {@link File}
 	 */
 	public static function get_class_for_file_extension($ext) {
@@ -1055,7 +1056,6 @@ 
 	 * Note that the result will not have a leading slash, and should not be used
 	 * with local file paths.
 	 *
-	 * @param string $part,... Parts
 	 * @return string
 	 */
 	public static function join_paths() {

filesystem/FileNameFilter.php

Doc Comments +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
 	protected $transliterator;
 
 	/**
-	 * @return SS_Transliterator|NULL
+	 * @return SS_Transliterator
 	 */
 	public function getTransliterator() {
 		if($this->transliterator === null && $this->config()->default_use_transliterator) {

filesystem/Folder.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	 * Find the given folder or create it as a database record
 	 *
 	 * @param string $folderPath Directory path relative to assets root
-	 * @return Folder|null
+	 * @return null|DataObject
 	 */
 	public static function find_or_make($folderPath) {
 		// replace leading and trailing slashes

filesystem/GDBackend.php

Doc Comments +1 added lines, -4 removed lines

@@ -184,7 +184,6 @@ 
 	 * Check if this image has previously crashed GD when attempting to open it - if it's opened
 	 * successfully, the manipulation's cache key is removed.
 	 *
-	 * @param string $args,... Any number of args that identify this image
 	 * @return bool True if failed
 	 */
 	public function failedResample() {
@@ -195,7 +194,6 @@ 
 	/**
 	 * Mark a file as failed
 	 *
-	 * @param string $args,... Any number of args that identify this image
 	 */
 	protected function markFailed() {
 		$key = sha1(implode('|', func_get_args()));
@@ -205,7 +203,6 @@ 
 	/**
 	 * Mark a file as succeeded
 	 *
-	 * @param string $args,... Any number of args that identify this image
 	 */
 	protected function markSucceeded() {
 		$key = sha1(implode('|', func_get_args()));
@@ -347,7 +344,7 @@ 
 	 * using built-in function. Used when imagerotate function is not available(i.e. Ubuntu)
 	 *
 	 * @param float $angle Angle in degrees
-	 * @return static
+	 * @return null|resource
 	 */
 	public function rotatePixelByPixel($angle) {
 		if(!$this->gd) {

filesystem/ImageManipulation.php

Doc Comments +1 added lines, -1 removed lines

@@ -509,7 +509,7 @@
 	/**
 	 * Get HTML for img containing the icon for this file
 	 *
-	 * @return type
+	 * @return DBField
 	 */
 	public function IconTag() {
 		return DBField::create_field(

forms/AssetField.php

Doc Comments +4 added lines, -1 removed lines

@@ -144,7 +144,6 @@ 
 	 *
 	 * @param string $name The internal field name, passed to forms.
 	 * @param string $title The field label.
-	 * @param Form $form Reference to the container form
 	 */
 	public function __construct($name, $title = null) {
 		$this->addExtraClass('ss-upload'); // class, used by js
@@ -256,6 +255,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) {

forms/CompositeField.php

Doc Comments +8 added lines

@@ -94,6 +94,7 @@ 
 
 	/**
 	 * @param string
+	 * @param string $tag
 	 */
 	public function setTag($tag) {
 		$this->tag = $tag;
@@ -110,6 +111,7 @@ 
 
 	/**
 	 * @param string
+	 * @param string $legend
 	 */
 	public function setLegend($legend) {
 		$this->legend = $legend;
@@ -200,6 +202,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function fieldByName($name) {
 		return $this->children->fieldByName($name);
 	}
@@ -224,6 +229,8 @@ 
 
 	/**
 	 * @uses FieldList->insertAfter()
+	 * @param string $insertAfter
+	 * @param FormField $field
 	 */
 	public function insertAfter($insertAfter, $field) {
 		$ret = $this->children->insertAfter($insertAfter, $field);
@@ -309,6 +316,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/ConfirmedPasswordField.php

Doc Comments +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
 	/**
 	 * @param array $properties
 	 *
-	 * @return HTMLText
+	 * @return string
 	 */
 	public function Field($properties = array()) {
 		Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
@@ -417,7 +417,7 @@ 
 	 *
 	 * @param DataObjectInterface $record
 	 *
-	 * @return boolean
+	 * @return false|null
 	 */
 	public function saveInto(DataObjectInterface $record) {
 		if(!$this->isSaveable()) {