diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2016-02-18 10:50:00 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <rullzer@owncloud.com> | 2016-02-19 09:43:11 +0100 |
| commit | 8756a22c60b1128c02b05149f1d8bd8abb250a5b (patch) | |
| tree | 1827bdb5ea5751a2e4a6325c7783edb94b4d6d19 | |
| parent | 8e3667887396629caeeda2f3727dfb41391e7484 (diff) | |
| download | nextcloud-server-8756a22c60b1128c02b05149f1d8bd8abb250a5b.tar.gz nextcloud-server-8756a22c60b1128c02b05149f1d8bd8abb250a5b.zip | |
Fix more things
| -rw-r--r-- | lib/private/group/manager.php | 1 | ||||
| -rw-r--r-- | lib/private/preview.php | 8 | ||||
| -rw-r--r-- | lib/public/appframework/utility/icontrollermethodreflector.php | 2 | ||||
| -rw-r--r-- | lib/public/search/pagedprovider.php | 3 |
4 files changed, 7 insertions, 7 deletions
diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php index 1f4092ed606..7eca249c701 100644 --- a/lib/private/group/manager.php +++ b/lib/private/group/manager.php @@ -152,6 +152,7 @@ class Manager extends PublicEmitter implements IGroupManager { /** * @param string $gid + * @return \OCP\IGroup */ protected function getGroupObject($gid) { $backends = array(); diff --git a/lib/private/preview.php b/lib/private/preview.php index 4039109a570..4fca56dd984 100644 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -921,9 +921,9 @@ class Preview { * @param int $askedWidth * @param int $askedHeight * @param int $previewWidth - * @param integer $previewHeight + * @param int $previewHeight * - * @return double[] + * @return int[] */ private function scale($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) { $scalingUp = $this->getScalingUp(); @@ -971,7 +971,7 @@ class Preview { * @param int $askedWidth * @param int $askedHeight * @param int $previewWidth - * @param double $previewHeight + * @param int $previewHeight */ private function crop($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight = null) { $cropX = floor(abs($askedWidth - $previewWidth) * 0.5); @@ -990,7 +990,7 @@ class Preview { * @param int $askedWidth * @param int $askedHeight * @param int $previewWidth - * @param double $previewHeight + * @param int $previewHeight */ private function cropAndFill($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) { if ($previewWidth > $askedWidth) { diff --git a/lib/public/appframework/utility/icontrollermethodreflector.php b/lib/public/appframework/utility/icontrollermethodreflector.php index b2261e68859..7bf422aa567 100644 --- a/lib/public/appframework/utility/icontrollermethodreflector.php +++ b/lib/public/appframework/utility/icontrollermethodreflector.php @@ -35,8 +35,8 @@ interface IControllerMethodReflector { /** * @param object $object an object or classname * @param string $method the method which we want to inspect - * @since 8.0.0 * @return void + * @since 8.0.0 */ public function reflect($object, $method); diff --git a/lib/public/search/pagedprovider.php b/lib/public/search/pagedprovider.php index 2695d2d6125..c8530626e59 100644 --- a/lib/public/search/pagedprovider.php +++ b/lib/public/search/pagedprovider.php @@ -58,8 +58,7 @@ abstract class PagedProvider extends Provider { * Search for $query * @param string $query * @param int $page pages start at page 1 - * @param int $size, 0 = SIZE_ALL - * @param integer $size + * @param int $size 0 = SIZE_ALL * @return array An array of OCP\Search\Result's * @since 8.0.0 */ |