Completed
Pull Request — master (#5433)
by Sam
19:38
created
security/Authenticator.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	/**
44 44
 	 * Method that creates the login form for this authentication method
45 45
 	 *
46
-	 * @param Controller The parent controller, necessary to create the
46
+	 * @param Controller Controller parent controller, necessary to create the
47 47
 	 *                   appropriate form action tag
48 48
 	 * @return Form Returns the login form to use with this authentication
49 49
 	 *              method
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 	 * Remove a previously registered authenticator
122 122
 	 *
123 123
 	 * @param string $authenticator Name of the authenticator class to register
124
-	 * @return bool Returns TRUE on success, FALSE otherwise.
124
+	 * @return boolean|null Returns TRUE on success, FALSE otherwise.
125 125
 	 */
126 126
 	public static function unregister_authenticator($authenticator) {
127 127
 		if(call_user_func(array($authenticator, 'on_unregister')) === true) {
@@ -164,6 +164,7 @@  discard block
 block discarded – undo
164 164
 	 * Set a default authenticator (shows first in tabs)
165 165
 	 *
166 166
 	 * @param string
167
+	 * @param string $authenticator
167 168
 	 */
168 169
 	public static function set_default_authenticator($authenticator) {
169 170
 		self::$default_authenticator = $authenticator;
Please login to merge, or discard this patch.
security/CMSSecurity.php 1 patch
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -42,6 +42,9 @@  discard block
 block discarded – undo
42 42
 		);
43 43
 	}
44 44
 
45
+	/**
46
+	 * @param string $action
47
+	 */
45 48
 	public function Link($action = null) {
46 49
 		return Controller::join_links(Director::baseURL(), "CMSSecurity", $action);
47 50
 	}
@@ -57,6 +60,9 @@  discard block
 block discarded – undo
57 60
 		}
58 61
 	}
59 62
 
63
+	/**
64
+	 * @param string $title
65
+	 */
60 66
 	public function getResponseController($title) {
61 67
 		// Use $this to prevent use of Page to render underlying templates
62 68
 		return $this;
@@ -172,6 +178,9 @@  discard block
 block discarded – undo
172 178
 		user_error('Passed invalid authentication method', E_USER_ERROR);
173 179
 	}
174 180
 
181
+	/**
182
+	 * @param string $action
183
+	 */
175 184
 	public function getTemplatesFor($action) {
176 185
 		return array("CMSSecurity_{$action}", "CMSSecurity")
177 186
 			+ parent::getTemplatesFor($action);
Please login to merge, or discard this patch.
security/MemberAuthenticator.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 	 * @param Form $form Optional: If passed, better error messages can be
135 135
 	 *                             produced by using
136 136
 	 *                             {@link Form::sessionMessage()}
137
-	 * @return bool|Member Returns FALSE if authentication fails, otherwise
137
+	 * @return Member|null Returns FALSE if authentication fails, otherwise
138 138
 	 *                     the member object
139 139
 	 * @see Security::setDefaultAdmin()
140 140
 	 */
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 	/**
166 166
 	 * Method that creates the login form for this authentication method
167 167
 	 *
168
-	 * @param Controller The parent controller, necessary to create the
168
+	 * @param Controller Controller parent controller, necessary to create the
169 169
 	 *                   appropriate form action tag
170 170
 	 * @return Form Returns the login form to use with this authentication
171 171
 	 *              method
Please login to merge, or discard this patch.
security/MemberLoginForm.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,6 @@
 block discarded – undo
47 47
 	 * @param bool $checkCurrentUser If set to TRUE, it will be checked if a
48 48
 	 *                               the user is currently logged in, and if
49 49
 	 *                               so, only a logout button will be rendered
50
-	 * @param string $authenticatorClassName Name of the authenticator class that this form uses.
51 50
 	 */
52 51
 	public function __construct($controller, $name, $fields = null, $actions = null,
53 52
 								$checkCurrentUser = true) {
Please login to merge, or discard this patch.
security/MemberPassword.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -32,6 +32,7 @@
 block discarded – undo
32 32
 	/**
33 33
 	 * Log a password change from the given member.
34 34
 	 * Call MemberPassword::log($this) from within Member whenever the password is changed.
35
+	 * @param Member $member
35 36
 	 */
36 37
 	public static function log($member) {
37 38
 		$record = new MemberPassword();
Please login to merge, or discard this patch.
security/PasswordValidator.php 1 patch
Doc Comments   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,6 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
 	/**
30 30
 	 * Minimum password length
31
+	 * @param integer $minLength
31 32
 	 */
32 33
 	public function minLength($minLength) {
33 34
 		$this->minLength = $minLength;
@@ -39,8 +40,8 @@  discard block
 block discarded – undo
39 40
 	 *
40 41
 	 * Eg: $this->characterStrength(3, array("lowercase", "uppercase", "digits", "punctuation"))
41 42
 	 *
42
-	 * @param $minScore The minimum number of character tests that must pass
43
-	 * @param $testNames The names of the tests to perform
43
+	 * @param integer $minScore The minimum number of character tests that must pass
44
+	 * @param string[] $testNames The names of the tests to perform
44 45
 	 */
45 46
 	public function characterStrength($minScore, $testNames) {
46 47
 		$this->minScore = $minScore;
@@ -50,6 +51,7 @@  discard block
 block discarded – undo
50 51
 
51 52
 	/**
52 53
 	 * Check a number of previous passwords that the user has used, and don't let them change to that.
54
+	 * @param integer $count
53 55
 	 */
54 56
 	public function checkHistoricalPasswords($count) {
55 57
 		$this->historicalPasswordCount = $count;
Please login to merge, or discard this patch.
tasks/EncryptAllPasswordsTask.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -66,6 +66,7 @@
 block discarded – undo
66 66
 
67 67
 	/**
68 68
 	 * @todo This should really be taken care of by TestRunner
69
+	 * @param string $msg
69 70
 	 */
70 71
 	protected function debugMessage($msg) {
71 72
 		if(class_exists('SapphireTest', false) && !SapphireTest::is_running_test()) {
Please login to merge, or discard this patch.
tests/api/RestfulServiceTest.php 1 patch
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -208,6 +208,8 @@
 block discarded – undo
208 208
 	 * Simulate cached response file for testing error requests that are supposed to have cache files
209 209
 	 *
210 210
 	 * @todo Generate the cachepath without hardcoding the cache data
211
+	 * @param RestfulServiceTest_MockErrorService $connection
212
+	 * @param string $subUrl
211 213
 	 */
212 214
 	private function createFakeCachedResponse($connection, $subUrl) {
213 215
 		$fullUrl = $connection->getAbsoluteRequestURL($subUrl);
Please login to merge, or discard this patch.
tests/core/manifest/ConfigManifestTest.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 	/**
12 12
 	 * This is a helper method for getting a new manifest
13
-	 * @param $name
13
+	 * @param string $name
14 14
 	 * @return any
15 15
 	 */
16 16
 	protected function getConfigFixtureValue($name) {
@@ -20,6 +20,7 @@  discard block
 block discarded – undo
20 20
 
21 21
 	/**
22 22
 	 * This is a helper method for displaying a relevant message about a parsing failure
23
+	 * @param string $path
23 24
 	 */
24 25
 	protected function getParsedAsMessage($path) {
25 26
 		return sprintf('Reference path "%s" failed to parse correctly', $path);
@@ -41,7 +42,7 @@  discard block
 block discarded – undo
41 42
 
42 43
 	/**
43 44
 	 * A helper method to return a mock of the manifest in order to test expectations and reduce dependency
44
-	 * @param $methods
45
+	 * @param string[] $methods
45 46
 	 * @return SS_ConfigManifest
46 47
 	 */
47 48
 	protected function getManifestMock($methods) {
Please login to merge, or discard this patch.