@@ -428,7 +428,7 @@ |
||
| 428 | 428 | * |
| 429 | 429 | * @param string $path source path |
| 430 | 430 | * @param string $destination destination path |
| 431 | - * @return bool|void false to stop handling, void to skip this handler |
|
| 431 | + * @return null|false false to stop handling, void to skip this handler |
|
| 432 | 432 | */ |
| 433 | 433 | public function beforeMoveFutureFile($path, $destination) { |
| 434 | 434 | $sourceNode = $this->tree->getNodeForPath($path); |
@@ -66,7 +66,7 @@ |
||
| 66 | 66 | /** |
| 67 | 67 | * Search for files by mimetype |
| 68 | 68 | * @param string $mimetype |
| 69 | - * @return array |
|
| 69 | + * @return \OC\Files\FileInfo[] |
|
| 70 | 70 | * @since 6.0.0 |
| 71 | 71 | */ |
| 72 | 72 | static public function searchByMime( $mimetype ) { |
@@ -313,6 +313,7 @@ discard block |
||
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | /** |
| 316 | + * @param string $version |
|
| 316 | 317 | * @return string |
| 317 | 318 | */ |
| 318 | 319 | private function getClass($version) { |
@@ -349,7 +350,7 @@ discard block |
||
| 349 | 350 | |
| 350 | 351 | /** |
| 351 | 352 | * @param string $version |
| 352 | - * @return mixed |
|
| 353 | + * @return \Doctrine\DBAL\Schema\Schema |
|
| 353 | 354 | * @throws \Exception |
| 354 | 355 | */ |
| 355 | 356 | protected function createInstance($version) { |
@@ -125,6 +125,7 @@ discard block |
||
| 125 | 125 | * |
| 126 | 126 | * @param IOutput $output |
| 127 | 127 | * @param string[] $appList |
| 128 | + * @param string $event |
|
| 128 | 129 | * @return array |
| 129 | 130 | * @throws AppManagerException |
| 130 | 131 | */ |
@@ -160,7 +161,7 @@ discard block |
||
| 160 | 161 | /** |
| 161 | 162 | * Get app list separated as compatible/incompatible/missing |
| 162 | 163 | * |
| 163 | - * @return array |
|
| 164 | + * @return IOutput |
|
| 164 | 165 | */ |
| 165 | 166 | protected function getAppsToUpgrade() { |
| 166 | 167 | $installedApps = $this->appManager->getInstalledApps(); |
@@ -49,6 +49,10 @@ |
||
| 49 | 49 | ); |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | + /** |
|
| 53 | + * @param string $principal |
|
| 54 | + * @param boolean $toV2 |
|
| 55 | + */ |
|
| 52 | 56 | private function convertPrincipal($principal, $toV2) { |
| 53 | 57 | list(, $name) = URLUtil::splitPath($principal); |
| 54 | 58 | if ($toV2) { |
@@ -267,6 +267,9 @@ discard block |
||
| 267 | 267 | return array_values($calendars); |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | + /** |
|
| 271 | + * @param string $principalUri |
|
| 272 | + */ |
|
| 270 | 273 | public function getUsersOwnCalendars($principalUri) { |
| 271 | 274 | $principalUri = $this->convertPrincipal($principalUri, true); |
| 272 | 275 | $fields = array_values($this->propertyMap); |
@@ -1262,7 +1265,7 @@ discard block |
||
| 1262 | 1265 | * @param string $principalUri |
| 1263 | 1266 | * @param string $uri |
| 1264 | 1267 | * @param array $properties |
| 1265 | - * @return mixed |
|
| 1268 | + * @return integer |
|
| 1266 | 1269 | */ |
| 1267 | 1270 | function createSubscription($principalUri, $uri, array $properties) { |
| 1268 | 1271 | |
@@ -1665,6 +1668,9 @@ discard block |
||
| 1665 | 1668 | return $this->sharingBackend->applyShareAcl($resourceId, $acl); |
| 1666 | 1669 | } |
| 1667 | 1670 | |
| 1671 | + /** |
|
| 1672 | + * @param boolean $toV2 |
|
| 1673 | + */ |
|
| 1668 | 1674 | private function convertPrincipal($principalUri, $toV2 = null) { |
| 1669 | 1675 | if ($this->principalBackend->getPrincipalPrefix() === 'principals') { |
| 1670 | 1676 | list(, $name) = URLUtil::splitPath($principalUri); |
@@ -214,7 +214,8 @@ discard block |
||
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | /** |
| 217 | - * @param $addressBookUri |
|
| 217 | + * @param string $addressBookUri |
|
| 218 | + * @param string $principal |
|
| 218 | 219 | * @return array|null |
| 219 | 220 | */ |
| 220 | 221 | public function getAddressBooksByUri($principal, $addressBookUri) { |
@@ -896,6 +897,7 @@ discard block |
||
| 896 | 897 | * * readOnly - boolean |
| 897 | 898 | * * summary - Optional, a description for the share |
| 898 | 899 | * |
| 900 | + * @param integer $addressBookId |
|
| 899 | 901 | * @return array |
| 900 | 902 | */ |
| 901 | 903 | public function getShares($addressBookId) { |
@@ -949,7 +951,7 @@ discard block |
||
| 949 | 951 | * read vCard data into a vCard object |
| 950 | 952 | * |
| 951 | 953 | * @param string $cardData |
| 952 | - * @return VCard |
|
| 954 | + * @return \Sabre\VObject\Parser\Sabre\VObject\Document|null |
|
| 953 | 955 | */ |
| 954 | 956 | protected function readCard($cardData) { |
| 955 | 957 | return Reader::read($cardData); |
@@ -995,7 +997,7 @@ discard block |
||
| 995 | 997 | |
| 996 | 998 | /** |
| 997 | 999 | * For shared address books the sharee is set in the ACL of the address book |
| 998 | - * @param $addressBookId |
|
| 1000 | + * @param integer $addressBookId |
|
| 999 | 1001 | * @param $acl |
| 1000 | 1002 | * @return array |
| 1001 | 1003 | */ |
@@ -1003,6 +1005,9 @@ discard block |
||
| 1003 | 1005 | return $this->sharingBackend->applyShareAcl($addressBookId, $acl); |
| 1004 | 1006 | } |
| 1005 | 1007 | |
| 1008 | + /** |
|
| 1009 | + * @param boolean $toV2 |
|
| 1010 | + */ |
|
| 1006 | 1011 | private function convertPrincipal($principalUri, $toV2 = null) { |
| 1007 | 1012 | if ($this->principalBackend->getPrincipalPrefix() === 'principals') { |
| 1008 | 1013 | list(, $name) = URLUtil::splitPath($principalUri); |
@@ -1,12 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace OC\Migrations; |
| 3 | 3 | |
| 4 | -use OC\User\Account; |
|
| 5 | 4 | use OC\User\AccountMapper; |
| 6 | 5 | use OC\User\AccountTermMapper; |
| 7 | 6 | use OC\User\Database; |
| 8 | 7 | use OC\User\SyncService; |
| 9 | -use OCP\IConfig; |
|
| 10 | 8 | use OCP\Migration\ISimpleMigration; |
| 11 | 9 | use OCP\Migration\IOutput; |
| 12 | 10 | |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | /** |
| 123 | 123 | * List all installed apps |
| 124 | 124 | * |
| 125 | - * @return string[] |
|
| 125 | + * @return integer[] |
|
| 126 | 126 | */ |
| 127 | 127 | public function getInstalledApps() { |
| 128 | 128 | return array_keys($this->getInstalledAppsValues()); |
@@ -355,6 +355,9 @@ discard block |
||
| 355 | 355 | return in_array($appId, $this->shippedApps); |
| 356 | 356 | } |
| 357 | 357 | |
| 358 | + /** |
|
| 359 | + * @param string $appId |
|
| 360 | + */ |
|
| 358 | 361 | private function isAlwaysEnabled($appId) { |
| 359 | 362 | $alwaysEnabled = $this->getAlwaysEnabledApps(); |
| 360 | 363 | return in_array($appId, $alwaysEnabled); |
@@ -383,7 +386,7 @@ discard block |
||
| 383 | 386 | /** |
| 384 | 387 | * @param string $package package path |
| 385 | 388 | * @param bool $skipMigrations whether to skip migrations, which would only install the code |
| 386 | - * @return string|false app id or false in case of error |
|
| 389 | + * @return integer app id or false in case of error |
|
| 387 | 390 | * @since 10.0 |
| 388 | 391 | */ |
| 389 | 392 | public function installApp($package, $skipMigrations = false) { |
@@ -400,7 +403,7 @@ discard block |
||
| 400 | 403 | |
| 401 | 404 | /** |
| 402 | 405 | * @param string $package |
| 403 | - * @return mixed |
|
| 406 | + * @return boolean |
|
| 404 | 407 | * @since 10.0 |
| 405 | 408 | */ |
| 406 | 409 | public function updateApp($package) { |