silverstripe / silverstripe-framework

model/connect/DBSchemaManager.php

Doc Comments +2 added lines, -3 removed lines

@@ -46,7 +46,6 @@ 
 	/**
 	 * Injector injection point for database controller
 	 *
-	 * @param SS_Database $connector
 	 */
 	public function setDatabase(SS_Database $database) {
 		$this->database = $database;
@@ -483,7 +482,7 @@ 
 	/**
 	 * Given an index spec determines the index type
 	 *
-	 * @param array|string $spec
+	 * @param string $spec
 	 * @return string
 	 */
 	protected function determineIndexType($spec) {
@@ -551,7 +550,7 @@ 
 	/**
 	 * Returns true if the given table is exists in the current database
 	 *
-	 * @param string $table Name of table to check
+	 * @param string $tableName Name of table to check
 	 * @return boolean Flag indicating existence of table
 	 */
 	abstract public function hasTable($tableName);

model/connect/PDOConnector.php

Doc Comments +1 added lines, -1 removed lines

@@ -324,7 +324,7 @@
 	 * @param int $errorLevel
 	 * @param string $sql
 	 * @param array $parameters
-	 * @return \PDOQuery
+	 * @return PDOQuery|null
 	 */
 	protected function prepareResults($statement, $errorLevel, $sql, $parameters = array()) {
 

model/DataExtension.php

Doc Comments +6 added lines

@@ -79,9 +79,15 @@
 	public function can($member) {
 	}
 
+	/**
+	 * @param \Member $member
+	 */
 	public function canEdit($member) {
 	}
 
+	/**
+	 * @param \Member $member
+	 */
 	public function canDelete($member) {
 	}
 

model/DataList.php

Doc Comments +6 added lines, -6 removed lines

@@ -172,7 +172,7 @@ 
 	 * Returns a new DataList instance with the specified query parameter assigned
 	 *
 	 * @param string|array $keyOrArray Either the single key to set, or an array of key value pairs to set
-	 * @param mixed $val If $keyOrArray is not an array, this is the value to set
+	 * @param string $val If $keyOrArray is not an array, this is the value to set
 	 * @return static
 	 */
 	public function setDataQueryParam($keyOrArray, $val = null) {
@@ -535,7 +535,7 @@ 
 	 * Check if the given field specification could be interpreted as an unquoted relation name
 	 *
 	 * @param string $field
-	 * @return bool
+	 * @return integer
 	 */
 	protected function isValidRelationName($field) {
 		return preg_match('/^[A-Z0-9._]+$/i', $field);
@@ -650,7 +650,7 @@ 
 	 * @param int $order A numerical index to control the order that joins are added to the query; lower order values
 	 * will cause the query to appear first. The default is 20, and joins created automatically by the
 	 * ORM have a value of 10.
-	 * @param array $parameters Any additional parameters if the join is a parameterised subquery
+	 * @param string[] $parameters Any additional parameters if the join is a parameterised subquery
 	 * @return DataList
 	 */
 	public function innerJoin($table, $onClause, $alias = null, $order = 20, $parameters = array()) {
@@ -668,7 +668,7 @@ 
 	 * @param int $order A numerical index to control the order that joins are added to the query; lower order values
 	 * will cause the query to appear first. The default is 20, and joins created automatically by the
 	 * ORM have a value of 10.
-	 * @param array $parameters Any additional parameters if the join is a parameterised subquery
+	 * @param string[] $parameters Any additional parameters if the join is a parameterised subquery
 	 * @return DataList
 	 */
 	public function leftJoin($table, $onClause, $alias = null, $order = 20, $parameters = array()) {
@@ -884,7 +884,7 @@ 
 	/**
 	 * Restrict the columns to fetch into this DataList
 	 *
-	 * @param array $queriedColumns
+	 * @param string[] $queriedColumns
 	 * @return DataList
 	 */
 	public function setQueriedColumns($queriedColumns) {
@@ -1159,7 +1159,7 @@ 
 	/**
 	 * Returns item stored in list with index $key
 	 *
-	 * @param mixed $key
+	 * @param integer $key
 	 * @return DataObject
 	 */
 	public function offsetGet($key) {

model/HTMLValue.php

Doc Comments +2 added lines, -2 removed lines

@@ -152,8 +152,8 @@
 	/**
 	 * Make an xpath query against this HTML
 	 *
-	 * @param $query string - The xpath query string
-	 * @return DOMNodeList
+	 * @param string $query string - The xpath query string
+	 * @return \DOMNodeList
 	 */
 	public function query($query) {
 		$xp = new DOMXPath($this->getDocument());

model/ManyManyList.php

Doc Comments +2 added lines, -2 removed lines

@@ -115,7 +115,7 @@ 
 	 * Create a DataObject from the given SQL row.
 	 *
 	 * @param array $row
-	 * @return DataObject
+	 * @return SilverStripe\Model\DataObject
 	 */
 	protected function createDataObject($row) {
 		// remove any composed fields
@@ -265,7 +265,7 @@ 
 	 * Note that for a ManyManyList, the item is never actually deleted, only
 	 * the join table is affected.
 	 *
-	 * @param DataObject $item
+	 * @param SilverStripe\Model\DataObject $item
 	 */
 	public function remove($item) {
 		if(!($item instanceof $this->dataClass)) {

model/versioning/Versioned.php

Doc Comments +5 added lines, -5 removed lines

@@ -1062,7 +1062,7 @@ 
 	/**
 	 * Find objects in the given relationships, merging them into the given list
 	 *
-	 * @param array $source Config property to extract relationships from
+	 * @param string $source Config property to extract relationships from
 	 * @param bool $recursive True if recursive
 	 * @param ArrayList $list Optional list to add items to
 	 * @return ArrayList The list
@@ -1182,7 +1182,7 @@ 
 	/**
 	 * Check if the current user can delete this record from live
 	 *
-	 * @param null $member
+	 * @param Member|null $member
 	 * @return mixed
 	 */
 	public function canUnpublish($member = null) {
@@ -1215,7 +1215,7 @@ 
 	 * If extended, ensure that both canDelete and canUnpublish are extended also
 	 *
 	 * @param Member $member
-	 * @return bool
+	 * @return null|boolean
 	 */
 	public function canArchive($member = null) {
 		// Skip if invoked by extendedCan()
@@ -1292,7 +1292,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
@@ -2418,7 +2418,7 @@ 
 	/**
 	 * Returns an array of possible stages.
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	public function getVersionedStages() {
 		if($this->hasStages()) {

security/PasswordEncryptor.php

Doc Comments +3 added lines, -2 removed lines

@@ -87,6 +87,7 @@ 
 	 * but is necessary for retain compatibility with password hashed
 	 * with flawed algorithms - see {@link PasswordEncryptor_LegacyPHPHash} and
 	 * {@link PasswordEncryptor_Blowfish}
+	 * @param string $password
 	 */
 	public function check($hash, $password, $salt = null, $member = null) {
 		return $hash === $this->encrypt($password, $salt, $member);
@@ -129,8 +130,7 @@ 
 	/**
 	 * Gets the cost that is set for the blowfish algorithm
 	 *
-	 * @param int $cost
-	 * @return null
+	 * @return integer
 	 */
 	public static function get_cost() {
 		return self::$cost;
@@ -242,6 +242,7 @@ 
 
 	/**
 	 * self::$cost param is forced to be two digits with leading zeroes for ints 4-9
+	 * @param string $password
 	 */
 	public function salt($password, $member = null) {
 		$generator = new RandomGenerator();

admin/code/CampaignAdmin.php

Doc Comments +1 added lines, -1 removed lines

@@ -331,7 +331,7 @@
 	/**
 	 * Gets viewable list of campaigns
 	 *
-	 * @return SS_List
+	 * @return SilverStripe\Model\ArrayList
 	 */
 	protected function getListItems() {
 		return ChangeSet::get()