Completed
Pull Request — master (#24840)
by Joas
40:01
created
lib/private/Repair/Collation.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
 	}
68 68
 
69 69
 	/**
70
-	 * @param \Doctrine\DBAL\Connection $connection
70
+	 * @param \OC\DB\Connection $connection
71 71
 	 * @return string[]
72 72
 	 */
73 73
 	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/AppFramework/Http.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@
 block discarded – undo
110 110
 
111 111
 	/**
112 112
 	 * Gets the correct header
113
-	 * @param Http::CONSTANT $status the constant from the Http class
113
+	 * @param integer $status the constant from the Http class
114 114
 	 * @param \DateTime $lastModified formatted last modified date
115 115
 	 * @param string $ETag the etag
116 116
 	 * @return string
Please login to merge, or discard this patch.
lib/private/AppFramework/Utility/ControllerMethodReflector.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
 
47 47
 
48 48
 	/**
49
-	 * @param object $object an object or classname
49
+	 * @param \OCP\AppFramework\Controller $object an object or classname
50 50
 	 * @param string $method the method which we want to inspect
51 51
 	 */
52 52
 	public function reflect($object, $method){
Please login to merge, or discard this patch.
lib/private/Encryption/Util.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,6 @@
 block discarded – undo
30 30
 use OC\Files\Filesystem;
31 31
 use OC\Files\View;
32 32
 use OCP\Encryption\IEncryptionModule;
33
-use OCP\Files\Storage;
34 33
 use OCP\IConfig;
35 34
 
36 35
 class Util {
Please login to merge, or discard this patch.
lib/private/Files/Cache/Cache.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -144,6 +144,9 @@
 block discarded – undo
144 144
 		return true;
145 145
 	}
146 146
 
147
+	/**
148
+	 * @param string $path
149
+	 */
147 150
 	public function url_stat($path) {
148 151
 		if (isset(self::$data[$path])) {
149 152
 			$size = strlen(self::$data[$path]);
Please login to merge, or discard this patch.
lib/private/Files/Cache/Wrapper/CacheJail.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 
68 68
 	/**
69 69
 	 * @param array $entry
70
-	 * @return array
70
+	 * @return string
71 71
 	 */
72 72
 	protected function formatCacheEntry($entry) {
73 73
 		if (isset($entry['path'])) {
@@ -185,6 +185,9 @@  discard block
 block discarded – undo
185 185
 		return $this->cache->getStatus($this->getSourcePath($file));
186 186
 	}
187 187
 
188
+	/**
189
+	 * @param \OCP\Files\Cache\ICacheEntry[] $results
190
+	 */
188 191
 	private function formatSearchResults($results) {
189 192
 		$results = array_filter($results, array($this, 'filterCacheEntry'));
190 193
 		$results = array_values($results);
@@ -263,7 +266,7 @@  discard block
 block discarded – undo
263 266
 	 * use the one with the highest id gives the best result with the background scanner, since that is most
264 267
 	 * likely the folder where we stopped scanning previously
265 268
 	 *
266
-	 * @return string|bool the path of the folder or false when no folder matched
269
+	 * @return boolean the path of the folder or false when no folder matched
267 270
 	 */
268 271
 	public function getIncomplete() {
269 272
 		// not supported
Please login to merge, or discard this patch.
lib/private/Files/Config/UserMountCache.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -206,7 +206,7 @@
 block discarded – undo
206 206
 	}
207 207
 
208 208
 	/**
209
-	 * @param $fileId
209
+	 * @param integer $fileId
210 210
 	 * @return array
211 211
 	 * @throws \OCP\Files\NotFoundException
212 212
 	 */
Please login to merge, or discard this patch.
Unused Use Statements   -3 removed lines patch added patch discarded remove patch
@@ -21,14 +21,11 @@
 block discarded – undo
21 21
 
22 22
 namespace OC\Files\Config;
23 23
 
24
-use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
25
-use OC\Files\Filesystem;
26 24
 use OCP\DB\QueryBuilder\IQueryBuilder;
27 25
 use OCP\Files\Config\ICachedMountInfo;
28 26
 use OCP\Files\Config\IUserMountCache;
29 27
 use OCP\Files\Mount\IMountPoint;
30 28
 use OCP\Files\NotFoundException;
31
-use OCP\ICache;
32 29
 use OCP\IDBConnection;
33 30
 use OCP\ILogger;
34 31
 use OCP\IUser;
Please login to merge, or discard this patch.
lib/private/Files/Filesystem.php 2 patches
Doc Comments   +29 added lines, -2 removed lines patch added patch discarded remove patch
@@ -337,6 +337,9 @@  discard block
 block discarded – undo
337 337
 		}
338 338
 	}
339 339
 
340
+	/**
341
+	 * @param string $root
342
+	 */
340 343
 	static public function init($user, $root) {
341 344
 		if (self::$defaultInstance) {
342 345
 			return false;
@@ -517,7 +520,7 @@  discard block
 block discarded – undo
517 520
 	/**
518 521
 	 * mount an \OC\Files\Storage\Storage in our virtual filesystem
519 522
 	 *
520
-	 * @param \OC\Files\Storage\Storage|string $class
523
+	 * @param string $class
521 524
 	 * @param array $arguments
522 525
 	 * @param string $mountpoint
523 526
 	 */
@@ -628,6 +631,7 @@  discard block
 block discarded – undo
628 631
 
629 632
 	/**
630 633
 	 * following functions are equivalent to their php builtin equivalents for arguments/return values.
634
+	 * @param string $path
631 635
 	 */
632 636
 	static public function mkdir($path) {
633 637
 		return self::$defaultInstance->mkdir($path);
@@ -649,6 +653,9 @@  discard block
 block discarded – undo
649 653
 		return self::$defaultInstance->is_dir($path);
650 654
 	}
651 655
 
656
+	/**
657
+	 * @param string $path
658
+	 */
652 659
 	static public function is_file($path) {
653 660
 		return self::$defaultInstance->is_file($path);
654 661
 	}
@@ -661,6 +668,9 @@  discard block
 block discarded – undo
661 668
 		return self::$defaultInstance->filetype($path);
662 669
 	}
663 670
 
671
+	/**
672
+	 * @param string $path
673
+	 */
664 674
 	static public function filesize($path) {
665 675
 		return self::$defaultInstance->filesize($path);
666 676
 	}
@@ -673,6 +683,9 @@  discard block
 block discarded – undo
673 683
 		return self::$defaultInstance->isCreatable($path);
674 684
 	}
675 685
 
686
+	/**
687
+	 * @param string $path
688
+	 */
676 689
 	static public function isReadable($path) {
677 690
 		return self::$defaultInstance->isReadable($path);
678 691
 	}
@@ -685,6 +698,9 @@  discard block
 block discarded – undo
685 698
 		return self::$defaultInstance->isDeletable($path);
686 699
 	}
687 700
 
701
+	/**
702
+	 * @param string $path
703
+	 */
688 704
 	static public function isSharable($path) {
689 705
 		return self::$defaultInstance->isSharable($path);
690 706
 	}
@@ -702,6 +718,7 @@  discard block
 block discarded – undo
702 718
 	}
703 719
 
704 720
 	/**
721
+	 * @param string $path
705 722
 	 * @return string
706 723
 	 */
707 724
 	static public function file_get_contents($path) {
@@ -724,6 +741,10 @@  discard block
 block discarded – undo
724 741
 		return self::$defaultInstance->copy($path1, $path2);
725 742
 	}
726 743
 
744
+	/**
745
+	 * @param string $path
746
+	 * @param string $mode
747
+	 */
727 748
 	static public function fopen($path, $mode) {
728 749
 		return self::$defaultInstance->fopen($path, $mode);
729 750
 	}
@@ -739,6 +760,9 @@  discard block
 block discarded – undo
739 760
 		return self::$defaultInstance->fromTmpFile($tmpFile, $path);
740 761
 	}
741 762
 
763
+	/**
764
+	 * @param string $path
765
+	 */
742 766
 	static public function getMimeType($path) {
743 767
 		return self::$defaultInstance->getMimeType($path);
744 768
 	}
@@ -751,6 +775,9 @@  discard block
 block discarded – undo
751 775
 		return self::$defaultInstance->free_space($path);
752 776
 	}
753 777
 
778
+	/**
779
+	 * @param string $query
780
+	 */
754 781
 	static public function search($query) {
755 782
 		return self::$defaultInstance->search($query);
756 783
 	}
@@ -860,7 +887,7 @@  discard block
 block discarded – undo
860 887
 	 * @param string $path
861 888
 	 * @param boolean $includeMountPoints whether to add mountpoint sizes,
862 889
 	 * defaults to true
863
-	 * @return \OC\Files\FileInfo|bool False if file does not exist
890
+	 * @return \OCP\Files\FileInfo|null False if file does not exist
864 891
 	 */
865 892
 	public static function getFileInfo($path, $includeMountPoints = true) {
866 893
 		return self::$defaultInstance->getFileInfo($path, $includeMountPoints);
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,6 @@
 block discarded – undo
62 62
 use OC\Files\Mount\MountPoint;
63 63
 use OC\Files\Storage\StorageFactory;
64 64
 use OCP\Files\Config\IMountProvider;
65
-use OCP\Files\Mount\IMountPoint;
66 65
 use OCP\Files\NotFoundException;
67 66
 use OCP\IUserManager;
68 67
 
Please login to merge, or discard this patch.