silverstripe / silverstripe-framework

admin/code/ModelAdmin.php

Doc Comments +8 added lines, -1 removed lines

@@ -120,6 +120,9 @@ 
 		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/javascript/ModelAdmin.js');
 	}
 
+	/**
+	 * @param string $action
+	 */
 	public function Link($action = null) {
 		if(!$action) $action = $this->sanitiseClassName($this->modelClass);
 		return parent::Link($action);
@@ -219,6 +222,9 @@ 
 		return $form;
 	}
 
+	/**
+	 * @return GridFieldComponent
+	 */
 	public function getList() {
 		$context = $this->getSearchContext();
 		$params = $this->getRequest()->requestVar('q');
@@ -274,6 +280,7 @@ 
 
 	/**
 	 * Unsanitise a model class' name from a URL param
+	 * @param string $class
 	 * @return string
 	 */
 	protected function unsanitiseClassName($class) {
@@ -414,7 +421,7 @@ 
 	 * @param array $data
 	 * @param Form $form
 	 * @param SS_HTTPRequest $request
-	 * @return bool|null
+	 * @return false|null
 	 */
 	public function import($data, $form, $request) {
 		if(!$this->showImportForm || (is_array($this->showImportForm)

core/Config.php

Doc Comments +23 added lines, -9 removed lines

@@ -470,11 +470,17 @@ 
 
 	protected $extraConfigSources = array();
 
+	/**
+	 * @param string $class
+	 */
 	public function extraConfigSourcesChanged($class) {
 		unset($this->extraConfigSources[$class]);
 		$this->cache->clean("__{$class}");
 	}
 
+	/**
+	 * @param integer $sourceOptions
+	 */
 	protected function getUncached($class, $name, $sourceOptions, &$result, $suppress, &$tags) {
 		$tags[] = "__{$class}";
 		$tags[] = "__{$class}__{$name}";
@@ -648,15 +654,6 @@ 
 	 *
 	 * @param string $class The class to remove a configuration value from
 	 * @param string $name The configuration name
-	 * @param mixed $key An optional key to filter against.
-	 *   If referenced config value is an array, only members of that array that match this key will be removed
-	 *   Must also match value if provided to be removed
-	 * @param mixed $value And optional value to filter against.
-	 *   If referenced config value is an array, only members of that array that match this value will be removed
-	 *   If referenced config value is not an array, value will be removed only if it matches this argument
-	 *   Must also match key if provided and referenced config value is an array to be removed
-	 *
-	 * Matching is always by "==", not by "==="
 	 */
 	public function remove($class, $name /*,$key = null*/ /*,$value = null*/) {
 		$argc = func_num_args();
@@ -735,6 +732,10 @@ 
 		$this->cache = $cloned;
 	}
 
+	/**
+	 * @param integer $key
+	 * @param integer $val
+	 */
 	public function set($key, $val, $tags = array()) {
 		// Find an index to set at
 		$replacing = null;
@@ -803,6 +804,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $tag
+	 */
 	public function clean($tag = null) {
 		if ($tag) {
 			foreach ($this->cache as $i => $v) {
@@ -834,6 +838,10 @@ 
 		$this->cache = array();
 	}
 
+	/**
+	 * @param integer $key
+	 * @param integer $val
+	 */
 	public function set($key, $val, $tags = array()) {
 		foreach($tags as $t) {
 			if(!isset($this->tags[$t])) {
@@ -852,6 +860,9 @@ 
 		return $this->miss ? ($this->hit / $this->miss) : 0;
 	}
 
+	/**
+	 * @param integer $key
+	 */
 	public function get($key) {
 		list($hit, $result) = $this->checkAndGet($key);
 		return $hit ? $result : false;
@@ -871,6 +882,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $tag
+	 */
 	public function clean($tag = null) {
 		if($tag) {
 			if(isset($this->tags[$tag])) {

core/Convert.php

Doc Comments +3 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
 	 *
 	 * @param array|string $val String to escape, or array of strings
 	 *
-	 * @return array|string
+	 * @return string
 	 */
 	public static function raw2htmlname($val) {
 		if(is_array($val)) {
@@ -181,7 +181,7 @@ 
 	 *
 	 * @param string|array $identifier The identifier to escape. E.g. 'SiteTree.Title'
 	 * @param string $separator The string that delimits subsequent identifiers
-	 * @return string|array The escaped identifier. E.g. '"SiteTree"."Title"'
+	 * @return string The escaped identifier. E.g. '"SiteTree"."Title"'
 	 */
 	public static function symbol2sql($identifier, $separator = '.') {
 		if(is_array($identifier)) {
@@ -266,6 +266,7 @@ 
 	 * call this function directly, Please use {@link Convert::xml2array()}
 	 *
 	 * @param SimpleXMLElement
+	 * @param SimpleXMLElement $xml
 	 *
 	 * @return mixed
 	 */

filesystem/File.php

Doc Comments +2 added lines, -1 removed lines

@@ -234,7 +234,7 @@ 
 	 * Find a File object by the given filename.
 	 *
 	 * @param String $filename Matched against the "Name" property.
-	 * @return mixed null if not found, File object of found file
+	 * @return null|DataObject null if not found, File object of found file
 	 */
 	public static function find($filename) {
 		// Get the base file if $filename points to a resampled file
@@ -449,6 +449,7 @@ 
 	 * showing icons on filelinks, etc.
 	 * Possible group values are: "audio", "mov", "zip", "image".
 	 *
+	 * @param string $ext
 	 * @return String
 	 */
 	public static function get_app_category($ext) {

filesystem/GD.php

Doc Comments +8 added lines

@@ -150,6 +150,7 @@ 
 	 * successfully, the manipulation's cache key is removed.
 	 *
 	 * @param string $filename
+	 * @param string $manipulation
 	 * @return boolean
 	 */
 	public function failedResample($filename, $manipulation) {
@@ -428,6 +429,10 @@ 
 			return $useAsMinimum ? $this->resizeByWidth( $maxWidth ) : $this->resizeByHeight( $maxHeight );
 	}
 
+	/**
+	 * @param resource $image
+	 * @param string $webColor
+	 */
 	public static function color_web2gd($image, $webColor, $transparencyPercent = 0) {
 		if(substr($webColor,0,1) == "#") $webColor = substr($webColor,1);
 		$r = hexdec(substr($webColor,0,2));
@@ -546,6 +551,9 @@ 
 		return $output;
 	}
 
+	/**
+	 * @param string $dirname
+	 */
 	public function makeDir($dirname) {
 		if(!file_exists(dirname($dirname))) $this->makeDir(dirname($dirname));
 		if(!file_exists($dirname)) mkdir($dirname, Config::inst()->get('Filesystem', 'folder_create_mask'));

filesystem/ImagickBackend.php

Doc Comments +10 added lines, -10 removed lines

@@ -80,7 +80,7 @@ 
 	 *
 	 * Get the backend-specific resource handling the manipulations. Replaces Image::getGD()
 	 *
-	 * @return mixed
+	 * @return ImagickBackend
 	 */
 	public function getImageResource() {
 		return $this;
@@ -111,7 +111,7 @@ 
 	 *
 	 * @param int $width
 	 * @param int $height
-	 * @return Image_Backend
+	 * @return null|ImagickBackend
 	 */
 	public function resize($width, $height) {
 		if(!$this->valid()) return;
@@ -141,9 +141,9 @@ 
 	/**
 	 * resizeRatio
 	 *
-	 * @param int $width
-	 * @param int $height
-	 * @return Image_Backend
+	 * @param integer $maxWidth
+	 * @param integer $maxHeight
+	 * @return null|ImagickBackend
 	 */
 	public function resizeRatio($maxWidth, $maxHeight, $useAsMinimum = false) {
 		if(!$this->valid()) return;
@@ -166,7 +166,7 @@ 
 	 * resizeByWidth
 	 *
 	 * @param int $width
-	 * @return Image_Backend
+	 * @return null|ImagickBackend
 	 */
 	public function resizeByWidth($width) {
 		if(!$this->valid()) return;
@@ -183,7 +183,7 @@ 
 	 * resizeByHeight
 	 *
 	 * @param int $height
-	 * @return Image_Backend
+	 * @return null|ImagickBackend
 	 */
 	public function resizeByHeight($height) {
 		if(!$this->valid()) return;
@@ -202,7 +202,7 @@ 
 	 * @param int $width
 	 * @param int $height
 	 * @param int $transparencyPercent
-	 * @return Image_Backend
+	 * @return null|ImagickBackend
 	 */
 	public function paddedResize($width, $height, $backgroundColor = "FFFFFF", $transparencyPercent = 0) {
 		$width = intval($width);
@@ -227,7 +227,7 @@ 
 	/**
 	 * Convert a percentage (or 'true') to a two char hex code to signifiy the level of an alpha channel
 	 *
-	 * @param $percent
+	 * @param integer $percent
 	 * @return string
 	 */
 	public function calculateAlphaHex($percent) {
@@ -248,7 +248,7 @@ 
 	 *
 	 * @param int $width
 	 * @param int $height
-	 * @return Image_Backend
+	 * @return null|ImagickBackend
 	 */
 	public function croppedResize($width, $height) {
 		if(!$this->valid()) return;

forms/DatetimeField.php

Doc Comments +19 added lines, -4 removed lines

@@ -56,6 +56,10 @@ 
 	 */
 	protected $config;
 
+	/**
+	 * @param string $name
+	 * @param string $title
+	 */
 	public function __construct($name, $title = null, $value = ""){
 		$this->config = $this->config()->default_config;
 
@@ -68,6 +72,9 @@ 
 		parent::__construct($name, $title, $value);
 	}
 
+	/**
+	 * @param Form $form
+	 */
 	public function setForm($form) {
 		parent::setForm($form);
 
@@ -78,6 +85,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function setName($name) {
 		parent::setName($name);
 
@@ -90,7 +100,7 @@ 
 
 	/**
 	 * @param array $properties
-	 * @return HTMLText
+	 * @return string
 	 */
 	public function FieldHolder($properties = array()) {
 		$config = array(
@@ -105,7 +115,7 @@ 
 
 	/**
 	 * @param array $properties
-	 * @return HTMLText
+	 * @return string
 	 */
 	public function Field($properties = array()) {
 		Requirements::css(FRAMEWORK_DIR . '/css/DatetimeField.css');
@@ -234,6 +244,7 @@ 
 
 	/**
 	 * @param FormField
+	 * @param DateField $field
 	 */
 	public function setDateField($field) {
 		$expected = $this->getName() . '[date]';
@@ -259,6 +270,7 @@ 
 
 	/**
 	 * @param FormField
+	 * @param TimeField $field
 	 */
 	public function setTimeField($field) {
 		$expected = $this->getName() . '[time]';
@@ -297,7 +309,7 @@ 
 	 * to set field-specific config options.
 	 *
 	 * @param string $name
-	 * @param mixed $val
+	 * @param string $val
 	 */
 	public function setConfig($name, $val) {
 		$this->config[$name] = $val;
@@ -315,7 +327,7 @@ 
 	 * to get field-specific config options.
 	 *
 	 * @param String $name Optional, returns the whole configuration array if empty
-	 * @return mixed
+	 * @return string|null
 	 */
 	public function getConfig($name = null) {
 		if($name) {
@@ -325,6 +337,9 @@ 
 		}
 	}
 
+	/**
+	 * @param RequiredFields $validator
+	 */
 	public function validate($validator) {
 		$dateValid = $this->dateField->validate($validator);
 		$timeValid = $this->timeField->validate($validator);

forms/gridfield/GridFieldPaginator.php

Doc Comments +3 added lines

@@ -50,6 +50,7 @@ 
 	 *
 	 * By default, this is set to true so that it's clearer what's happening, but the predefined
 	 * {@link GridFieldConfig} subclasses set this to false for flexibility.
+	 * @param boolean $throwExceptionOnBadDataType
 	 */
 	public function setThrowExceptionOnBadDataType($throwExceptionOnBadDataType) {
 		$this->throwExceptionOnBadDataType = $throwExceptionOnBadDataType;
@@ -65,6 +66,7 @@ 
 	/**
 	 * Check that this dataList is of the right data type.
 	 * Returns false if it's a bad data type, and if appropriate, throws an exception.
+	 * @param SS_List $dataList
 	 */
 	protected function checkDataType($dataList) {
 		if($dataList instanceof SS_Limitable) {
@@ -271,6 +273,7 @@ 
 
 	/**
 	 * @param Int
+	 * @param integer $num
 	 */
 	public function setItemsPerPage($num) {
 		$this->itemsPerPage = $num;

model/Versioned.php

Doc Comments +6 added lines, -6 removed lines

@@ -765,7 +765,7 @@ 
 	 * Extend permissions to include additional security for objects that are not published to live.
 	 *
 	 * @param Member $member
-	 * @return bool|null
+	 * @return false|null
 	 */
 	public function canView($member = null) {
 		// Invoke default version-gnostic canView
@@ -839,7 +839,7 @@ 
 	 *
 	 * @param string $stage
 	 * @param Member $member
-	 * @return bool
+	 * @return boolean|string
 	 */
 	public function canViewStage($stage = 'Live', $member = null) {
 		$oldMode = Versioned::get_reading_mode();
@@ -905,7 +905,7 @@ 
 	/**
 	 * Is the latest version of the object published?
 	 *
-	 * @return bool
+	 * @return string
 	 */
 	public function latestPublished() {
 		// Get the root data object class - this will have the version field
@@ -1029,7 +1029,7 @@ 
 	 * @param string $limit
 	 * @param string $join Deprecated, use leftJoin($table, $joinClause) instead
 	 * @param string $having
-	 * @return DataList
+	 * @return ArrayList
 	 */
 	public function Versions($filter = "", $sort = "", $limit = "", $join = "", $having = "") {
 		return $this->allVersions($filter, $sort, $limit, $join, $having);
@@ -1043,7 +1043,7 @@ 
 	 * @param  string $limit
 	 * @param  string $join Deprecated, use leftJoin($table, $joinClause) instead
 	 * @param  string $having
-	 * @return DataList
+	 * @return ArrayList
 	 */
 	public function allVersions($filter = "", $sort = "", $limit = "", $join = "", $having = "") {
 		// Make sure the table names are not postfixed (e.g. _Live)
@@ -1361,7 +1361,7 @@ 
 	 * @param string     $filter         A filter to be inserted into the WHERE clause.
 	 * @param string     $sort           A sort expression to be inserted into the ORDER BY clause.
 	 * @param string     $join           Deprecated, use leftJoin($table, $joinClause) instead
-	 * @param string|int $limit          A limit on the number of records returned from the database.
+	 * @param integer $limit          A limit on the number of records returned from the database.
 	 * @param string     $containerClass The container class for the result set (default is DataList)
 	 *
 	 * @return DataList A modified DataList designated to the specified stage