Completed
Pull Request — stable8.2 (#23025)
by Morris
12:11
created
lib/private/group/dummy.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
 	 * Removes a user from a group
107 107
 	 * @param string $uid Name of the user to remove from group
108 108
 	 * @param string $gid Name of the group from which remove the user
109
-	 * @return bool
109
+	 * @return null|false
110 110
 	 *
111 111
 	 * removes the user from a group.
112 112
 	 */
Please login to merge, or discard this patch.
lib/private/group/manager.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -144,6 +144,9 @@
 block discarded – undo
144 144
 		return $this->getGroupObject($gid);
145 145
 	}
146 146
 
147
+	/**
148
+	 * @param string $gid
149
+	 */
147 150
 	protected function getGroupObject($gid) {
148 151
 		$backends = array();
149 152
 		foreach ($this->backends as $backend) {
Please login to merge, or discard this patch.
lib/private/helper.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -197,6 +197,9 @@  discard block
 block discarded – undo
197 197
 		return self::linkToRoute( 'core_ajax_preview', array('x' => 32, 'y' => 32, 'file' => $path ));
198 198
 	}
199 199
 
200
+	/**
201
+	 * @param string $path
202
+	 */
200 203
 	public static function publicPreviewIcon( $path, $token ) {
201 204
 		return self::linkToRoute( 'core_ajax_public_preview', array('x' => 32, 'y' => 32, 'file' => $path, 't' => $token));
202 205
 	}
@@ -827,7 +830,7 @@  discard block
 block discarded – undo
827 830
 	 *
828 831
 	 * @param string $path
829 832
 	 * @param \OCP\Files\FileInfo $rootInfo (optional)
830
-	 * @return array
833
+	 * @return string
831 834
 	 * @throws \OCP\Files\NotFoundException
832 835
 	 */
833 836
 	public static function getStorageInfo($path, $rootInfo = null) {
Please login to merge, or discard this patch.
lib/private/image.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
 	}
300 300
 
301 301
 	/**
302
-	 * @return resource Returns the image resource in any.
302
+	 * @return boolean Returns the image resource in any.
303 303
 	 */
304 304
 	public function resource() {
305 305
 		return $this->resource;
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
474 474
 	 * It is the responsibility of the caller to position the pointer at the correct place and to close the handle again.
475 475
 	 *
476 476
 	 * @param resource $handle
477
-	 * @return resource|false An image resource or false on error
477
+	 * @return boolean An image resource or false on error
478 478
 	 */
479 479
 	public function loadFromFileHandle($handle) {
480 480
 		$contents = stream_get_contents($handle);
@@ -1023,6 +1023,7 @@  discard block
 block discarded – undo
1023 1023
 	 * @param string $fileName [optional] <p>The path to save the file to.</p>
1024 1024
 	 * @param int $bit [optional] <p>Bit depth, (default is 24).</p>
1025 1025
 	 * @param int $compression [optional]
1026
+	 * @param boolean $im
1026 1027
 	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
1027 1028
 	 */
1028 1029
 	function imagebmp($im, $fileName = '', $bit = 24, $compression = 0) {
Please login to merge, or discard this patch.
lib/private/l10n.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 	}
136 136
 
137 137
 	/**
138
-	 * @param $transFile
138
+	 * @param string $transFile
139 139
 	 * @param bool $mergeTranslations
140 140
 	 * @return bool
141 141
 	 */
@@ -517,6 +517,9 @@  discard block
 block discarded – undo
517 517
 		return Punic\Calendar::getFirstWeekday($locale);
518 518
 	}
519 519
 
520
+	/**
521
+	 * @param string $locale
522
+	 */
520 523
 	private function transformToCLDRLocale($locale) {
521 524
 		if ($locale === 'sr@latin') {
522 525
 			return 'sr_latn';
Please login to merge, or discard this patch.
lib/private/mail/message.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	/**
96 96
 	 * Set the Reply-To address of this message
97 97
 	 *
98
-	 * @param array $addresses
98
+	 * @param string[] $addresses
99 99
 	 * @return $this
100 100
 	 */
101 101
 	public function setReplyTo(array $addresses) {
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 	/**
162 162
 	 * Set the BCC recipients of this message.
163 163
 	 *
164
-	 * @param array $recipients Example: array('[email protected]', '[email protected]' => 'A name')
164
+	 * @param string[] $recipients Example: array('[email protected]', '[email protected]' => 'A name')
165 165
 	 * @return $this
166 166
 	 */
167 167
 	public function setBcc(array $recipients) {
Please login to merge, or discard this patch.
lib/private/memcache/factory.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -172,7 +172,7 @@
 block discarded – undo
172 172
 	/**
173 173
 	 * @see \OC\Memcache\Factory::createLocal()
174 174
 	 * @param string $prefix
175
-	 * @return \OC\Memcache\Cache|null
175
+	 * @return Cache
176 176
 	 */
177 177
 	public function createLowLatency($prefix = '') {
178 178
 		return $this->createLocal($prefix);
Please login to merge, or discard this patch.
lib/private/preview.php 1 patch
Doc Comments   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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)) {
Please login to merge, or discard this patch.
lib/private/repair.php 1 patch
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.