silverstripe / silverstripe-framework

Core/Startup/ErrorControlChain.php

Doc Comments +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
 	/**
 	 * Get value of display_errors ini value
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	protected function getDisplayErrors() {
 		return ini_get('display_errors');
@@ -110,7 +110,7 @@ 
 	 * Add this callback to the chain of callbacks to call along with the state
 	 * that $error must be in this point in the chain for the callback to be called
 	 *
-	 * @param $callback - The callback to call
+	 * @param callable $callback - The callback to call
 	 * @param $onErrorState - false if only call if no errors yet, true if only call if already errors, null for either
 	 * @return $this
 	 */

Core/Startup/ParameterConfirmationToken.php

Doc Comments +4 added lines, -1 removed lines

@@ -36,6 +36,9 @@ 
 	 */
 	protected $token = null;
 
+	/**
+	 * @param string $token
+	 */
 	protected function pathForToken($token) {
 		return TEMP_FOLDER.'/token_'.preg_replace('/[^a-z0-9]+/', '', $token);
 	}
@@ -235,7 +238,7 @@ 
 	 * Given a list of token names, suppress all tokens that have not been validated, and
 	 * return the non-validated token with the highest priority
 	 *
-	 * @param array $keys List of token keys in ascending priority (low to high)
+	 * @param string[] $keys List of token keys in ascending priority (low to high)
 	 * @return ParameterConfirmationToken The token container for the unvalidated $key given with the highest priority
 	 */
 	public static function prepare_tokens($keys) {

Dev/Backtrace.php

Doc Comments +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 	 * @param mixed $returnVal
 	 * @param bool $ignoreAjax
 	 * @param array $ignoredFunctions
-	 * @return mixed
+	 * @return string|null
 	 */
 	public static function backtrace($returnVal = false, $ignoreAjax = false, $ignoredFunctions = null) {
 		$plainText = Director::is_cli() || (Director::is_ajax() && !$ignoreAjax);

Dev/BulkLoader.php

Doc Comments +1 added lines, -1 removed lines

@@ -211,7 +211,7 @@
 	 *
 	 * @todo Mix in custom column mappings
 	 *
-	 * @return array
+	 * @return string
 	 **/
 	public function getImportSpec() {
 		$spec = array();

Dev/CsvBulkLoader.php

Doc Comments +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 	 * @param string $path Path to large file to split
 	 * @param int $lines Number of lines per file
 	 *
-	 * @return array List of file paths
+	 * @return string[] List of file paths
 	 */
 	protected function splitFile($path, $lines = null) {
 		$previous = ini_get('auto_detect_line_endings');

Dev/Deprecation.php

Doc Comments +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 	 * greater than or equal to this version, a message will be raised
 	 *
 	 * @static
-	 * @param $ver string -
+	 * @param string $ver string -
 	 *     A php standard version string, see http://php.net/manual/en/function.version-compare.php for details.
 	 * @param null $forModule string -
 	 *    The name of a module. The passed version will be used as the check value for

Dev/FixtureBlueprint.php

Doc Comments +6 added lines

@@ -260,6 +260,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $type
+	 */
 	protected function invokeCallbacks($type, $args = array()) {
 		foreach($this->callbacks[$type] as $callback) {
 			call_user_func_array($callback, $args);
@@ -299,6 +302,9 @@ 
 		$obj->$name = $this->parseValue($value, $fixtures);
 	}
 
+	/**
+	 * @param string $fieldName
+	 */
 	protected function overrideField($obj, $fieldName, $value, $fixtures = null) {
 		$class = get_class($obj);
 		$table = DataObject::getSchema()->tableForField($class, $fieldName);

Dev/SapphireTest.php

Doc Comments +4 added lines, -4 removed lines

@@ -617,10 +617,10 @@ 
 	/**
 	 * Assert that the matching email was sent since the last call to clearEmails()
 	 * All of the parameters can either be a string, or, if they start with "/", a PREG-compatible regular expression.
-	 * @param $to
+	 * @param string $to
 	 * @param $from
-	 * @param $subject
-	 * @param $content
+	 * @param string $subject
+	 * @param string $content
 	 * @return array Contains the keys: 'type', 'to', 'from', 'subject', 'content', 'plainContent', 'attachedFiles',
 	 *               'customHeaders', 'htmlContent', inlineImages'
 	 */
@@ -794,7 +794,7 @@ 
 	 * @param string $expectedSQL
 	 * @param string $actualSQL
 	 * @param string $message
-	 * @param float|int $delta
+	 * @param integer $delta
 	 * @param integer $maxDepth
 	 * @param boolean $canonicalize
 	 * @param boolean $ignoreCase

Dev/SapphireTestReporter.php

Doc Comments +4 added lines, -1 removed lines

@@ -319,7 +319,7 @@ 
 	 * @access private
 	 * @param obj PHPUnit_Framework_Test, current test that is being run
 	 * @param obj PHPUnit_Framework_AssertationFailedError, PHPUnit error
-	 * @return array
+	 * @return string
 	 */
 	private function getTestException(PHPUnit_Framework_Test $test, Exception $e) {
 		// get the name of the testFile from the test
@@ -406,6 +406,9 @@ 
 
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function testNameToPhrase($name) {
 		return ucfirst(preg_replace("/([a-z])([A-Z])/", "$1 $2", $name));
 	}