Completed
Pull Request — stable8.2 (#26410)
by Thomas
38:55
created
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/memcached.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@
 block discarded – undo
120 120
 	 * Set a value in the cache if it's not already stored
121 121
 	 *
122 122
 	 * @param string $key
123
-	 * @param mixed $value
123
+	 * @param integer $value
124 124
 	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
125 125
 	 * @return bool
126 126
 	 */
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.
lib/private/route/router.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -127,6 +127,7 @@
 block discarded – undo
127 127
 
128 128
 	/**
129 129
 	 * loads the api routes
130
+	 * @param string $app
130 131
 	 * @return void
131 132
 	 */
132 133
 	public function loadRoutes($app = null) {
Please login to merge, or discard this patch.
lib/private/server.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -856,7 +856,7 @@
 block discarded – undo
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)) {
Please login to merge, or discard this patch.
lib/private/session/cryptosessiondata.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -153,7 +153,7 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.
lib/private/session/cryptowrapper.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,6 @@
 block discarded – undo
23 23
 
24 24
 namespace OC\Session;
25 25
 
26
-use OCP\AppFramework\Utility\ITimeFactory;
27 26
 use OCP\IConfig;
28 27
 use OCP\IRequest;
29 28
 use OCP\ISession;
Please login to merge, or discard this patch.
lib/private/setup/abstractdatabase.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -91,5 +91,8 @@
 block discarded – undo
91 91
 		$this->tablePrefix = $dbTablePrefix;
92 92
 	}
93 93
 
94
+	/**
95
+	 * @param string $userName
96
+	 */
94 97
 	abstract public function setupDatabase($userName);
95 98
 }
Please login to merge, or discard this patch.