Completed
Pull Request — stable8.2 (#23025)
by Morris
12:11
created
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.
lib/private/setup/mysql.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
 	}
71 71
 
72 72
 	/**
73
-	 * @param IDbConnection $connection
73
+	 * @param IDBConnection $connection
74 74
 	 * @throws \OC\DatabaseSetupException
75 75
 	 */
76 76
 	private function createDBUser($connection) {
Please login to merge, or discard this patch.
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.