@@ -80,7 +80,7 @@ |
||
| 80 | 80 | * the next element. |
| 81 | 81 | * |
| 82 | 82 | * @param Reader $reader |
| 83 | - * @return mixed |
|
| 83 | + * @return null|TagList |
|
| 84 | 84 | */ |
| 85 | 85 | static function xmlDeserialize(Reader $reader) { |
| 86 | 86 | $tags = []; |
@@ -30,7 +30,6 @@ |
||
| 30 | 30 | |
| 31 | 31 | namespace OC\Share; |
| 32 | 32 | |
| 33 | -use DateTime; |
|
| 34 | 33 | use OCP\IL10N; |
| 35 | 34 | use OCP\IURLGenerator; |
| 36 | 35 | use OCP\IUser; |
@@ -51,7 +51,6 @@ |
||
| 51 | 51 | use OC\App\InfoParser; |
| 52 | 52 | use OC\App\Platform; |
| 53 | 53 | use OC\Installer; |
| 54 | -use OC\OCSClient; |
|
| 55 | 54 | use OC\Repair; |
| 56 | 55 | use OCP\App\ManagerEvent; |
| 57 | 56 | |
@@ -1063,7 +1063,7 @@ discard block |
||
| 1063 | 1063 | * @param string $app |
| 1064 | 1064 | * @param \OCP\IConfig $config |
| 1065 | 1065 | * @param \OCP\IL10N $l |
| 1066 | - * @return bool |
|
| 1066 | + * @return string |
|
| 1067 | 1067 | * |
| 1068 | 1068 | * @throws Exception if app is not compatible with this version of ownCloud |
| 1069 | 1069 | * @throws Exception if no app-name was specified |
@@ -1243,6 +1243,11 @@ discard block |
||
| 1243 | 1243 | } |
| 1244 | 1244 | } |
| 1245 | 1245 | |
| 1246 | + /** |
|
| 1247 | + * @param string $lang |
|
| 1248 | + * |
|
| 1249 | + * @return string |
|
| 1250 | + */ |
|
| 1246 | 1251 | protected static function findBestL10NOption($options, $lang) { |
| 1247 | 1252 | $fallback = $similarLangFallback = $englishFallback = false; |
| 1248 | 1253 | |
@@ -318,6 +318,11 @@ |
||
| 318 | 318 | */ |
| 319 | 319 | // FIXME This method is only public, until OC_L10N does not need it anymore, |
| 320 | 320 | // FIXME This is also the reason, why it is not in the public interface |
| 321 | + |
|
| 322 | + /** |
|
| 323 | + * @param string $app |
|
| 324 | + * @param string $lang |
|
| 325 | + */ |
|
| 321 | 326 | public function getL10nFilesForApp($app, $lang) { |
| 322 | 327 | $languageFiles = []; |
| 323 | 328 | |
@@ -45,7 +45,6 @@ |
||
| 45 | 45 | use OC\App\CodeChecker\CodeChecker; |
| 46 | 46 | use OC\App\CodeChecker\EmptyCheck; |
| 47 | 47 | use OC\App\CodeChecker\PrivateCheck; |
| 48 | -use OC\Archive\Archive; |
|
| 49 | 48 | use OC\Archive\TAR; |
| 50 | 49 | use OC_App; |
| 51 | 50 | use OC_DB; |
@@ -131,7 +131,7 @@ |
||
| 131 | 131 | /** |
| 132 | 132 | * Create the federated share provider |
| 133 | 133 | * |
| 134 | - * @return FederatedShareProvider |
|
| 134 | + * @return null|ShareByMailProvider |
|
| 135 | 135 | */ |
| 136 | 136 | protected function getShareByMailProvider() { |
| 137 | 137 | if ($this->shareByMailProvider === null) { |
@@ -28,7 +28,6 @@ |
||
| 28 | 28 | use OCP\IUserManager; |
| 29 | 29 | use OCP\Util; |
| 30 | 30 | use Symfony\Component\EventDispatcher\EventDispatcher; |
| 31 | -use Symfony\Component\EventDispatcher\GenericEvent; |
|
| 32 | 31 | |
| 33 | 32 | class HookManager { |
| 34 | 33 | |
@@ -110,6 +110,9 @@ |
||
| 110 | 110 | return parent::moveFromCache($sourceCache, $sourcePath, $targetPath); |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | + /** |
|
| 114 | + * @param ICacheEntry $entry |
|
| 115 | + */ |
|
| 113 | 116 | protected function formatCacheEntry($entry) { |
| 114 | 117 | $path = isset($entry['path']) ? $entry['path'] : ''; |
| 115 | 118 | $entry = parent::formatCacheEntry($entry); |
@@ -29,7 +29,6 @@ |
||
| 29 | 29 | |
| 30 | 30 | use OC\Files\Cache\Wrapper\CacheJail; |
| 31 | 31 | use OCP\Files\Cache\ICacheEntry; |
| 32 | -use OCP\Files\Storage\IStorage; |
|
| 33 | 32 | |
| 34 | 33 | /** |
| 35 | 34 | * Metadata cache for shared files |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | * |
| 159 | 159 | * By default this excludes the automatically generated birthday calendar |
| 160 | 160 | * |
| 161 | - * @param $principalUri |
|
| 161 | + * @param string $principalUri |
|
| 162 | 162 | * @param bool $excludeBirthday |
| 163 | 163 | * @return int |
| 164 | 164 | */ |
@@ -304,6 +304,9 @@ discard block |
||
| 304 | 304 | return array_values($calendars); |
| 305 | 305 | } |
| 306 | 306 | |
| 307 | + /** |
|
| 308 | + * @param string $principalUri |
|
| 309 | + */ |
|
| 307 | 310 | public function getUsersOwnCalendars($principalUri) { |
| 308 | 311 | $principalUri = $this->convertPrincipal($principalUri, true); |
| 309 | 312 | $fields = array_values($this->propertyMap); |
@@ -878,7 +881,7 @@ discard block |
||
| 878 | 881 | * calendar-data. If the result of a subsequent GET to this object is not |
| 879 | 882 | * the exact same as this request body, you should omit the ETag. |
| 880 | 883 | * |
| 881 | - * @param mixed $calendarId |
|
| 884 | + * @param integer $calendarId |
|
| 882 | 885 | * @param string $objectUri |
| 883 | 886 | * @param string $calendarData |
| 884 | 887 | * @return string |
@@ -1370,7 +1373,7 @@ discard block |
||
| 1370 | 1373 | * @param string $principalUri |
| 1371 | 1374 | * @param string $uri |
| 1372 | 1375 | * @param array $properties |
| 1373 | - * @return mixed |
|
| 1376 | + * @return integer |
|
| 1374 | 1377 | */ |
| 1375 | 1378 | function createSubscription($principalUri, $uri, array $properties) { |
| 1376 | 1379 | |
@@ -1783,6 +1786,9 @@ discard block |
||
| 1783 | 1786 | return $this->sharingBackend->applyShareAcl($resourceId, $acl); |
| 1784 | 1787 | } |
| 1785 | 1788 | |
| 1789 | + /** |
|
| 1790 | + * @param boolean $toV2 |
|
| 1791 | + */ |
|
| 1786 | 1792 | private function convertPrincipal($principalUri, $toV2) { |
| 1787 | 1793 | if ($this->principalBackend->getPrincipalPrefix() === 'principals') { |
| 1788 | 1794 | list(, $name) = URLUtil::splitPath($principalUri); |