Completed
Pull Request — stable8.2 (#25305)
by Stephen
11:20
created
lib/private/connector/sabre/file.php 1 patch
Doc Comments   +8 added lines, -2 removed lines patch added patch discarded remove patch
@@ -213,6 +213,9 @@  discard block
 block discarded – undo
213 213
 		return '"' . $this->info->getEtag() . '"';
214 214
 	}
215 215
 
216
+	/**
217
+	 * @param string $path
218
+	 */
216 219
 	private function emitPreHooks($exists, $path = null) {
217 220
 		if (is_null($path)) {
218 221
 			$path = $this->path;
@@ -238,6 +241,9 @@  discard block
 block discarded – undo
238 241
 		return $run;
239 242
 	}
240 243
 
244
+	/**
245
+	 * @param string $path
246
+	 */
241 247
 	private function emitPostHooks($exists, $path = null) {
242 248
 		if (is_null($path)) {
243 249
 			$path = $this->path;
@@ -260,7 +266,7 @@  discard block
 block discarded – undo
260 266
 	/**
261 267
 	 * Returns the data
262 268
 	 *
263
-	 * @return string|resource
269
+	 * @return resource
264 270
 	 * @throws Forbidden
265 271
 	 * @throws ServiceUnavailable
266 272
 	 */
@@ -314,7 +320,7 @@  discard block
 block discarded – undo
314 320
 	 *
315 321
 	 * If null is returned, we'll assume application/octet-stream
316 322
 	 *
317
-	 * @return mixed
323
+	 * @return string
318 324
 	 */
319 325
 	public function getContentType() {
320 326
 		$mimeType = $this->info->getMimetype();
Please login to merge, or discard this patch.
lib/private/connector/sabre/lockplugin.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 	private $tree;
47 47
 
48 48
 	/**
49
-	 * @param \Sabre\DAV\Tree $tree tree
49
+	 * @param ObjectTree $tree tree
50 50
 	 */
51 51
 	public function __construct(Tree $tree) {
52 52
 		$this->tree = $tree;
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,6 @@
 block discarded – undo
30 30
 use Sabre\DAV\ServerPlugin;
31 31
 use Sabre\DAV\Tree;
32 32
 use Sabre\HTTP\RequestInterface;
33
-use Sabre\HTTP\ResponseInterface;
34 33
 
35 34
 class LockPlugin extends ServerPlugin {
36 35
 	/**
Please login to merge, or discard this patch.
lib/private/connector/sabre/node.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 	/**
185 185
 	 * Returns the size of the node, in bytes
186 186
 	 *
187
-	 * @return int|float
187
+	 * @return integer
188 188
 	 */
189 189
 	public function getSize() {
190 190
 		return $this->info->getSize();
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
 	}
214 214
 
215 215
 	/**
216
-	 * @return string|null
216
+	 * @return string
217 217
 	 */
218 218
 	public function getDavPermissions() {
219 219
 		$p = '';
Please login to merge, or discard this patch.
lib/private/connector/sabre/principal.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -168,7 +168,7 @@
 block discarded – undo
168 168
 	 * The principals should be passed as a list of uri's.
169 169
 	 *
170 170
 	 * @param string $principal
171
-	 * @param array $members
171
+	 * @param string[] $members
172 172
 	 * @throws \Sabre\DAV\Exception
173 173
 	 */
174 174
 	public function setGroupMemberSet($principal, array $members) {
Please login to merge, or discard this patch.
lib/private/files/storage/wrapper/encryption.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 	 *
191 191
 	 * @param string $path
192 192
 	 * @param string $data
193
-	 * @return bool
193
+	 * @return integer
194 194
 	 */
195 195
 	public function file_put_contents($path, $data) {
196 196
 		// file put content will always be translated to a stream write
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
769 769
 	/**
770 770
 	 * check if path points to a files version
771 771
 	 *
772
-	 * @param $path
772
+	 * @param string $path
773 773
 	 * @return bool
774 774
 	 */
775 775
 	protected function isVersion($path) {
Please login to merge, or discard this patch.
lib/private/files/view.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 	 * and does not take the chroot into account )
190 190
 	 *
191 191
 	 * @param string $path
192
-	 * @return \OCP\Files\Mount\IMountPoint
192
+	 * @return Mount\MountPoint|null
193 193
 	 */
194 194
 	public function getMount($path) {
195 195
 		return Filesystem::getMountManager()->find($this->getAbsolutePath($path));
@@ -873,7 +873,7 @@  discard block
 block discarded – undo
873 873
 
874 874
 	/**
875 875
 	 * @param string $path
876
-	 * @return bool|string
876
+	 * @return string|false
877 877
 	 * @throws \OCP\Files\InvalidPathException
878 878
 	 */
879 879
 	public function toTmpFile($path) {
@@ -1593,6 +1593,9 @@  discard block
 block discarded – undo
1593 1593
 		return null;
1594 1594
 	}
1595 1595
 
1596
+	/**
1597
+	 * @param string $path
1598
+	 */
1596 1599
 	private function assertPathLength($path) {
1597 1600
 		$maxLen = min(PHP_MAXPATHLEN, 4000);
1598 1601
 		// Check for the string length - performed using isset() instead of strlen()
Please login to merge, or discard this patch.
lib/private/share/mailnotifications.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -174,7 +174,7 @@
 block discarded – undo
174 174
 	 * @param string $filename the shared file
175 175
 	 * @param string $link the public link
176 176
 	 * @param int $expiration expiration date (timestamp)
177
-	 * @return array $result of failed recipients
177
+	 * @return string[] $result of failed recipients
178 178
 	 */
179 179
 	public function sendLinkShareMail($recipient, $filename, $link, $expiration) {
180 180
 		$subject = (string)$this->l->t('%s shared »%s« with you', [$this->senderDisplayName, $filename]);
Please login to merge, or discard this patch.
lib/private/subadmin.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -166,6 +166,11 @@
 block discarded – undo
166 166
 	/*
167 167
 	 * alias for self::isSubAdminofGroup()
168 168
 	 */
169
+
170
+	/**
171
+	 * @param string $subadmin
172
+	 * @param string $group
173
+	 */
169 174
 	public static function isGroupAccessible($subadmin, $group) {
170 175
 		return self::isSubAdminofGroup($subadmin, $group);
171 176
 	}
Please login to merge, or discard this patch.
tests/lib/connector/sabre/file.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,6 +40,9 @@  discard block
 block discarded – undo
40 40
 		parent::tearDown();
41 41
 	}
42 42
 
43
+	/**
44
+	 * @return \OC\Files\Storage\Storage
45
+	 */
43 46
 	private function getMockStorage() {
44 47
 		$storage = $this->getMock('\OCP\Files\Storage');
45 48
 		$storage->expects($this->any())
@@ -243,7 +246,7 @@  discard block
 block discarded – undo
243 246
 	 * @param string $path path to put the file into
244 247
 	 * @param string $viewRoot root to use for the view
245 248
 	 *
246
-	 * @return result of the PUT operaiton which is usually the etag
249
+	 * @return string|null of the PUT operaiton which is usually the etag
247 250
 	 */
248 251
 	private function doPut($path, $viewRoot = null) {
249 252
 		$view = \OC\Files\Filesystem::getView();
Please login to merge, or discard this patch.