@@ -27,7 +27,6 @@ |
||
| 27 | 27 | use OCP\IUser; |
| 28 | 28 | use OCP\ILogger; |
| 29 | 29 | use OCP\Files\Folder; |
| 30 | - |
|
| 31 | 30 | use OC\Share20\Exception\ShareNotFound; |
| 32 | 31 | |
| 33 | 32 | /** |
@@ -398,6 +398,10 @@ discard block |
||
| 398 | 398 | $this->copyBetweenStorages($storage1, $storage2); |
| 399 | 399 | } |
| 400 | 400 | |
| 401 | + /** |
|
| 402 | + * @param \OC\Files\Storage\Storage $storage1 |
|
| 403 | + * @param \OC\Files\Storage\Storage $storage2 |
|
| 404 | + */ |
|
| 401 | 405 | function copyBetweenStorages($storage1, $storage2) { |
| 402 | 406 | \OC\Files\Filesystem::mount($storage1, array(), '/'); |
| 403 | 407 | \OC\Files\Filesystem::mount($storage2, array(), '/substorage'); |
@@ -444,6 +448,10 @@ discard block |
||
| 444 | 448 | $this->moveBetweenStorages($storage1, $storage2); |
| 445 | 449 | } |
| 446 | 450 | |
| 451 | + /** |
|
| 452 | + * @param \OC\Files\Storage\Storage $storage1 |
|
| 453 | + * @param \OC\Files\Storage\Storage $storage2 |
|
| 454 | + */ |
|
| 447 | 455 | function moveBetweenStorages($storage1, $storage2) { |
| 448 | 456 | \OC\Files\Filesystem::mount($storage1, array(), '/'); |
| 449 | 457 | \OC\Files\Filesystem::mount($storage2, array(), '/substorage'); |
@@ -1004,6 +1012,9 @@ discard block |
||
| 1004 | 1012 | $this->doTestCopyRenameFail('copy'); |
| 1005 | 1013 | } |
| 1006 | 1014 | |
| 1015 | + /** |
|
| 1016 | + * @param string $operation |
|
| 1017 | + */ |
|
| 1007 | 1018 | private function doTestCopyRenameFail($operation) { |
| 1008 | 1019 | $storage1 = new Temporary(array()); |
| 1009 | 1020 | /** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Files\Storage\Temporary $storage2 */ |
@@ -1417,7 +1428,7 @@ discard block |
||
| 1417 | 1428 | /** |
| 1418 | 1429 | * Create test movable mount points |
| 1419 | 1430 | * |
| 1420 | - * @param array $mountPoints array of mount point locations |
|
| 1431 | + * @param string[] $mountPoints array of mount point locations |
|
| 1421 | 1432 | * @return array array of MountPoint objects |
| 1422 | 1433 | */ |
| 1423 | 1434 | private function createTestMovableMountPoints($mountPoints) { |
@@ -1641,7 +1652,7 @@ discard block |
||
| 1641 | 1652 | * @param string $lockedPath path of the locked item to check |
| 1642 | 1653 | * @param string $hookType hook type |
| 1643 | 1654 | * @param int $expectedLockBefore expected lock during pre hooks |
| 1644 | - * @param int $expectedLockduring expected lock during operation |
|
| 1655 | + * @param int $expectedLockDuring expected lock during operation |
|
| 1645 | 1656 | * @param int $expectedLockAfter expected lock during post hooks |
| 1646 | 1657 | * @param int $expectedStrayLock expected lock after returning, should |
| 1647 | 1658 | * be null (unlock) for most operations |
@@ -160,8 +160,8 @@ |
||
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
| 163 | - * @param $tableName |
|
| 164 | - * @param $idName |
|
| 163 | + * @param string $tableName |
|
| 164 | + * @param string $idName |
|
| 165 | 165 | * @return int |
| 166 | 166 | */ |
| 167 | 167 | protected function getLastInsertID($tableName, $idName) { |