Completed
Pull Request — master (#20515)
by Georg
11:16
created
apps/files_trashbin/lib/Storage.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -777,7 +777,7 @@
 block discarded – undo
777 777
 	/**
778 778
 	 * check if path points to a files version
779 779
 	 *
780
-	 * @param $path
780
+	 * @param string $path
781 781
 	 * @return bool
782 782
 	 */
783 783
 	protected function isVersion($path) {
Please login to merge, or discard this patch.
apps/files_trashbin/lib/Trashbin.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
655 655
 	 * if the size limit for the trash bin is reached, we delete the oldest
656 656
 	 * files in the trash bin until we meet the limit again
657 657
 	 *
658
-	 * @param array $files
658
+	 * @param \OCP\Files\FileInfo[] $files
659 659
 	 * @param string $user
660 660
 	 * @param int $availableSpace available disc space
661 661
 	 * @return int size of deleted files
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
 	/**
684 684
 	 * delete files older then max storage time
685 685
 	 *
686
-	 * @param array $files list of files sorted by mtime
686
+	 * @param \OCP\Files\FileInfo[] $files list of files sorted by mtime
687 687
 	 * @param string $user
688 688
 	 * @return integer[] size of deleted files and number of deleted files
689 689
 	 */
Please login to merge, or discard this patch.
apps/files/lib/Service/TagService.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,6 @@
 block discarded – undo
24 24
 
25 25
 namespace OCA\Files\Service;
26 26
 
27
-use OC\Files\FileInfo;
28 27
 use OCP\Files\Node;
29 28
 
30 29
 /**
Please login to merge, or discard this patch.
apps/dav/lib/SystemTag/SystemTagPlugin.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -24,13 +24,11 @@
 block discarded – undo
24 24
 
25 25
 use OCP\IGroupManager;
26 26
 use OCP\IUserSession;
27
-use Sabre\DAV\Exception\NotFound;
28 27
 use Sabre\DAV\PropFind;
29 28
 use Sabre\DAV\PropPatch;
30 29
 use Sabre\DAV\Exception\BadRequest;
31 30
 use Sabre\DAV\Exception\UnsupportedMediaType;
32 31
 use Sabre\DAV\Exception\Conflict;
33
-
34 32
 use OCP\SystemTag\ISystemTag;
35 33
 use OCP\SystemTag\ISystemTagManager;
36 34
 use OCP\SystemTag\TagAlreadyExistsException;
Please login to merge, or discard this patch.
apps/dav/lib/SystemTag/SystemTagsByIdCollection.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -26,13 +26,11 @@
 block discarded – undo
26 26
 use Sabre\DAV\Exception\NotFound;
27 27
 use Sabre\DAV\Exception\BadRequest;
28 28
 use Sabre\DAV\ICollection;
29
-
30 29
 use OCP\SystemTag\ISystemTagManager;
31 30
 use OCP\SystemTag\ISystemTag;
32 31
 use OCP\SystemTag\TagNotFoundException;
33 32
 use OCP\IGroupManager;
34 33
 use OCP\IUserSession;
35
-use OC\User\NoUserException;
36 34
 
37 35
 class SystemTagsByIdCollection implements ICollection {
38 36
 
Please login to merge, or discard this patch.
core/Middleware/TwoFactorMiddleware.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -79,6 +79,10 @@
 block discarded – undo
79 79
 		// TODO: throw exceptions if necessary
80 80
 	}
81 81
 
82
+	/**
83
+	 * @param Controller $controller
84
+	 * @param string $methodName
85
+	 */
82 86
 	private function checkTwoFactor($controller, $methodName) {
83 87
 		// If two-factor auth is in progress disallow access to any controllers
84 88
 		// defined within "LoginController".
Please login to merge, or discard this patch.
lib/private/legacy/template/functions.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
  * make preview_icon available as a simple function
184 184
  * Returns the path to the preview of the image.
185 185
  * @param string $path path of file
186
- * @return link to the preview
186
+ * @return string to the preview
187 187
  *
188 188
  * For further information have a look at OC_Helper::previewIcon
189 189
  */
@@ -193,6 +193,7 @@  discard block
 block discarded – undo
193 193
 
194 194
 /**
195 195
  * @param string $path
196
+ * @param string $token
196 197
  */
197 198
 function publicPreview_icon ( $path, $token ) {
198 199
 	return OC_Helper::publicPreviewIcon( $path, $token );
Please login to merge, or discard this patch.
lib/private/Template/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@
 block discarded – undo
96 96
 	/**
97 97
 	 * Appends a variable
98 98
 	 * @param string $key key
99
-	 * @param mixed $value value
99
+	 * @param string $value value
100 100
 	 * @return boolean|null
101 101
 	 *
102 102
 	 * This function assigns a variable in an array context. If the key already
Please login to merge, or discard this patch.
apps/user_ldap/lib/Access.php 1 patch
Doc Comments   +11 added lines, -9 removed lines patch added patch discarded remove patch
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
 
394 394
 	/**
395 395
 	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
396
-	 * @param string $dn the dn of the user object
396
+	 * @param string $fdn the dn of the user object
397 397
 	 * @param string $ldapName optional, the display name of the object
398 398
 	 * @return string|false with with the name to use in ownCloud
399 399
 	 */
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
 
411 411
 	/**
412 412
 	 * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN
413
-	 * @param string $dn the dn of the user object
413
+	 * @param string $fdn the dn of the user object
414 414
 	 * @param string $ldapName optional, the display name of the object
415 415
 	 * @param bool $isUser optional, whether it is a user object (otherwise group assumed)
416 416
 	 * @return string|false with with the name to use in ownCloud
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
 	 * the login filter.
666 666
 	 *
667 667
 	 * @param string $loginName
668
-	 * @param array $attributes optional, list of attributes to read
668
+	 * @param string[] $attributes optional, list of attributes to read
669 669
 	 * @return array
670 670
 	 */
671 671
 	public function fetchUsersByLoginName($loginName, $attributes = array('dn')) {
@@ -731,7 +731,7 @@  discard block
 block discarded – undo
731 731
 
732 732
 	/**
733 733
 	 * @param string $filter
734
-	 * @param string|string[] $attr
734
+	 * @param string[] $attr
735 735
 	 * @param int $limit
736 736
 	 * @param int $offset
737 737
 	 * @return array
@@ -779,7 +779,7 @@  discard block
 block discarded – undo
779 779
 
780 780
 	/**
781 781
 	 * @param string $filter
782
-	 * @param string|string[] $attr
782
+	 * @param string[] $attr
783 783
 	 * @param int $limit
784 784
 	 * @param int $offset
785 785
 	 * @return false|int
@@ -829,6 +829,7 @@  discard block
 block discarded – undo
829 829
 	 * retrieved. Results will according to the order in the array.
830 830
 	 * @param int $limit optional, maximum results to be counted
831 831
 	 * @param int $offset optional, a starting point
832
+	 * @param string $filter
832 833
 	 * @return array|false array with the search result as first value and pagedSearchOK as
833 834
 	 * second | false if not successful
834 835
 	 */
@@ -875,7 +876,7 @@  discard block
 block discarded – undo
875 876
 	 * @param bool $pagedSearchOK whether a paged search has been executed
876 877
 	 * @param bool $skipHandling required for paged search when cookies to
877 878
 	 * prior results need to be gained
878
-	 * @return bool cookie validity, true if we have more pages, false otherwise.
879
+	 * @return null|boolean cookie validity, true if we have more pages, false otherwise.
879 880
 	 */
880 881
 	private function processPagedSearchStatus($sr, $filter, $base, $iFoundItems, $limit, $offset, $pagedSearchOK, $skipHandling) {
881 882
 		$cookie = null;
@@ -1092,7 +1093,7 @@  discard block
 block discarded – undo
1092 1093
 
1093 1094
 	/**
1094 1095
 	 * @param string $name
1095
-	 * @return bool|mixed|string
1096
+	 * @return string
1096 1097
 	 */
1097 1098
 	public function sanitizeUsername($name) {
1098 1099
 		if($this->connection->ldapIgnoreNamingRules) {
@@ -1116,6 +1117,7 @@  discard block
 block discarded – undo
1116 1117
 	* escapes (user provided) parts for LDAP filter
1117 1118
 	* @param string $input, the provided value
1118 1119
 	* @param bool $allowAsterisk whether in * at the beginning should be preserved
1120
+	* @param string $input
1119 1121
 	* @return string the escaped string
1120 1122
 	*/
1121 1123
 	public function escapeFilterPart($input, $allowAsterisk = false) {
@@ -1675,7 +1677,7 @@  discard block
 block discarded – undo
1675 1677
 
1676 1678
 	/**
1677 1679
 	 * Check whether the most recent paged search was successful. It flushed the state var. Use it always after a possible paged search.
1678
-	 * @return boolean|null true on success, null or false otherwise
1680
+	 * @return boolean true on success, null or false otherwise
1679 1681
 	 */
1680 1682
 	public function getPagedSearchResultState() {
1681 1683
 		$result = $this->pagedSearchedSuccessful;
@@ -1690,7 +1692,7 @@  discard block
 block discarded – undo
1690 1692
 	 * @param string[] $attr optional, when a certain attribute shall be filtered outside
1691 1693
 	 * @param int $limit
1692 1694
 	 * @param int $offset
1693
-	 * @return bool|true
1695
+	 * @return boolean
1694 1696
 	 */
1695 1697
 	private function initPagedSearch($filter, $bases, $attr, $limit, $offset) {
1696 1698
 		$pagedSearchOK = false;
Please login to merge, or discard this patch.