silverstripe / silverstripe-framework

ORM/HasManyList.php

Doc Comments +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	 *
 	 * It does so by setting the relationFilters.
 	 *
-	 * @param DataObject|int $item The DataObject to be added, or its ID
+	 * @param DataObject $item The DataObject to be added, or its ID
 	 */
 	public function add($item) {
 		if(is_numeric($item)) {

ORM/Queries/SQLSelect.php

Doc Comments +2 added lines, -4 removed lines

@@ -65,7 +65,7 @@ 
 	/**
 	 * Construct a new SQLSelect.
 	 *
-	 * @param array|string $select An array of SELECT fields.
+	 * @param string $select An array of SELECT fields.
 	 * @param array|string $from An array of FROM clauses. The first one should be just the table name.
 	 * Each should be ANSI quoted.
 	 * @param array $where An array of WHERE clauses.
@@ -355,7 +355,7 @@ 
 	 *
 	 * @param string $value
 	 * @param string $defaultDirection
-	 * @return array A two element array: array($column, $direction)
+	 * @return string[] A two element array: array($column, $direction)
 	 */
 	private function getDirectionFromString($value, $defaultDirection = null) {
 		if(preg_match('/^(.*)(asc|desc)$/i', $value, $matches)) {
@@ -450,7 +450,6 @@ 
 	 * @see SQLSelect::addWhere() for syntax examples
 	 *
 	 * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries
-	 * @param mixed $having,... Unlimited additional predicates
 	 * @return $this Self reference
 	 */
 	public function setHaving($having) {
@@ -465,7 +464,6 @@ 
 	 * @see SQLSelect::addWhere() for syntax examples
 	 *
 	 * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries
-	 * @param mixed $having,... Unlimited additional predicates
 	 * @return $this Self reference
 	 */
 	public function addHaving($having) {

Security/PasswordValidator.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	 * Eg: $this->characterStrength(3, array("lowercase", "uppercase", "digits", "punctuation"))
 	 *
 	 * @param int $minScore The minimum number of character tests that must pass
-	 * @param array $testNames The names of the tests to perform
+	 * @param string[] $testNames The names of the tests to perform
 	 * @return $this
 	 */
 	public function characterStrength($minScore, $testNames) {

Security/Permission.php

Doc Comments +2 added lines, -2 removed lines

@@ -121,7 +121,7 @@ 
 	 *  will be checked for the current user
 	 * @param bool $strict Use "strict" checking (which means a permission
 	 *  will be granted if the key does not exist at all)?
-	 * @return int|bool The ID of the permission record if the permission
+	 * @return boolean|string The ID of the permission record if the permission
 	 *  exists; FALSE otherwise. If "strict" checking is
 	 *  disabled, TRUE will be returned if the permission does not exist at all.
 	 */
@@ -159,7 +159,7 @@ 
 	 * @param string $arg Optional argument (e.g. a permissions for a specific page)
 	 * @param bool $strict Use "strict" checking (which means a permission
 	 *  will be granted if the key does not exist at all)?
-	 * @return int|bool The ID of the permission record if the permission
+	 * @return boolean|string The ID of the permission record if the permission
 	 *  exists; FALSE otherwise. If "strict" checking is
 	 *  disabled, TRUE will be returned if the permission does not exist at all.
 	 */

Security/Permission_Group.php

Doc Comments +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 	/**
 	 * Get permissions
 	 *
-	 * @return array Associative array of permissions in this permission
+	 * @return string Associative array of permissions in this permission
 	 *               group. The array indicies are the permission codes as
 	 *               used in {@link Permission::check()}. The value is
 	 *               suitable for using in an interface.

tests/forms/GridFieldTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 	/**
 	 *
 	 * @param GridField $gridField
-	 * @return array
+	 * @return string[]
 	 */
 	public function getActions($gridField) {
 		return array('addto');

tests/forms/RequirementsTest.php

Doc Comments +7 added lines

@@ -127,6 +127,10 @@ 
 		);
 	}
 
+	/**
+	 * @param boolean $async
+	 * @param boolean $defer
+	 */
 	protected function setupCombinedRequirementsJavascriptAsyncDefer($backend, $async, $defer) {
         $basePath = $this->getCurrentRelativePath();
         $this->setupRequirements($backend);
@@ -836,6 +840,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $type
+	 */
 	public function assertFileNotIncluded($backend, $type, $files) {
 		$includedFiles = $this->getBackendFiles($backend, $type);
 		if(is_array($files)) {

tests/forms/uploadfield/AssetFieldTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -359,7 +359,7 @@
 	 * Simulates a file upload
 	 *
 	 * @param string $fileField Name of the field to mock upload for
-	 * @param array $tmpFileName Name of temporary file to upload
+	 * @param string $tmpFileName Name of temporary file to upload
 	 * @return SS_HTTPResponse form response
 	 */
 	protected function mockFileUpload($fileField, $tmpFileName) {

tests/forms/uploadfield/UploadFieldTest.php

Doc Comments +4 added lines, -1 removed lines

@@ -946,7 +946,7 @@ 
 	 * Simulates a file upload
 	 *
 	 * @param string $fileField Name of the field to mock upload for
-	 * @param array $tmpFileName Name of temporary file to upload
+	 * @param string $tmpFileName Name of temporary file to upload
 	 * @return SS_HTTPResponse form response
 	 */
 	protected function mockFileUpload($fileField, $tmpFileName) {
@@ -958,6 +958,9 @@ 
 		);
 	}
 
+	/**
+	 * @param string $fileField
+	 */
 	protected function mockFileExists($fileField, $fileName) {
 		return $this->get(
 			"UploadFieldTest_Controller/Form/field/{$fileField}/fileexists?filename=".urlencode($fileName)