@@ -33,6 +33,11 @@ |
||
| 33 | 33 | |
| 34 | 34 | |
| 35 | 35 | class TestController extends Controller { |
| 36 | + |
|
| 37 | + /** |
|
| 38 | + * @param string $appName |
|
| 39 | + * @param Request $request |
|
| 40 | + */ |
|
| 36 | 41 | public function __construct($appName, $request) { |
| 37 | 42 | parent::__construct($appName, $request); |
| 38 | 43 | } |
@@ -11,7 +11,6 @@ |
||
| 11 | 11 | |
| 12 | 12 | use OC\Files\FileInfo; |
| 13 | 13 | use OC_Connector_Sabre_Directory; |
| 14 | -use PHPUnit_Framework_TestCase; |
|
| 15 | 14 | |
| 16 | 15 | class TestDoubleFileView extends \OC\Files\View { |
| 17 | 16 | |
@@ -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 | /** |
@@ -338,6 +338,10 @@ discard block |
||
| 338 | 338 | $this->copyBetweenStorages($storage1, $storage2); |
| 339 | 339 | } |
| 340 | 340 | |
| 341 | + /** |
|
| 342 | + * @param \OC\Files\Storage\Storage $storage1 |
|
| 343 | + * @param \OC\Files\Storage\Storage $storage2 |
|
| 344 | + */ |
|
| 341 | 345 | function copyBetweenStorages($storage1, $storage2) { |
| 342 | 346 | \OC\Files\Filesystem::mount($storage1, array(), '/'); |
| 343 | 347 | \OC\Files\Filesystem::mount($storage2, array(), '/substorage'); |
@@ -384,6 +388,10 @@ discard block |
||
| 384 | 388 | $this->moveBetweenStorages($storage1, $storage2); |
| 385 | 389 | } |
| 386 | 390 | |
| 391 | + /** |
|
| 392 | + * @param \OC\Files\Storage\Storage $storage1 |
|
| 393 | + * @param \OC\Files\Storage\Storage $storage2 |
|
| 394 | + */ |
|
| 387 | 395 | function moveBetweenStorages($storage1, $storage2) { |
| 388 | 396 | \OC\Files\Filesystem::mount($storage1, array(), '/'); |
| 389 | 397 | \OC\Files\Filesystem::mount($storage2, array(), '/substorage'); |
@@ -944,6 +952,9 @@ discard block |
||
| 944 | 952 | $this->doTestCopyRenameFail('copy'); |
| 945 | 953 | } |
| 946 | 954 | |
| 955 | + /** |
|
| 956 | + * @param string $operation |
|
| 957 | + */ |
|
| 947 | 958 | private function doTestCopyRenameFail($operation) { |
| 948 | 959 | $storage1 = new Temporary(array()); |
| 949 | 960 | /** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Files\Storage\Temporary $storage2 */ |
@@ -505,7 +505,7 @@ |
||
| 505 | 505 | * Allows us to test private methods/properties |
| 506 | 506 | * |
| 507 | 507 | * @param $object |
| 508 | - * @param $methodName |
|
| 508 | + * @param string $methodName |
|
| 509 | 509 | * @param array $parameters |
| 510 | 510 | * @return mixed |
| 511 | 511 | */ |
@@ -86,8 +86,8 @@ |
||
| 86 | 86 | /** |
| 87 | 87 | * Returns the storage id based on the numeric id |
| 88 | 88 | * |
| 89 | - * @param int $numericId numeric id of the storage |
|
| 90 | - * @return string storage id or null if not found |
|
| 89 | + * @param string $storageId |
|
| 90 | + * @return integer|null storage id or null if not found |
|
| 91 | 91 | */ |
| 92 | 92 | private function getStorageId($storageId) { |
| 93 | 93 | $numericId = \OC\Files\Cache\Storage::getNumericStorageId($storageId); |