Completed
Pull Request — stable9 (#4226)
by Lukas
11:11
created
lib/public/util.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -544,7 +544,7 @@
 block discarded – undo
544 544
 	 * @param array $input The array to work on
545 545
 	 * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
546 546
 	 * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
547
-	 * @return array
547
+	 * @return string
548 548
 	 * @since 4.5.0
549 549
 	 */
550 550
 	public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') {
Please login to merge, or discard this patch.
resources/updater-fixes/apps/encryption/lib/crypto/encryption.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -369,7 +369,7 @@
 block discarded – undo
369 369
 	 * @param string $path path to the file which should be updated
370 370
 	 * @param string $uid of the user who performs the operation
371 371
 	 * @param array $accessList who has access to the file contains the key 'users' and 'public'
372
-	 * @return boolean
372
+	 * @return null|boolean
373 373
 	 */
374 374
 	public function update($path, $uid, array $accessList) {
375 375
 
Please login to merge, or discard this patch.
resources/updater-fixes/sabre/dav/lib/CalDAV/Plugin.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
     /**
106 106
      * Returns a list of features for the DAV: HTTP header.
107 107
      *
108
-     * @return array
108
+     * @return string[]
109 109
      */
110 110
     function getFeatures() {
111 111
 
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
      *
223 223
      * @param string $reportName
224 224
      * @param mixed $report
225
-     * @return bool
225
+     * @return false|null
226 226
      */
227 227
     function report($reportName, $report) {
228 228
 
@@ -778,7 +778,7 @@  discard block
 block discarded – undo
778 778
      *
779 779
      * An exception is thrown if it's not.
780 780
      *
781
-     * @param resource|string $data
781
+     * @param resource $data
782 782
      * @param string $path
783 783
      * @param bool $modified Should be set to true, if this event handler
784 784
      *                       changed &$data.
@@ -911,7 +911,7 @@  discard block
 block discarded – undo
911 911
      *
912 912
      * @param DAV\INode $node
913 913
      * @param string $output
914
-     * @return bool
914
+     * @return null|false
915 915
      */
916 916
     function htmlActionsPanel(DAV\INode $node, &$output) {
917 917
 
Please login to merge, or discard this patch.
resources/updater-fixes/sabre/dav/lib/DAV/CorePlugin.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
      *
72 72
      * @param RequestInterface $request
73 73
      * @param ResponseInterface $response
74
-     * @return bool
74
+     * @return null|false
75 75
      */
76 76
     function httpGet(RequestInterface $request, ResponseInterface $response) {
77 77
 
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
      *
276 276
      * @param RequestInterface $request
277 277
      * @param ResponseInterface $response
278
-     * @return void
278
+     * @return boolean
279 279
      */
280 280
     function httpDelete(RequestInterface $request, ResponseInterface $response) {
281 281
 
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
      *
309 309
      * @param RequestInterface $request
310 310
      * @param ResponseInterface $response
311
-     * @return void
311
+     * @return boolean
312 312
      */
313 313
     function httpPropFind(RequestInterface $request, ResponseInterface $response) {
314 314
 
Please login to merge, or discard this patch.
settings/controller/appsettingscontroller.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@
 block discarded – undo
98 98
 	}
99 99
 
100 100
 	/**
101
-	 * @param string|int $category
101
+	 * @param string $category
102 102
 	 * @return int
103 103
 	 */
104 104
 	protected function getCategory($category) {
Please login to merge, or discard this patch.
settings/controller/certificatecontroller.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	 *
72 72
 	 * @NoAdminRequired
73 73
 	 * @NoSubadminRequired
74
-	 * @return array
74
+	 * @return DataResponse
75 75
 	 */
76 76
 	public function addPersonalRootCertificate() {
77 77
 		return $this->addCertificate($this->userCertificateManager);
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 * Add a new root certificate to a trust store
82 82
 	 *
83 83
 	 * @param ICertificateManager $certificateManager
84
-	 * @return array
84
+	 * @return DataResponse
85 85
 	 */
86 86
 	private function addCertificate(ICertificateManager $certificateManager) {
87 87
 		$headers = [];
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 	/**
160 160
 	 * Add a new personal root certificate to the system's trust store
161 161
 	 *
162
-	 * @return array
162
+	 * @return DataResponse
163 163
 	 */
164 164
 	public function addSystemRootCertificate() {
165 165
 		return $this->addCertificate($this->systemCertificateManager);
Please login to merge, or discard this patch.
settings/controller/checksetupcontroller.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -268,7 +268,7 @@
 block discarded – undo
268 268
 
269 269
 	/**
270 270
 	 * @NoCSRFRequired
271
-	 * @return DataResponse
271
+	 * @return DataDisplayResponse
272 272
 	 */
273 273
 	public function getFailedIntegrityCheckFiles() {
274 274
 		if(!$this->checker->isCodeCheckEnforced()) {
Please login to merge, or discard this patch.
apps/files_sharing/lib/helper.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -303,6 +303,7 @@
 block discarded – undo
303 303
 	 * get default share folder
304 304
 	 *
305 305
 	 * @param \OC\Files\View
306
+	 * @param View $view
306 307
 	 * @return string
307 308
 	 */
308 309
 	public static function getShareFolder($view = null) {
Please login to merge, or discard this patch.
lib/private/files/filesystem.php 1 patch
Doc Comments   +28 added lines, -2 removed lines patch added patch discarded remove patch
@@ -338,6 +338,9 @@  discard block
 block discarded – undo
338 338
 		}
339 339
 	}
340 340
 
341
+	/**
342
+	 * @param string $root
343
+	 */
341 344
 	static public function init($user, $root) {
342 345
 		if (self::$defaultInstance) {
343 346
 			return false;
@@ -521,7 +524,7 @@  discard block
 block discarded – undo
521 524
 	/**
522 525
 	 * mount an \OC\Files\Storage\Storage in our virtual filesystem
523 526
 	 *
524
-	 * @param \OC\Files\Storage\Storage|string $class
527
+	 * @param string $class
525 528
 	 * @param array $arguments
526 529
 	 * @param string $mountpoint
527 530
 	 */
@@ -653,6 +656,9 @@  discard block
 block discarded – undo
653 656
 		return self::$defaultInstance->is_dir($path);
654 657
 	}
655 658
 
659
+	/**
660
+	 * @param string $path
661
+	 */
656 662
 	static public function is_file($path) {
657 663
 		return self::$defaultInstance->is_file($path);
658 664
 	}
@@ -665,6 +671,9 @@  discard block
 block discarded – undo
665 671
 		return self::$defaultInstance->filetype($path);
666 672
 	}
667 673
 
674
+	/**
675
+	 * @param string $path
676
+	 */
668 677
 	static public function filesize($path) {
669 678
 		return self::$defaultInstance->filesize($path);
670 679
 	}
@@ -677,6 +686,9 @@  discard block
 block discarded – undo
677 686
 		return self::$defaultInstance->isCreatable($path);
678 687
 	}
679 688
 
689
+	/**
690
+	 * @param string $path
691
+	 */
680 692
 	static public function isReadable($path) {
681 693
 		return self::$defaultInstance->isReadable($path);
682 694
 	}
@@ -689,6 +701,9 @@  discard block
 block discarded – undo
689 701
 		return self::$defaultInstance->isDeletable($path);
690 702
 	}
691 703
 
704
+	/**
705
+	 * @param string $path
706
+	 */
692 707
 	static public function isSharable($path) {
693 708
 		return self::$defaultInstance->isSharable($path);
694 709
 	}
@@ -706,6 +721,7 @@  discard block
 block discarded – undo
706 721
 	}
707 722
 
708 723
 	/**
724
+	 * @param string $path
709 725
 	 * @return string
710 726
 	 */
711 727
 	static public function file_get_contents($path) {
@@ -728,6 +744,10 @@  discard block
 block discarded – undo
728 744
 		return self::$defaultInstance->copy($path1, $path2);
729 745
 	}
730 746
 
747
+	/**
748
+	 * @param string $path
749
+	 * @param string $mode
750
+	 */
731 751
 	static public function fopen($path, $mode) {
732 752
 		return self::$defaultInstance->fopen($path, $mode);
733 753
 	}
@@ -743,6 +763,9 @@  discard block
 block discarded – undo
743 763
 		return self::$defaultInstance->fromTmpFile($tmpFile, $path);
744 764
 	}
745 765
 
766
+	/**
767
+	 * @param string $path
768
+	 */
746 769
 	static public function getMimeType($path) {
747 770
 		return self::$defaultInstance->getMimeType($path);
748 771
 	}
@@ -755,6 +778,9 @@  discard block
 block discarded – undo
755 778
 		return self::$defaultInstance->free_space($path);
756 779
 	}
757 780
 
781
+	/**
782
+	 * @param string $query
783
+	 */
758 784
 	static public function search($query) {
759 785
 		return self::$defaultInstance->search($query);
760 786
 	}
@@ -868,7 +894,7 @@  discard block
 block discarded – undo
868 894
 	 * @param string $path
869 895
 	 * @param boolean $includeMountPoints whether to add mountpoint sizes,
870 896
 	 * defaults to true
871
-	 * @return \OC\Files\FileInfo|bool False if file does not exist
897
+	 * @return \OCP\Files\FileInfo|null False if file does not exist
872 898
 	 */
873 899
 	public static function getFileInfo($path, $includeMountPoints = true) {
874 900
 		return self::$defaultInstance->getFileInfo($path, $includeMountPoints);
Please login to merge, or discard this patch.