silverstripe / silverstripe-framework

dev/SapphireTest.php

Doc Comments +10 added lines, -9 removed lines

@@ -142,6 +142,7 @@ 
 
 	/**
 	 * Set the manifest to be used to look up test classes by helper functions
+	 * @param SS_ClassManifest $manifest
 	 */
 	public static function set_test_class_manifest($manifest) {
 		self::$test_class_manifest = $manifest;
@@ -399,7 +400,7 @@ 
 	/**
 	 * Get the ID of an object from the fixture.
 	 *
-	 * @param $className The data class, as specified in your fixture file.  Parent classes won't work
+	 * @param string $className The data class, as specified in your fixture file.  Parent classes won't work
 	 * @param $identifier The identifier string, as provided in your fixture file
 	 * @return int
 	 */
@@ -422,7 +423,7 @@ 
 	 * Will collate all IDs form all fixtures if multiple fixtures are provided.
 	 *
 	 * @param string $className
-	 * @return array A map of fixture-identifier => object-id
+	 * @return A A map of fixture-identifier => object-id
 	 */
 	protected function allFixtureIDs($className) {
 		return $this->getFixtureFactory()->getIds($className);
@@ -580,10 +581,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'
 	 */
@@ -744,7 +745,7 @@ 
 	 * @param string $expectedSQL
 	 * @param string $actualSQL
 	 * @param string $message
-	 * @param float $delta
+	 * @param integer $delta
 	 * @param integer $maxDepth
 	 * @param boolean $canonicalize
 	 * @param boolean $ignoreCase
@@ -982,9 +983,9 @@ 
 	/**
 	 * Test against a theme.
 	 *
-	 * @param $themeBaseDir string - themes directory
-	 * @param $theme string - theme name
-	 * @param $callback Closure
+	 * @param string $themeBaseDir string - themes directory
+	 * @param string $theme string - theme name
+	 * @param Closure $callback Closure
 	 */
 	protected function useTestTheme($themeBaseDir, $theme, $callback) {
 		Config::nest();

i18n/i18n.php

Doc Comments +4 added lines, -1 removed lines

@@ -2173,6 +2173,7 @@ 
 
 	/**
 	 * @param String
+	 * @param string $name
 	 * @return Zend_Translate
 	 */
 	public static function get_translator($name) {
@@ -2186,6 +2187,7 @@ 
 	 * @param Zend_Translate Needs to implement {@link i18nTranslateAdapterInterface}
 	 * @param String If left blank will override the default translator.
 	 * @param Int
+	 * @param string $name
 	 */
 	public static function register_translator($translator, $name, $priority = 10) {
 		if (!is_int($priority)) throw new InvalidArgumentException("register_translator expects an int priority");
@@ -2315,7 +2317,7 @@ 
 	 *
 	 * @see get_locale_name()
 	 *
-	 * @param mixed $code Language code
+	 * @param string $code Language code
 	 * @param boolean $native If true, the native name will be returned
 	 * @return Name of the language
 	 */
@@ -2472,6 +2474,7 @@ 
 	 *
 	 * Note: Does not check for {@link $allowed_locales}.
 	 *
+	 * @param string $locale
 	 * @return boolean
 	 */
 	public static function validate_locale($locale) {

control/HTTP.php

Doc Comments +10 added lines, -2 removed lines

@@ -282,6 +282,9 @@ 
 		return count($result) ? $result : null;
 	}
 
+	/**
+	 * @param string $content
+	 */
 	public static function getLinksIn($content) {
 		return self::findByTagAndAttribute($content, array("a" => "href"));
 	}
@@ -338,11 +341,17 @@ 
 			self::$modification_date = $timestamp;
 	}
 
+	/**
+	 * @param integer $timestamp
+	 */
 	public static function register_modification_timestamp($timestamp) {
 		if($timestamp > self::$modification_date)
 			self::$modification_date = $timestamp;
 	}
 
+	/**
+	 * @param string $etag
+	 */
 	public static function register_etag($etag) {
 		if (0 !== strpos($etag, '"')) {
 			$etag = sprintf('"%s"', $etag);
@@ -501,7 +510,7 @@ 
 	}
 
 	/**
-	 * @param SS_HTTPResponse|string $response
+	 * @param SS_HTTPResponse|null $response
 	 *
 	 * @return string|false
 	 */
@@ -543,7 +552,6 @@ 
 	/**
 	 * Combine vary strings
 	 *
-	 * @param string $vary,... Each vary as a separate arg
 	 * @return string
 	 */
 	protected static function combineVary($vary)

core/startup/AbstractConfirmationToken.php

Doc Comments +2 added lines, -2 removed lines

@@ -26,7 +26,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 static The token container for the unvalidated $key given with the highest priority
 	 */
 	public static function prepare_tokens($keys) {
@@ -45,7 +45,7 @@ 
 	/**
 	 * Generate a local filesystem path to store a token
 	 *
-	 * @param $token
+	 * @param string $token
 	 * @return string
 	 */
 	protected function pathForToken($token) {

security/Authenticator.php

Doc Comments +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 	/**
 	 * Method that creates the login form for this authentication method
 	 *
-	 * @param Controller The parent controller, necessary to create the
+	 * @param Controller Controller parent controller, necessary to create the
 	 *                   appropriate form action tag
 	 * @return Form Returns the login form to use with this authentication
 	 *              method
@@ -124,7 +124,7 @@ 
 	 * Remove a previously registered authenticator
 	 *
 	 * @param string $authenticator Name of the authenticator class to register
-	 * @return bool Returns TRUE on success, FALSE otherwise.
+	 * @return boolean|null Returns TRUE on success, FALSE otherwise.
 	 */
 	public static function unregister_authenticator($authenticator) {
 		if(call_user_func(array($authenticator, 'on_unregister')) === true) {