Completed
Pull Request — stable8.2 (#26410)
by Thomas
38:55
created
tests/lib/files/view.php 1 patch
Doc Comments   +16 added lines, -2 removed lines patch added patch discarded remove patch
@@ -415,6 +415,10 @@  discard block
 block discarded – undo
415 415
 		$this->copyBetweenStorages($storage1, $storage2);
416 416
 	}
417 417
 
418
+	/**
419
+	 * @param \OC\Files\Storage\Storage $storage1
420
+	 * @param \OC\Files\Storage\Storage $storage2
421
+	 */
418 422
 	function copyBetweenStorages($storage1, $storage2) {
419 423
 		\OC\Files\Filesystem::mount($storage1, array(), '/');
420 424
 		\OC\Files\Filesystem::mount($storage2, array(), '/substorage');
@@ -461,6 +465,10 @@  discard block
 block discarded – undo
461 465
 		$this->moveBetweenStorages($storage1, $storage2);
462 466
 	}
463 467
 
468
+	/**
469
+	 * @param \OC\Files\Storage\Storage $storage1
470
+	 * @param \OC\Files\Storage\Storage $storage2
471
+	 */
464 472
 	function moveBetweenStorages($storage1, $storage2) {
465 473
 		\OC\Files\Filesystem::mount($storage1, array(), '/');
466 474
 		\OC\Files\Filesystem::mount($storage2, array(), '/substorage');
@@ -895,6 +903,9 @@  discard block
 block discarded – undo
895 903
 		return $this->relativePathProvider(null);
896 904
 	}
897 905
 
906
+	/**
907
+	 * @param string|null $missingRootExpectedPath
908
+	 */
898 909
 	public function relativePathProvider($missingRootExpectedPath) {
899 910
 		return array(
900 911
 			// No root - returns the path
@@ -1095,6 +1106,9 @@  discard block
 block discarded – undo
1095 1106
 		$this->doTestCopyRenameFail('copy');
1096 1107
 	}
1097 1108
 
1109
+	/**
1110
+	 * @param string $operation
1111
+	 */
1098 1112
 	private function doTestCopyRenameFail($operation) {
1099 1113
 		$storage1 = new Temporary(array());
1100 1114
 		/** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Files\Storage\Temporary $storage2 */
@@ -1509,7 +1523,7 @@  discard block
 block discarded – undo
1509 1523
 	/**
1510 1524
 	 * Create test movable mount points
1511 1525
 	 *
1512
-	 * @param array $mountPoints array of mount point locations
1526
+	 * @param string[] $mountPoints array of mount point locations
1513 1527
 	 * @return array array of MountPoint objects
1514 1528
 	 */
1515 1529
 	private function createTestMovableMountPoints($mountPoints) {
@@ -1735,7 +1749,7 @@  discard block
 block discarded – undo
1735 1749
 	 * @param string $lockedPath path of the locked item to check
1736 1750
 	 * @param string $hookType hook type
1737 1751
 	 * @param int $expectedLockBefore expected lock during pre hooks
1738
-	 * @param int $expectedLockduring expected lock during operation
1752
+	 * @param int $expectedLockDuring expected lock during operation
1739 1753
 	 * @param int $expectedLockAfter expected lock during post hooks
1740 1754
 	 * @param int $expectedStrayLock expected lock after returning, should
1741 1755
 	 * be null (unlock) for most operations
Please login to merge, or discard this patch.
tests/lib/helper.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -517,8 +517,8 @@
 block discarded – undo
517 517
 	/**
518 518
 	 * Allows us to test private methods/properties
519 519
 	 *
520
-	 * @param $object
521
-	 * @param $methodName
520
+	 * @param OC\Files\View $object
521
+	 * @param string $methodName
522 522
 	 * @param array $parameters
523 523
 	 * @return mixed
524 524
 	 * @deprecated Please extend \Test\TestCase and use self::invokePrivate() then
Please login to merge, or discard this patch.
tests/lib/preview.php 1 patch
Doc Comments   +13 added lines, -5 removed lines patch added patch discarded remove patch
@@ -626,6 +626,10 @@  discard block
 block discarded – undo
626 626
 		return $postfix;
627 627
 	}
628 628
 
629
+	/**
630
+	 * @param integer $previewWidth
631
+	 * @param integer $previewHeight
632
+	 */
629 633
 	private function getSmallerThanMaxPreview($fileId, $previewWidth, $previewHeight) {
630 634
 		$preview = $this->createPreview($previewWidth, $previewHeight);
631 635
 
@@ -645,6 +649,10 @@  discard block
 block discarded – undo
645 649
 		$this->cachedBigger[] = $preview->isCached($fileId);
646 650
 	}
647 651
 
652
+	/**
653
+	 * @param integer $width
654
+	 * @param integer $height
655
+	 */
648 656
 	private function createThumbnailFromBiggerCachedPreview($fileId, $width, $height) {
649 657
 		$preview = $this->createPreview($width, $height);
650 658
 
@@ -769,7 +777,7 @@  discard block
 block discarded – undo
769 777
 	 * Sets the variables used to define the boundaries which need to be respected when using a
770 778
 	 * specific sample
771 779
 	 *
772
-	 * @param $sampleId
780
+	 * @param integer $sampleId
773 781
 	 */
774 782
 	private function getSample($sampleId) {
775 783
 		// Corrects a rounding difference when using the EPS (Imagick converted) sample
@@ -798,7 +806,7 @@  discard block
 block discarded – undo
798 806
 	 * @param int $sampleWidth
799 807
 	 * @param int $sampleHeight
800 808
 	 *
801
-	 * @return array
809
+	 * @return integer[]
802 810
 	 */
803 811
 	private function setMaxPreview($sampleWidth, $sampleHeight) {
804 812
 		// Max previews are never scaled up
@@ -822,7 +830,7 @@  discard block
 block discarded – undo
822 830
 	 * @param int $askedWidth
823 831
 	 * @param int $askedHeight
824 832
 	 *
825
-	 * @return array
833
+	 * @return integer[]
826 834
 	 */
827 835
 	private function simulatePreviewDimensions($askedWidth, $askedHeight) {
828 836
 		$askedWidth = min($askedWidth, $this->configMaxWidth);
@@ -849,7 +857,7 @@  discard block
 block discarded – undo
849 857
 	 * @param int $askedWidth
850 858
 	 * @param int $askedHeight
851 859
 	 *
852
-	 * @return \int[]
860
+	 * @return integer[]
853 861
 	 */
854 862
 	private function applyAspectRatio($askedWidth, $askedHeight) {
855 863
 		$originalRatio = $this->maxPreviewRatio;
@@ -868,7 +876,7 @@  discard block
 block discarded – undo
868 876
 	 * @param int $askedWidth
869 877
 	 * @param int $askedHeight
870 878
 	 *
871
-	 * @return array
879
+	 * @return integer[]
872 880
 	 */
873 881
 	private function fixSize($askedWidth, $askedHeight) {
874 882
 		if ($this->scalingUp) {
Please login to merge, or discard this patch.
tests/lib/repair/repairlegacystorage.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@
 block discarded – undo
104 104
 	 * Returns the storage id based on the numeric id
105 105
 	 *
106 106
 	 * @param int $storageId numeric id of the storage
107
-	 * @return string storage id or null if not found
107
+	 * @return integer|null storage id or null if not found
108 108
 	 */
109 109
 	private function getStorageId($storageId) {
110 110
 		$numericId = Storage::getNumericStorageId($storageId);
Please login to merge, or discard this patch.
tests/lib/security/certificatemanager.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -38,6 +38,10 @@
 block discarded – undo
38 38
 		parent::tearDown();
39 39
 	}
40 40
 
41
+	/**
42
+	 * @param Certificate[] $expected
43
+	 * @param OCP\ICertificate[] $actual
44
+	 */
41 45
 	protected function assertEqualsArrays($expected, $actual) {
42 46
 		sort($expected);
43 47
 		sort($actual);
Please login to merge, or discard this patch.
tests/lib/share/share.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -926,6 +926,9 @@
 block discarded – undo
926 926
 		$this->assertSame(0, count($result6));
927 927
 	}
928 928
 
929
+	/**
930
+	 * @param string[] $expected
931
+	 */
929 932
 	public function verifyResult($result, $expected) {
930 933
 		foreach ($result as $r) {
931 934
 			if (in_array($r['item_target'], $expected)) {
Please login to merge, or discard this patch.
tests/lib/traits/mountprovidertrait.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -28,6 +28,9 @@
 block discarded – undo
28 28
 
29 29
 	protected $mounts = [];
30 30
 
31
+	/**
32
+	 * @param string $mountPoint
33
+	 */
31 34
 	protected function registerMount($userId, $storage, $mountPoint, $arguments = null) {
32 35
 		if (!isset($this->mounts[$userId])) {
33 36
 			$this->mounts[$userId] = [];
Please login to merge, or discard this patch.
apps/files/tests/helper.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -42,6 +42,9 @@
 block discarded – undo
42 42
 	protected $testId;
43 43
 	protected $preName;
44 44
 
45
+	/**
46
+	 * @param string $name
47
+	 */
45 48
 	public function __construct($name=null){
46 49
 		$this->addType('testId', 'integer');		
47 50
 		$this->name = $name;
Please login to merge, or discard this patch.
apps/files_external/lib/amazons3.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.