@@ -24,7 +24,6 @@ |
||
| 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 | /** |
@@ -130,7 +130,6 @@ |
||
| 130 | 130 | /** |
| 131 | 131 | * Get $n re-shares from the database |
| 132 | 132 | * |
| 133 | - * @param int $n The max number of shares to fetch |
|
| 134 | 133 | * @return \Doctrine\DBAL\Driver\Statement |
| 135 | 134 | */ |
| 136 | 135 | private function getReShares() { |
@@ -671,7 +671,7 @@ discard block |
||
| 671 | 671 | * if the size limit for the trash bin is reached, we delete the oldest |
| 672 | 672 | * files in the trash bin until we meet the limit again |
| 673 | 673 | * |
| 674 | - * @param array $files |
|
| 674 | + * @param \OCP\Files\FileInfo[] $files |
|
| 675 | 675 | * @param string $user |
| 676 | 676 | * @param int $availableSpace available disc space |
| 677 | 677 | * @return int size of deleted files |
@@ -699,7 +699,7 @@ discard block |
||
| 699 | 699 | /** |
| 700 | 700 | * delete files older then max storage time |
| 701 | 701 | * |
| 702 | - * @param array $files list of files sorted by mtime |
|
| 702 | + * @param \OCP\Files\FileInfo[] $files list of files sorted by mtime |
|
| 703 | 703 | * @param string $user |
| 704 | 704 | * @return integer[] size of deleted files and number of deleted files |
| 705 | 705 | */ |
@@ -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 | |
@@ -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". |