@@ -30,7 +30,6 @@ |
||
| 30 | 30 | * StorageTimeoutException constructor. |
| 31 | 31 | * |
| 32 | 32 | * @param string $message |
| 33 | - * @param int $code |
|
| 34 | 33 | * @param \Exception $previous |
| 35 | 34 | * @since 9.0.0 |
| 36 | 35 | */ |
@@ -37,7 +37,6 @@ |
||
| 37 | 37 | /** |
| 38 | 38 | * RemoveOldCalendarShares constructor. |
| 39 | 39 | * |
| 40 | - * @param IDBConnection $db |
|
| 41 | 40 | */ |
| 42 | 41 | public function __construct(IDBConnection $connection) { |
| 43 | 42 | $this->connection = $connection; |
@@ -26,7 +26,6 @@ discard block |
||
| 26 | 26 | use OCA\DAV\CalDAV\CalDavBackend; |
| 27 | 27 | use OCA\DAV\CardDAV\CardDavBackend; |
| 28 | 28 | use OCA\DAV\CardDAV\ContactsManager; |
| 29 | -use OCA\DAV\CardDAV\SyncJob; |
|
| 30 | 29 | use OCA\DAV\CardDAV\SyncService; |
| 31 | 30 | use OCA\DAV\Connector\Sabre\Principal; |
| 32 | 31 | use OCA\DAV\DAV\GroupPrincipalBackend; |
@@ -36,8 +35,6 @@ discard block |
||
| 36 | 35 | use \OCP\AppFramework\App; |
| 37 | 36 | use OCP\AppFramework\IAppContainer; |
| 38 | 37 | use OCP\Contacts\IManager; |
| 39 | -use OCP\IUser; |
|
| 40 | -use Sabre\VObject\Reader; |
|
| 41 | 38 | use Symfony\Component\EventDispatcher\GenericEvent; |
| 42 | 39 | |
| 43 | 40 | class Application extends App { |
@@ -303,6 +303,7 @@ |
||
| 303 | 303 | * get default share folder |
| 304 | 304 | * |
| 305 | 305 | * @param \OC\Files\View |
| 306 | + * @param View $view |
|
| 306 | 307 | * @return string |
| 307 | 308 | */ |
| 308 | 309 | public static function getShareFolder($view = null) { |
@@ -273,6 +273,10 @@ discard block |
||
| 273 | 273 | return '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/'; |
| 274 | 274 | } |
| 275 | 275 | |
| 276 | + /** |
|
| 277 | + * @param integer $step |
|
| 278 | + * @param integer $max |
|
| 279 | + */ |
|
| 276 | 280 | protected function emit($sql, $step, $max) { |
| 277 | 281 | if ($this->noEmit) { |
| 278 | 282 | return; |
@@ -283,6 +287,10 @@ discard block |
||
| 283 | 287 | $this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step+1, $max])); |
| 284 | 288 | } |
| 285 | 289 | |
| 290 | + /** |
|
| 291 | + * @param integer $step |
|
| 292 | + * @param integer $max |
|
| 293 | + */ |
|
| 286 | 294 | private function emitCheckStep($tableName, $step, $max) { |
| 287 | 295 | if(is_null($this->dispatcher)) { |
| 288 | 296 | return; |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | * @param IRequest $request |
| 301 | 301 | * @throws LoginException |
| 302 | 302 | * @throws PasswordLoginForbiddenException |
| 303 | - * @return boolean |
|
| 303 | + * @return boolean|null |
|
| 304 | 304 | */ |
| 305 | 305 | public function logClientIn($user, $password, IRequest $request) { |
| 306 | 306 | $isTokenPassword = $this->isTokenPassword($password); |
@@ -340,6 +340,9 @@ discard block |
||
| 340 | 340 | return $this->config->getSystemValue('token_auth_enforced', false); |
| 341 | 341 | } |
| 342 | 342 | |
| 343 | + /** |
|
| 344 | + * @param string $username |
|
| 345 | + */ |
|
| 343 | 346 | protected function isTwoFactorEnforced($username) { |
| 344 | 347 | Util::emitHook( |
| 345 | 348 | '\OCA\Files_Sharing\API\Server2Server', |
@@ -103,6 +103,7 @@ discard block |
||
| 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 |
||
| 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()) { |
@@ -29,7 +29,6 @@ |
||
| 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; |
@@ -35,15 +35,6 @@ |
||
| 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 = ''; |