@@ -22,7 +22,6 @@ |
||
22 | 22 | namespace OCA\Testing\Locking; |
23 | 23 | |
24 | 24 | use OC\Lock\DBLockingProvider; |
25 | -use OC\Lock\MemcacheLockingProvider; |
|
26 | 25 | use OC\User\NoUserException; |
27 | 26 | use OCP\AppFramework\Http; |
28 | 27 | use OCP\Files\NotFoundException; |
@@ -77,7 +77,7 @@ |
||
77 | 77 | } |
78 | 78 | |
79 | 79 | /** |
80 | - * @return int |
|
80 | + * @return string |
|
81 | 81 | */ |
82 | 82 | static private function getRefreshInterval() { |
83 | 83 | //defaults to every hour |
@@ -102,6 +102,9 @@ |
||
102 | 102 | return \OC_App::getAppVersions(); |
103 | 103 | } |
104 | 104 | |
105 | + /** |
|
106 | + * @param string $appId |
|
107 | + */ |
|
105 | 108 | protected function getAppInfo($appId) { |
106 | 109 | return \OC_App::getAppInfo($appId); |
107 | 110 | } |
@@ -74,8 +74,6 @@ |
||
74 | 74 | /** |
75 | 75 | * save the configuration value as provided |
76 | 76 | * @param string $configID |
77 | - * @param string $configKey |
|
78 | - * @param string $configValue |
|
79 | 77 | */ |
80 | 78 | protected function setValue($configID, $key, $value) { |
81 | 79 | $configHolder = new Configuration($configID); |
@@ -77,7 +77,7 @@ |
||
77 | 77 | } |
78 | 78 | |
79 | 79 | /** |
80 | - * @return int |
|
80 | + * @return string |
|
81 | 81 | */ |
82 | 82 | static private function getRefreshInterval() { |
83 | 83 | //defaults to every hour |
@@ -32,7 +32,6 @@ |
||
32 | 32 | use Symfony\Component\Console\Input\InputInterface; |
33 | 33 | use Symfony\Component\Console\Input\InputOption; |
34 | 34 | use Symfony\Component\Console\Output\OutputInterface; |
35 | -use Symfony\Component\EventDispatcher\EventDispatcher; |
|
36 | 35 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
37 | 36 | use Symfony\Component\EventDispatcher\GenericEvent; |
38 | 37 |
@@ -28,7 +28,6 @@ |
||
28 | 28 | use Symfony\Component\Console\Command\Command; |
29 | 29 | use Symfony\Component\Console\Helper\Table; |
30 | 30 | use Symfony\Component\Console\Input\InputInterface; |
31 | -use Symfony\Component\Console\Input\InputOption; |
|
32 | 31 | use Symfony\Component\Console\Output\OutputInterface; |
33 | 32 | |
34 | 33 | class ListCertificates extends Base { |
@@ -146,6 +146,7 @@ discard block |
||
146 | 146 | /** |
147 | 147 | * @param string $userId |
148 | 148 | * @param string $userId |
149 | + * @param string $token |
|
149 | 150 | * @throws \Exception |
150 | 151 | */ |
151 | 152 | private function checkPasswordResetToken($token, $userId) { |
@@ -167,7 +168,7 @@ discard block |
||
167 | 168 | } |
168 | 169 | |
169 | 170 | /** |
170 | - * @param $message |
|
171 | + * @param string $message |
|
171 | 172 | * @param array $additional |
172 | 173 | * @return array |
173 | 174 | */ |
@@ -96,6 +96,10 @@ |
||
96 | 96 | // TODO: dont check/enforce 2FA if a auth token is used |
97 | 97 | } |
98 | 98 | |
99 | + /** |
|
100 | + * @param Controller $controller |
|
101 | + * @param string $methodName |
|
102 | + */ |
|
99 | 103 | private function checkTwoFactor($controller, $methodName) { |
100 | 104 | // If two-factor auth is in progress disallow access to any controllers |
101 | 105 | // defined within "LoginController". |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | /** |
118 | 118 | * List all installed apps |
119 | 119 | * |
120 | - * @return string[] |
|
120 | + * @return integer[] |
|
121 | 121 | */ |
122 | 122 | public function getInstalledApps() { |
123 | 123 | return array_keys($this->getInstalledAppsValues()); |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | /** |
275 | 275 | * Returns a list of apps that need upgrade |
276 | 276 | * |
277 | - * @param array $version ownCloud version as array of version components |
|
277 | + * @param array $ocVersion ownCloud version as array of version components |
|
278 | 278 | * @return array list of app info from apps that need an upgrade |
279 | 279 | * |
280 | 280 | * @internal |
@@ -344,6 +344,9 @@ discard block |
||
344 | 344 | return in_array($appId, $this->shippedApps); |
345 | 345 | } |
346 | 346 | |
347 | + /** |
|
348 | + * @param string $appId |
|
349 | + */ |
|
347 | 350 | private function isAlwaysEnabled($appId) { |
348 | 351 | $alwaysEnabled = $this->getAlwaysEnabledApps(); |
349 | 352 | return in_array($appId, $alwaysEnabled); |