silverstripe / silverstripe-framework

filesystem/flysystem/ProtectedAssetAdapter.php

Doc Comments +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      * Provide secure downloadable
      *
      * @param string $path
-     * @return string|null
+     * @return string
      */
     public function getProtectedUrl($path) {
         // Public URLs are handled via a request handler within /assets.

model/ValidationResult.php

Doc Comments +1 added lines

@@ -21,6 +21,7 @@
 	/**
 	 * Create a new ValidationResult.
 	 * By default, it is a successful result.	Call $this->error() to record errors.
+	 * @param string $message
 	 */
 	public function __construct($valid = true, $message = null) {
 		$this->isValid = $valid;

tests/filesystem/AssetStoreTest.php

Doc Comments +6 added lines

@@ -625,6 +625,9 @@ 
 	}
 
 
+	/**
+	 * @param string $fileID
+	 */
 	public function getOriginalFilename($fileID) {
 		return parent::getOriginalFilename($fileID);
 	}
@@ -633,6 +636,9 @@ 
 		return parent::removeVariant($fileID);
 	}
 
+	/**
+	 * @param null|string $variant
+	 */
 	public function getDefaultConflictResolution($variant) {
 		return parent::getDefaultConflictResolution($variant);
 	}

view/Requirements.php

Doc Comments +5 added lines, -3 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);
@@ -329,7 +330,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
@@ -754,6 +755,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) {
@@ -1611,8 +1613,8 @@ 
 	/**
 	 * Given a filename and list of files, generate a new filename unique to these files
 	 *
-	 * @param string $name
-	 * @param array $files
+	 * @param array $fileList
+	 * @param string $combinedFile
 	 * @return string
 	 */
 	protected function hashedCombinedFilename($combinedFile, $fileList) {

forms/MoneyField.php

Doc Comments +5 added lines

@@ -32,6 +32,10 @@ 
 	 */
 	protected $fieldCurrency = null;
 
+	/**
+	 * @param string $name
+	 * @param string $title
+	 */
 	public function __construct($name, $title = null, $value = "") {
 		// naming with underscores to prevent values from actually being saved somewhere
 		$this->fieldAmount = new NumericField("{$name}[Amount]", _t('MoneyField.FIELDLABELAMOUNT', 'Amount'));
@@ -135,6 +139,7 @@ 
 	/**
 	 * @todo Implement removal of readonly state with $bool=false
 	 * @todo Set readonly state whenever field is recreated, e.g. in setAllowedCurrencies()
+	 * @param boolean $bool
 	 */
 	public function setReadonly($bool) {
 		parent::setReadonly($bool);

view/ViewableData.php

Doc Comments +5 added lines, -5 removed lines

@@ -141,7 +141,7 @@ 
 	/**
 	 * Get the current failover object if set
 	 *
-	 * @return ViewableData|null
+	 * @return ViewableData
 	 */
 	public function getFailover() {
 		return $this->failover;
@@ -208,8 +208,6 @@ 
 	/**
 	 * Method to facilitate deprecation of underscore-prefixed methods automatically being cached.
 	 * 
-	 * @param string $field
-	 * @param array $arguments
 	 * @param string $identifier an optional custom cache identifier
 	 * @return unknown
 	 */
@@ -270,7 +268,7 @@ 
 	 *  - castingHelper: the casting helper for casting the field (e.g. "return new Varchar($fieldName)")
 	 *
 	 * @param string $field
-	 * @return array
+	 * @return string
 	 */
 	public function castingHelperPair($field) {
 		Deprecation::notice('2.5', 'use castingHelper() instead');
@@ -520,6 +518,7 @@ 
 	
 	/**
 	 * Return the value of a field in an SQL-safe format.
+	 * @param string $field
 	 */
 	public function SQL_val($field, $arguments = null, $cache = true) {
 		return Convert::raw2sql($this->RAW_val($field, $arguments, $cache));
@@ -527,6 +526,7 @@ 
 	
 	/**
 	 * Return the value of a field in a JavaScript-save format.
+	 * @param string $field
 	 */
 	public function JS_val($field, $arguments = null, $cache = true) {
 		return Convert::raw2js($this->RAW_val($field, $arguments, $cache));
@@ -534,6 +534,7 @@ 
 	
 	/**
 	 * Return the value of a field escaped suitable to be inserted into an XML node attribute.
+	 * @param string $field
 	 */
 	public function ATT_val($field, $arguments = null, $cache = true) {
 		return Convert::raw2att($this->RAW_val($field, $arguments, $cache));
@@ -544,7 +545,6 @@ 
 	/**
 	 * Get an array of XML-escaped values by field name
 	 *
-	 * @param array $elements an array of field names
 	 * @return array
 	 */
 	public function getXMLValues($fields) {

model/Map.php

Doc Comments +4 added lines

@@ -41,6 +41,7 @@ 
 	 * Set the key field for this map.
 	 *
 	 * @var string $keyField
+	 * @param string $keyField
 	 */
 	public function setKeyField($keyField) {
 		$this->keyField = $keyField;
@@ -50,6 +51,7 @@ 
 	 * Set the value field for this map.
 	 *
 	 * @var string $valueField
+	 * @param string $valueField
 	 */
 	public function setValueField($valueField) {
 		$this->valueField = $valueField;
@@ -95,6 +97,7 @@ 
 	 *
 	 * @var string $key
 	 * @var mixed $value
+	 * @param string $value
 	 */
 	public function unshift($key, $value) {
 		$oldItems = $this->firstItems;
@@ -114,6 +117,7 @@ 
 	 *
 	 * @var string $key
 	 * @var mixed $value
+	 * @param string $value
 	 */
 	public function push($key, $value) {
 		$oldItems = $this->lastItems;

tests/core/ObjectTest.php

Doc Comments +5 added lines

@@ -619,6 +619,11 @@
 		'ObjectTest_Extending_Extension'
 	);
 
+	/**
+	 * @param integer $first
+	 * @param integer $second
+	 * @param integer $third
+	 */
 	public function getResults(&$first, &$second, &$third) {
 		// Before extending should be invoked second
 		$this->beforeExtending('updateResult', function(&$first, &$second, &$third) {

core/Injectable.php

Doc Comments -3 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() {
@@ -47,7 +45,6 @@ 
 	 * way to access instance methods which don't rely on instance
 	 * data (e.g. the custom SilverStripe static handling).
 	 *
-	 * @param string $className Optional classname (if called on Object directly)
 	 * @return static The singleton instance
 	 */
 	public static function singleton() {