Completed
Pull Request — stable10 (#6492)
by Morris
11:41
created
lib/private/Preview.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -923,7 +923,7 @@
 block discarded – undo
923 923
 	 * @param int $previewWidth
924 924
 	 * @param int $previewHeight
925 925
 	 *
926
-	 * @return int[]
926
+	 * @return double[]
927 927
 	 */
928 928
 	private function scale($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) {
929 929
 		$scalingUp = $this->getScalingUp();
Please login to merge, or discard this patch.
lib/private/Repair.php 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 	 * Returns expensive repair steps to be run on the
140 140
 	 * command line with a special option.
141 141
 	 *
142
-	 * @return IRepairStep[]
142
+	 * @return OldGroupMembershipShares[]
143 143
 	 */
144 144
 	public static function getExpensiveRepairSteps() {
145 145
 		return [
@@ -216,7 +216,6 @@  discard block
 block discarded – undo
216 216
 	}
217 217
 
218 218
 	/**
219
-	 * @param int $max
220 219
 	 */
221 220
 	public function finishProgress() {
222 221
 		// for now just emit as we did in the past
Please login to merge, or discard this patch.
lib/private/Repair/Collation.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
 	}
70 70
 
71 71
 	/**
72
-	 * @param \Doctrine\DBAL\Connection $connection
72
+	 * @param \OC\DB\Connection $connection
73 73
 	 * @return string[]
74 74
 	 */
75 75
 	protected function getAllNonUTF8BinTables($connection) {
Please login to merge, or discard this patch.
lib/private/Repair/InnoDB.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
 	}
54 54
 
55 55
 	/**
56
-	 * @param \Doctrine\DBAL\Connection $connection
56
+	 * @param \OCP\IDBConnection $connection
57 57
 	 * @return string[]
58 58
 	 */
59 59
 	private function getAllMyIsamTables($connection) {
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
@@ -1074,7 +1074,7 @@
 block discarded – undo
1074 1074
 	 * Get the certificate manager for the user
1075 1075
 	 *
1076 1076
 	 * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
1077
-	 * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
1077
+	 * @return null|CertificateManager | null if $uid is null and no user is logged in
1078 1078
 	 */
1079 1079
 	public function getCertificateManager($userId = '') {
1080 1080
 		if ($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
@@ -176,7 +176,7 @@
 block discarded – undo
176 176
 
177 177
 	/**
178 178
 	 * @param mixed $offset
179
-	 * @return mixed
179
+	 * @return string|null
180 180
 	 */
181 181
 	public function offsetGet($offset) {
182 182
 		return $this->get($offset);
Please login to merge, or discard this patch.
lib/private/Tags.php 1 patch
Doc Comments   +10 added lines, -2 removed lines patch added patch discarded remove patch
@@ -742,11 +742,19 @@  discard block
 block discarded – undo
742 742
 	}
743 743
 
744 744
 	// case-insensitive array_search
745
+
746
+	/**
747
+	 * @param string $needle
748
+	 */
745 749
 	protected function array_searchi($needle, $haystack, $mem='getName') {
746 750
 		if(!is_array($haystack)) {
747 751
 			return false;
748 752
 		}
749 753
 		return array_search(strtolower($needle), array_map(
754
+
755
+			/**
756
+			 * @param string $tag
757
+			 */
750 758
 			function($tag) use($mem) {
751 759
 				return strtolower(call_user_func(array($tag, $mem)));
752 760
 			}, $haystack)
@@ -771,7 +779,7 @@  discard block
 block discarded – undo
771 779
 	* Get a tag by its name.
772 780
 	*
773 781
 	* @param string $name The tag name.
774
-	* @return integer|bool The tag object's offset within the $this->tags
782
+	* @return \OCP\AppFramework\Db\Entity The tag object's offset within the $this->tags
775 783
 	*                      array or false if it doesn't exist.
776 784
 	*/
777 785
 	private function getTagByName($name) {
@@ -782,7 +790,7 @@  discard block
 block discarded – undo
782 790
 	* Get a tag by its ID.
783 791
 	*
784 792
 	* @param string $id The tag ID to look for.
785
-	* @return integer|bool The tag object's offset within the $this->tags
793
+	* @return \OCP\AppFramework\Db\Entity The tag object's offset within the $this->tags
786 794
 	*                      array or false if it doesn't exist.
787 795
 	*/
788 796
 	private function getTagById($id) {
Please login to merge, or discard this patch.
lib/private/Template/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -103,7 +103,7 @@
 block discarded – undo
103 103
 	/**
104 104
 	 * Appends a variable
105 105
 	 * @param string $key key
106
-	 * @param mixed $value value
106
+	 * @param string $value value
107 107
 	 * @return boolean|null
108 108
 	 *
109 109
 	 * This function assigns a variable in an array context. If the key already
Please login to merge, or discard this patch.
lib/public/App/ManagerEvent.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 	 * DispatcherEvent constructor.
47 47
 	 *
48 48
 	 * @param string $event
49
-	 * @param $appID
49
+	 * @param string $appID
50 50
 	 * @param \OCP\IGroup[] $groups
51 51
 	 * @since 9.0.0
52 52
 	 */
Please login to merge, or discard this patch.