Completed
Pull Request — master (#6266)
by Sam
13:07
created
src/ORM/Versioning/Versioned.php 1 patch
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1065,7 +1065,7 @@  discard block
 block discarded – undo
1065 1065
 	/**
1066 1066
 	 * Find objects in the given relationships, merging them into the given list
1067 1067
 	 *
1068
-	 * @param array $source Config property to extract relationships from
1068
+	 * @param string $source Config property to extract relationships from
1069 1069
 	 * @param bool $recursive True if recursive
1070 1070
 	 * @param ArrayList $list Optional list to add items to
1071 1071
 	 * @return ArrayList The list
@@ -1185,7 +1185,7 @@  discard block
 block discarded – undo
1185 1185
 	/**
1186 1186
 	 * Check if the current user can delete this record from live
1187 1187
 	 *
1188
-	 * @param null $member
1188
+	 * @param Member|null $member
1189 1189
 	 * @return mixed
1190 1190
 	 */
1191 1191
 	public function canUnpublish($member = null) {
@@ -1295,7 +1295,7 @@  discard block
 block discarded – undo
1295 1295
 	 * Extend permissions to include additional security for objects that are not published to live.
1296 1296
 	 *
1297 1297
 	 * @param Member $member
1298
-	 * @return bool|null
1298
+	 * @return false|null
1299 1299
 	 */
1300 1300
 	public function canView($member = null) {
1301 1301
 		// Invoke default version-gnostic canView
@@ -1371,7 +1371,7 @@  discard block
 block discarded – undo
1371 1371
 	 *
1372 1372
 	 * @param string $stage
1373 1373
 	 * @param Member $member
1374
-	 * @return bool
1374
+	 * @return boolean|string
1375 1375
 	 */
1376 1376
 	public function canViewStage($stage = 'Live', $member = null) {
1377 1377
 		$oldMode = Versioned::get_reading_mode();
@@ -1436,7 +1436,7 @@  discard block
 block discarded – undo
1436 1436
 	/**
1437 1437
 	 * Determines if the current draft version is the same as live
1438 1438
 	 *
1439
-	 * @return bool
1439
+	 * @return string
1440 1440
 	 */
1441 1441
 	public function latestPublished() {
1442 1442
 		// Get the root data object class - this will have the version field
@@ -2433,7 +2433,7 @@  discard block
 block discarded – undo
2433 2433
 	/**
2434 2434
 	 * Returns an array of possible stages.
2435 2435
 	 *
2436
-	 * @return array
2436
+	 * @return string[]
2437 2437
 	 */
2438 2438
 	public function getVersionedStages() {
2439 2439
 		if($this->hasStages()) {
Please login to merge, or discard this patch.
src/Security/Authenticator.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	 * Remove a previously registered authenticator
129 129
 	 *
130 130
 	 * @param string $authenticator Name of the authenticator class to register
131
-	 * @return bool Returns TRUE on success, FALSE otherwise.
131
+	 * @return boolean|null Returns TRUE on success, FALSE otherwise.
132 132
 	 */
133 133
 	public static function unregister_authenticator($authenticator) {
134 134
 		if(call_user_func(array($authenticator, 'on_unregister')) === true) {
@@ -171,6 +171,7 @@  discard block
 block discarded – undo
171 171
 	 * Set a default authenticator (shows first in tabs)
172 172
 	 *
173 173
 	 * @param string
174
+	 * @param string $authenticator
174 175
 	 */
175 176
 	public static function set_default_authenticator($authenticator) {
176 177
 		self::$default_authenticator = $authenticator;
Please login to merge, or discard this patch.
src/Security/CMSSecurity.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -52,6 +52,9 @@  discard block
 block discarded – undo
52 52
 		);
53 53
 	}
54 54
 
55
+	/**
56
+	 * @param string $action
57
+	 */
55 58
 	public function Link($action = null) {
56 59
 		/** @skipUpgrade */
57 60
 		return Controller::join_links(Director::baseURL(), "CMSSecurity", $action);
@@ -68,6 +71,9 @@  discard block
 block discarded – undo
68 71
 		}
69 72
 	}
70 73
 
74
+	/**
75
+	 * @param string $title
76
+	 */
71 77
 	public function getResponseController($title) {
72 78
 		// Use $this to prevent use of Page to render underlying templates
73 79
 		return $this;
Please login to merge, or discard this patch.
src/Security/Group.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -331,6 +331,7 @@
 block discarded – undo
331 331
 	 * Overloaded to ensure the code is always descent.
332 332
 	 *
333 333
 	 * @param string
334
+	 * @param string $val
334 335
 	 */
335 336
 	public function setCode($val){
336 337
 		$this->setField("Code", Convert::raw2url($val));
Please login to merge, or discard this patch.
src/Security/Member.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1563,7 +1563,7 @@  discard block
 block discarded – undo
1563 1563
 	 * This is likely to be customized for social sites etc. with a looser permission model.
1564 1564
 	 *
1565 1565
 	 * @param Member $member
1566
-	 * @return bool
1566
+	 * @return boolean|string
1567 1567
 	 */
1568 1568
     public function canView($member = null) {
1569 1569
         //get member
@@ -1593,7 +1593,7 @@  discard block
 block discarded – undo
1593 1593
 	 * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
1594 1594
 	 *
1595 1595
 	 * @param Member $member
1596
-	 * @return bool
1596
+	 * @return boolean|string
1597 1597
 	 */
1598 1598
     public function canEdit($member = null) {
1599 1599
         //get member
@@ -1627,7 +1627,7 @@  discard block
 block discarded – undo
1627 1627
      * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
1628 1628
 	 *
1629 1629
 	 * @param Member $member
1630
-	 * @return bool
1630
+	 * @return boolean|string
1631 1631
      */
1632 1632
     public function canDelete($member = null) {
1633 1633
         if(!($member instanceof Member)) {
Please login to merge, or discard this patch.
src/Security/MemberAuthenticator.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -147,7 +147,7 @@
 block discarded – undo
147 147
 	 * @param Form $form Optional: If passed, better error messages can be
148 148
 	 *                             produced by using
149 149
 	 *                             {@link Form::sessionMessage()}
150
-	 * @return bool|Member Returns FALSE if authentication fails, otherwise
150
+	 * @return Member|null Returns FALSE if authentication fails, otherwise
151 151
 	 *                     the member object
152 152
 	 * @see Security::setDefaultAdmin()
153 153
 	 */
Please login to merge, or discard this patch.
src/Security/PasswordValidator.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 	 * Eg: $this->characterStrength(3, array("lowercase", "uppercase", "digits", "punctuation"))
46 46
 	 *
47 47
 	 * @param int $minScore The minimum number of character tests that must pass
48
-	 * @param array $testNames The names of the tests to perform
48
+	 * @param string[] $testNames The names of the tests to perform
49 49
 	 * @return $this
50 50
 	 */
51 51
 	public function characterStrength($minScore, $testNames) {
Please login to merge, or discard this patch.
src/Security/Permission.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 	 *  will be checked for the current user
122 122
 	 * @param bool $strict Use "strict" checking (which means a permission
123 123
 	 *  will be granted if the key does not exist at all)?
124
-	 * @return int|bool The ID of the permission record if the permission
124
+	 * @return boolean|string The ID of the permission record if the permission
125 125
 	 *  exists; FALSE otherwise. If "strict" checking is
126 126
 	 *  disabled, TRUE will be returned if the permission does not exist at all.
127 127
 	 */
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 	 * @param string $arg Optional argument (e.g. a permissions for a specific page)
160 160
 	 * @param bool $strict Use "strict" checking (which means a permission
161 161
 	 *  will be granted if the key does not exist at all)?
162
-	 * @return int|bool The ID of the permission record if the permission
162
+	 * @return boolean|string The ID of the permission record if the permission
163 163
 	 *  exists; FALSE otherwise. If "strict" checking is
164 164
 	 *  disabled, TRUE will be returned if the permission does not exist at all.
165 165
 	 */
Please login to merge, or discard this patch.
src/Security/Permission_Group.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
 	/**
59 59
 	 * Get permissions
60 60
 	 *
61
-	 * @return array Associative array of permissions in this permission
61
+	 * @return string Associative array of permissions in this permission
62 62
 	 *               group. The array indicies are the permission codes as
63 63
 	 *               used in {@link Permission::check()}. The value is
64 64
 	 *               suitable for using in an interface.
Please login to merge, or discard this patch.