From 8756a22c60b1128c02b05149f1d8bd8abb250a5b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 18 Feb 2016 10:50:00 +0100 Subject: [PATCH] Fix more things --- lib/private/group/manager.php | 1 + lib/private/preview.php | 8 ++++---- .../appframework/utility/icontrollermethodreflector.php | 2 +- 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 1f4092ed60..7eca249c70 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 4039109a57..4fca56dd98 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 b2261e6885..7bf422aa56 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 2695d2d612..c8530626e5 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 */