@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | /** |
| 202 | 202 | * returns the max width set in ownCloud's config |
| 203 | 203 | * |
| 204 | - * @return string |
|
| 204 | + * @return integer |
|
| 205 | 205 | */ |
| 206 | 206 | public function getConfigMaxX() { |
| 207 | 207 | return $this->configMaxWidth; |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | /** |
| 211 | 211 | * returns the max height set in ownCloud's config |
| 212 | 212 | * |
| 213 | - * @return string |
|
| 213 | + * @return integer |
|
| 214 | 214 | */ |
| 215 | 215 | public function getConfigMaxY() { |
| 216 | 216 | return $this->configMaxHeight; |
@@ -545,7 +545,7 @@ discard block |
||
| 545 | 545 | /** |
| 546 | 546 | * Determines the size of the preview we should be looking for in the cache |
| 547 | 547 | * |
| 548 | - * @return int[] |
|
| 548 | + * @return integer[] |
|
| 549 | 549 | */ |
| 550 | 550 | private function simulatePreviewDimensions() { |
| 551 | 551 | $askedWidth = $this->getMaxX(); |
@@ -569,7 +569,7 @@ discard block |
||
| 569 | 569 | * |
| 570 | 570 | * @param int $originalWidth |
| 571 | 571 | * @param int $originalHeight |
| 572 | - * @return \int[] |
|
| 572 | + * @return integer[] |
|
| 573 | 573 | */ |
| 574 | 574 | private function applyAspectRatio($askedWidth, $askedHeight, $originalWidth = 0, $originalHeight = 0) { |
| 575 | 575 | if(!$originalWidth){ |
@@ -601,7 +601,7 @@ discard block |
||
| 601 | 601 | * @param int $askedHeight |
| 602 | 602 | * @param int $previewWidth |
| 603 | 603 | * @param int $previewHeight |
| 604 | - * @return \int[] |
|
| 604 | + * @return integer[] |
|
| 605 | 605 | */ |
| 606 | 606 | private function applyCover($askedWidth, $askedHeight, $previewWidth, $previewHeight) { |
| 607 | 607 | $originalRatio = $previewWidth / $previewHeight; |
@@ -627,7 +627,7 @@ discard block |
||
| 627 | 627 | * @param int $askedWidth |
| 628 | 628 | * @param int $askedHeight |
| 629 | 629 | * |
| 630 | - * @return \int[] |
|
| 630 | + * @return integer[] |
|
| 631 | 631 | */ |
| 632 | 632 | private function fixSize($askedWidth, $askedHeight) { |
| 633 | 633 | if ($this->scalingUp) { |
@@ -920,9 +920,9 @@ discard block |
||
| 920 | 920 | * @param int $askedWidth |
| 921 | 921 | * @param int $askedHeight |
| 922 | 922 | * @param int $previewWidth |
| 923 | - * @param null $previewHeight |
|
| 923 | + * @param integer $previewHeight |
|
| 924 | 924 | * |
| 925 | - * @return int[] |
|
| 925 | + * @return double[] |
|
| 926 | 926 | */ |
| 927 | 927 | private function scale($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) { |
| 928 | 928 | $scalingUp = $this->getScalingUp(); |
@@ -970,7 +970,7 @@ discard block |
||
| 970 | 970 | * @param int $askedWidth |
| 971 | 971 | * @param int $askedHeight |
| 972 | 972 | * @param int $previewWidth |
| 973 | - * @param null $previewHeight |
|
| 973 | + * @param double $previewHeight |
|
| 974 | 974 | */ |
| 975 | 975 | private function crop($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight = null) { |
| 976 | 976 | $cropX = floor(abs($askedWidth - $previewWidth) * 0.5); |
@@ -989,7 +989,7 @@ discard block |
||
| 989 | 989 | * @param int $askedWidth |
| 990 | 990 | * @param int $askedHeight |
| 991 | 991 | * @param int $previewWidth |
| 992 | - * @param null $previewHeight |
|
| 992 | + * @param double $previewHeight |
|
| 993 | 993 | */ |
| 994 | 994 | private function cropAndFill($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) { |
| 995 | 995 | if ($previewWidth > $askedWidth) { |
@@ -1217,7 +1217,7 @@ discard block |
||
| 1217 | 1217 | * @param int $maxDim |
| 1218 | 1218 | * @param string $dimName |
| 1219 | 1219 | * |
| 1220 | - * @return mixed |
|
| 1220 | + * @return integer |
|
| 1221 | 1221 | */ |
| 1222 | 1222 | private function limitMaxDim($dim, $maxDim, $dimName) { |
| 1223 | 1223 | if (!is_null($maxDim)) { |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | * Returns expensive repair steps to be run on the |
| 124 | 124 | * command line with a special option. |
| 125 | 125 | * |
| 126 | - * @return array of RepairStep instances |
|
| 126 | + * @return OldGroupMembershipShares[] of RepairStep instances |
|
| 127 | 127 | */ |
| 128 | 128 | public static function getExpensiveRepairSteps() { |
| 129 | 129 | return [ |
@@ -161,6 +161,8 @@ discard block |
||
| 161 | 161 | * {@inheritDoc} |
| 162 | 162 | * |
| 163 | 163 | * Re-declared as public to allow invocation from within the closure above in php 5.3 |
| 164 | + * @param string $scope |
|
| 165 | + * @param string $method |
|
| 164 | 166 | */ |
| 165 | 167 | public function emit($scope, $method, array $arguments = array()) { |
| 166 | 168 | parent::emit($scope, $method, $arguments); |
@@ -856,7 +856,7 @@ |
||
| 856 | 856 | * Get the certificate manager for the user |
| 857 | 857 | * |
| 858 | 858 | * @param string $userId (optional) if not specified the current loggedin user is used |
| 859 | - * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in |
|
| 859 | + * @return null|CertificateManager | null if $uid is null and no user is logged in |
|
| 860 | 860 | */ |
| 861 | 861 | public function getCertificateManager($userId = null) { |
| 862 | 862 | if (is_null($userId)) { |
@@ -153,7 +153,7 @@ |
||
| 153 | 153 | |
| 154 | 154 | /** |
| 155 | 155 | * @param mixed $offset |
| 156 | - * @return mixed |
|
| 156 | + * @return string|null |
|
| 157 | 157 | */ |
| 158 | 158 | public function offsetGet($offset) { |
| 159 | 159 | return $this->get($offset); |
@@ -91,5 +91,8 @@ |
||
| 91 | 91 | $this->tablePrefix = $dbTablePrefix; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | + /** |
|
| 95 | + * @param string $userName |
|
| 96 | + */ |
|
| 94 | 97 | abstract public function setupDatabase($userName); |
| 95 | 98 | } |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | /** |
| 73 | - * @param IDbConnection $connection |
|
| 73 | + * @param IDBConnection $connection |
|
| 74 | 74 | * @throws \OC\DatabaseSetupException |
| 75 | 75 | */ |
| 76 | 76 | private function createDBUser($connection) { |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | * |
| 228 | 228 | * all return: http://localhost |
| 229 | 229 | * |
| 230 | - * @param string $shareWith |
|
| 230 | + * @param string $remote |
|
| 231 | 231 | * @return string |
| 232 | 232 | */ |
| 233 | 233 | protected static function fixRemoteURL($remote) { |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | * split user and remote from federated cloud id |
| 245 | 245 | * |
| 246 | 246 | * @param string $id |
| 247 | - * @return array |
|
| 247 | + * @return string[] |
|
| 248 | 248 | * @throws HintException |
| 249 | 249 | */ |
| 250 | 250 | public static function splitUserRemote($id) { |
@@ -2211,6 +2211,16 @@ |
||
| 2211 | 2211 | return $id ? $id : false; |
| 2212 | 2212 | } |
| 2213 | 2213 | |
| 2214 | + /** |
|
| 2215 | + * @param string $itemType |
|
| 2216 | + * @param string $itemSource |
|
| 2217 | + * @param integer $shareType |
|
| 2218 | + * @param string $shareWith |
|
| 2219 | + * @param string $uidOwner |
|
| 2220 | + * @param integer $permissions |
|
| 2221 | + * @param string|null $itemSourceName |
|
| 2222 | + * @param null|\DateTime $expirationDate |
|
| 2223 | + */ |
|
| 2214 | 2224 | private static function checkReshare($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $itemSourceName, $expirationDate) { |
| 2215 | 2225 | $backend = self::getBackend($itemType); |
| 2216 | 2226 | |
@@ -27,7 +27,6 @@ |
||
| 27 | 27 | use OCP\IUser; |
| 28 | 28 | use OCP\ILogger; |
| 29 | 29 | use OCP\Files\Folder; |
| 30 | - |
|
| 31 | 30 | use OC\Share20\Exception\ShareNotFound; |
| 32 | 31 | |
| 33 | 32 | /** |
@@ -201,7 +201,7 @@ |
||
| 201 | 201 | * Validate if the expiration date fits the system settings |
| 202 | 202 | * |
| 203 | 203 | * @param \DateTime $expireDate The current expiration date (can be null) |
| 204 | - * @return \DateTime|null The expiration date or null if $expireDate was null and it is not required |
|
| 204 | + * @return \DateTime The expiration date or null if $expireDate was null and it is not required |
|
| 205 | 205 | * @throws \OC\HintException |
| 206 | 206 | */ |
| 207 | 207 | protected function validateExpiredate($expireDate) { |