Completed
Pull Request — stable8.2 (#26169)
by Thomas
18:27
created
lib/private/share/helper.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
 	 *
228 228
 	 * all return: http://localhost
229 229
 	 *
230
-	 * @param string $shareWith
230
+	 * @param string $remote
231 231
 	 * @return string
232 232
 	 */
233 233
 	protected static function fixRemoteURL($remote) {
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 	 * split user and remote from federated cloud id
245 245
 	 *
246 246
 	 * @param string $id
247
-	 * @return array
247
+	 * @return string[]
248 248
 	 * @throws HintException
249 249
 	 */
250 250
 	public static function splitUserRemote($id) {
Please login to merge, or discard this patch.
lib/private/share/share.php 1 patch
Doc Comments   +10 added lines patch added patch discarded remove patch
@@ -2211,6 +2211,16 @@
 block discarded – undo
2211 2211
 		return $id ? $id : false;
2212 2212
 	}
2213 2213
 
2214
+	/**
2215
+	 * @param string $itemType
2216
+	 * @param string $itemSource
2217
+	 * @param integer $shareType
2218
+	 * @param string $shareWith
2219
+	 * @param string $uidOwner
2220
+	 * @param integer $permissions
2221
+	 * @param string|null $itemSourceName
2222
+	 * @param null|\DateTime $expirationDate
2223
+	 */
2214 2224
 	private static function checkReshare($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $itemSourceName, $expirationDate) {
2215 2225
 		$backend = self::getBackend($itemType);
2216 2226
 
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
@@ -741,11 +741,19 @@  discard block
 block discarded – undo
741 741
 	}
742 742
 
743 743
 	// case-insensitive array_search
744
+
745
+	/**
746
+	 * @param string $needle
747
+	 */
744 748
 	protected function array_searchi($needle, $haystack, $mem='getName') {
745 749
 		if(!is_array($haystack)) {
746 750
 			return false;
747 751
 		}
748 752
 		return array_search(strtolower($needle), array_map(
753
+
754
+			/**
755
+			 * @param string $tag
756
+			 */
749 757
 			function($tag) use($mem) {
750 758
 				return strtolower(call_user_func(array($tag, $mem)));
751 759
 			}, $haystack)
@@ -770,7 +778,7 @@  discard block
 block discarded – undo
770 778
 	* Get a tag by its name.
771 779
 	*
772 780
 	* @param string $name The tag name.
773
-	* @return integer|bool The tag object's offset within the $this->tags
781
+	* @return \OCP\AppFramework\Db\Entity The tag object's offset within the $this->tags
774 782
 	*                      array or false if it doesn't exist.
775 783
 	*/
776 784
 	private function getTagByName($name) {
@@ -781,7 +789,7 @@  discard block
 block discarded – undo
781 789
 	* Get a tag by its ID.
782 790
 	*
783 791
 	* @param string $id The tag ID to look for.
784
-	* @return integer|bool The tag object's offset within the $this->tags
792
+	* @return \OCP\AppFramework\Db\Entity The tag object's offset within the $this->tags
785 793
 	*                      array or false if it doesn't exist.
786 794
 	*/
787 795
 	private function getTagById($id) {
Please login to merge, or discard this patch.
lib/private/template.php 1 patch
Doc Comments   +8 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,6 +69,10 @@  discard block
 block discarded – undo
69 69
 	
70 70
 	protected static $initTemplateEngineFirstRun = true;
71 71
 	
72
+	/**
73
+	 * @param string $app
74
+	 * @param string $name
75
+	 */
72 76
 	public function __construct( $app, $name, $renderAs = "", $registerCall = true ) {
73 77
 		// Read the selected theme from the config file
74 78
 		self::initTemplateEngine($renderAs);
@@ -91,6 +95,9 @@  discard block
 block discarded – undo
91 95
 		parent::__construct($template, $requesttoken, $l10n, $themeDefaults);
92 96
 	}
93 97
 
98
+	/**
99
+	 * @param string $renderAs
100
+	 */
94 101
 	public static function initTemplateEngine($renderAs) {
95 102
 		if (self::$initTemplateEngineFirstRun){
96 103
 			
@@ -173,7 +180,7 @@  discard block
 block discarded – undo
173 180
 	 * Checking all the possible locations.
174 181
 	 * @param string $theme
175 182
 	 * @param string $app
176
-	 * @return array
183
+	 * @return string[]
177 184
 	 */
178 185
 	protected function findTemplate($theme, $app, $name) {
179 186
 		// Check if it is a app template or not.
Please login to merge, or discard this patch.
lib/private/template/base.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,6 +36,7 @@  discard block
 block discarded – undo
36 36
 	 * @param string $template
37 37
 	 * @param \OC_L10N $l10n
38 38
 	 * @param \OC_Defaults $theme
39
+	 * @param string $requesttoken
39 40
 	 */
40 41
 	public function __construct( $template, $requesttoken, $l10n, $theme ) {
41 42
 		$this->vars = array();
@@ -95,7 +96,7 @@  discard block
 block discarded – undo
95 96
 	/**
96 97
 	 * Appends a variable
97 98
 	 * @param string $key key
98
-	 * @param mixed $value value
99
+	 * @param string $value value
99 100
 	 * @return boolean|null
100 101
 	 *
101 102
 	 * This function assigns a variable in an array context. If the key already
Please login to merge, or discard this patch.
lib/private/template/functions.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 /**
40 40
  * Prints an unsanitized string - usage of this function may result into XSS.
41 41
  * Consider using p() instead.
42
- * @param string|array $string the string which will be printed as it is
42
+ * @param string $string the string which will be printed as it is
43 43
  */
44 44
 function print_unescaped($string) {
45 45
 	print($string);
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
  * make preview_icon available as a simple function
185 185
  * Returns the path to the preview of the image.
186 186
  * @param string $path path of file
187
- * @return link to the preview
187
+ * @return string to the preview
188 188
  *
189 189
  * For further information have a look at OC_Helper::previewIcon
190 190
  */
@@ -194,6 +194,7 @@  discard block
 block discarded – undo
194 194
 
195 195
 /**
196 196
  * @param string $path
197
+ * @param string $token
197 198
  */
198 199
 function publicPreview_icon ( $path, $token ) {
199 200
 	return OC_Helper::publicPreviewIcon( $path, $token );
Please login to merge, or discard this patch.
lib/private/updater.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -277,7 +277,7 @@
 block discarded – undo
277 277
 	 * @param string $installedVersion previous version from which to upgrade from
278 278
 	 *
279 279
 	 * @throws \Exception
280
-	 * @return bool true if the operation succeeded, false otherwise
280
+	 * @return boolean|null true if the operation succeeded, false otherwise
281 281
 	 */
282 282
 	private function doUpgrade($currentVersion, $installedVersion) {
283 283
 		// Stop update if the update is over several major versions
Please login to merge, or discard this patch.
lib/private/user.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -336,7 +336,7 @@
 block discarded – undo
336 336
 	 * Sets user display name for session
337 337
 	 *
338 338
 	 * @param string $uid
339
-	 * @param null $displayName
339
+	 * @param string $displayName
340 340
 	 * @return bool Whether the display name could get set
341 341
 	 */
342 342
 	public static function setDisplayName($uid, $displayName = null) {
Please login to merge, or discard this patch.
lib/private/user/manager.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
 
85 85
 	/**
86 86
 	 * Get the active backends
87
-	 * @return \OCP\UserInterface[]
87
+	 * @return \OCP\UserInterface
88 88
 	 */
89 89
 	public function getBackends() {
90 90
 		return $this->backends;
Please login to merge, or discard this patch.