Completed
Pull Request — master (#533)
by Olivier
10:30
created
settings/Controller/CheckSetupController.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -103,6 +103,7 @@  discard block
 block discarded – undo
103 103
 
104 104
 	/**
105 105
 	* Chceks if the ownCloud server can connect to a specific URL using both HTTPS and HTTP
106
+	* @param string $sitename
106 107
 	* @return bool
107 108
 	*/
108 109
 	private function isSiteReachable($sitename) {
@@ -285,7 +286,7 @@  discard block
 block discarded – undo
285 286
 
286 287
 	/**
287 288
 	 * @NoCSRFRequired
288
-	 * @return DataResponse
289
+	 * @return DataDisplayResponse
289 290
 	 */
290 291
 	public function getFailedIntegrityCheckFiles() {
291 292
 		if(!$this->checker->isCodeCheckEnforced()) {
Please login to merge, or discard this patch.
lib/private/URLGenerator.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,6 @@
 block discarded – undo
29 29
  */
30 30
 
31 31
 namespace OC;
32
-use OCP\Defaults;
33 32
 use OCP\ICacheFactory;
34 33
 use OCP\IConfig;
35 34
 use OCP\IURLGenerator;
Please login to merge, or discard this patch.
lib/private/Console/Application.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,6 @@
 block discarded – undo
29 29
  */
30 30
 
31 31
 namespace OC;
32
-use OCP\Defaults;
33 32
 use OCP\ICacheFactory;
34 33
 use OCP\IConfig;
35 34
 use OCP\IURLGenerator;
Please login to merge, or discard this patch.
lib/private/TemplateLayout.php 1 patch
Unused Use Statements   -9 removed lines patch added patch discarded remove patch
@@ -35,15 +35,6 @@
 block discarded – undo
35 35
  */
36 36
 namespace OC;
37 37
 
38
-use Assetic\Asset\AssetCollection;
39
-use Assetic\Asset\FileAsset;
40
-use Assetic\AssetWriter;
41
-use Assetic\Filter\CssImportFilter;
42
-use Assetic\Filter\CssMinFilter;
43
-use Assetic\Filter\CssRewriteFilter;
44
-use Assetic\Filter\JSqueezeFilter;
45
-use Assetic\Filter\SeparatorFilter;
46
-
47 38
 class TemplateLayout extends \OC_Template {
48 39
 
49 40
 	private static $versionHash = '';
Please login to merge, or discard this patch.
core/Controller/LoginController.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,6 @@
 block discarded – undo
22 22
 
23 23
 namespace OC\Core\Controller;
24 24
 
25
-use OC\AppFramework\Utility\TimeFactory;
26 25
 use OC\Authentication\TwoFactorAuth\Manager;
27 26
 use OC\Security\Bruteforce\Throttler;
28 27
 use OC\User\Session;
Please login to merge, or discard this patch.
core/Controller/TokenController.php 1 patch
Unused Use Statements   -3 removed lines patch added patch discarded remove patch
@@ -22,13 +22,10 @@
 block discarded – undo
22 22
 namespace OC\Core\Controller;
23 23
 
24 24
 use OC\AppFramework\Http;
25
-use OC\AppFramework\Utility\TimeFactory;
26
-use OC\Authentication\Token\DefaultTokenProvider;
27 25
 use OC\Authentication\Token\IProvider;
28 26
 use OC\Authentication\Token\IToken;
29 27
 use OC\Authentication\TwoFactorAuth\Manager as TwoFactorAuthManager;
30 28
 use OC\User\Manager as UserManager;
31
-use OCA\User_LDAP\User\Manager;
32 29
 use OCP\AppFramework\Controller;
33 30
 use OCP\AppFramework\Http\JSONResponse;
34 31
 use OCP\IRequest;
Please login to merge, or discard this patch.
apps/federatedfilesharing/lib/RequestHandler.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -567,7 +567,7 @@
 block discarded – undo
567 567
 	/**
568 568
 	 * update permissions in database
569 569
 	 *
570
-	 * @param IShare $share
570
+	 * @param Share\IShare $share
571 571
 	 * @param int $permissions
572 572
 	 */
573 573
 	protected function updatePermissionsInDatabase(IShare $share, $permissions) {
Please login to merge, or discard this patch.
apps/user_ldap/lib/Access.php 1 patch
Doc Comments   +9 added lines, -7 removed lines patch added patch discarded remove patch
@@ -397,7 +397,7 @@  discard block
 block discarded – undo
397 397
 
398 398
 	/**
399 399
 	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
400
-	 * @param string $dn the dn of the user object
400
+	 * @param string $fdn the dn of the user object
401 401
 	 * @param string $ldapName optional, the display name of the object
402 402
 	 * @return string|false with with the name to use in ownCloud
403 403
 	 */
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 
415 415
 	/**
416 416
 	 * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN
417
-	 * @param string $dn the dn of the user object
417
+	 * @param string $fdn the dn of the user object
418 418
 	 * @param string $ldapName optional, the display name of the object
419 419
 	 * @param bool $isUser optional, whether it is a user object (otherwise group assumed)
420 420
 	 * @return string|false with with the name to use in ownCloud
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
 	 * the login filter.
675 675
 	 *
676 676
 	 * @param string $loginName
677
-	 * @param array $attributes optional, list of attributes to read
677
+	 * @param string[] $attributes optional, list of attributes to read
678 678
 	 * @return array
679 679
 	 */
680 680
 	public function fetchUsersByLoginName($loginName, $attributes = array('dn')) {
@@ -747,7 +747,7 @@  discard block
 block discarded – undo
747 747
 
748 748
 	/**
749 749
 	 * @param string $filter
750
-	 * @param string|string[] $attr
750
+	 * @param string[] $attr
751 751
 	 * @param int $limit
752 752
 	 * @param int $offset
753 753
 	 * @return array
@@ -795,7 +795,7 @@  discard block
 block discarded – undo
795 795
 
796 796
 	/**
797 797
 	 * @param string $filter
798
-	 * @param string|string[] $attr
798
+	 * @param string[] $attr
799 799
 	 * @param int $limit
800 800
 	 * @param int $offset
801 801
 	 * @return false|int
@@ -845,6 +845,7 @@  discard block
 block discarded – undo
845 845
 	 * retrieved. Results will according to the order in the array.
846 846
 	 * @param int $limit optional, maximum results to be counted
847 847
 	 * @param int $offset optional, a starting point
848
+	 * @param string $filter
848 849
 	 * @return array|false array with the search result as first value and pagedSearchOK as
849 850
 	 * second | false if not successful
850 851
 	 */
@@ -891,7 +892,7 @@  discard block
 block discarded – undo
891 892
 	 * @param bool $pagedSearchOK whether a paged search has been executed
892 893
 	 * @param bool $skipHandling required for paged search when cookies to
893 894
 	 * prior results need to be gained
894
-	 * @return bool cookie validity, true if we have more pages, false otherwise.
895
+	 * @return null|boolean cookie validity, true if we have more pages, false otherwise.
895 896
 	 */
896 897
 	private function processPagedSearchStatus($sr, $filter, $base, $iFoundItems, $limit, $offset, $pagedSearchOK, $skipHandling) {
897 898
 		$cookie = null;
@@ -1100,7 +1101,7 @@  discard block
 block discarded – undo
1100 1101
 
1101 1102
 	/**
1102 1103
 	 * @param string $name
1103
-	 * @return bool|mixed|string
1104
+	 * @return string
1104 1105
 	 */
1105 1106
 	public function sanitizeUsername($name) {
1106 1107
 		if($this->connection->ldapIgnoreNamingRules) {
@@ -1124,6 +1125,7 @@  discard block
 block discarded – undo
1124 1125
 	* escapes (user provided) parts for LDAP filter
1125 1126
 	* @param string $input, the provided value
1126 1127
 	* @param bool $allowAsterisk whether in * at the beginning should be preserved
1128
+	* @param string $input
1127 1129
 	* @return string the escaped string
1128 1130
 	*/
1129 1131
 	public function escapeFilterPart($input, $allowAsterisk = false) {
Please login to merge, or discard this patch.
apps/user_ldap/lib/Wizard.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1104,7 +1104,7 @@
 block discarded – undo
1104 1104
 	}
1105 1105
 
1106 1106
 	/**
1107
-	 * @param array $reqs
1107
+	 * @param string[] $reqs
1108 1108
 	 * @return bool
1109 1109
 	 */
1110 1110
 	private function checkRequirements($reqs) {
Please login to merge, or discard this patch.