@@ -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); |
@@ -1183,7 +1183,7 @@ discard block |
||
1183 | 1183 | /** |
1184 | 1184 | * Checks if a secure random number generator is available |
1185 | 1185 | * |
1186 | - * @return true |
|
1186 | + * @return boolean |
|
1187 | 1187 | * @deprecated Function will be removed in the future and does only return true. |
1188 | 1188 | */ |
1189 | 1189 | public static function secureRNGAvailable() { |
@@ -1286,7 +1286,7 @@ discard block |
||
1286 | 1286 | * Normalize a unicode string |
1287 | 1287 | * |
1288 | 1288 | * @param string $value a not normalized string |
1289 | - * @return bool|string |
|
1289 | + * @return string |
|
1290 | 1290 | */ |
1291 | 1291 | public static function normalizeUnicode($value) { |
1292 | 1292 | if(Normalizer::isNormalized($value)) { |
@@ -1382,7 +1382,7 @@ discard block |
||
1382 | 1382 | /** |
1383 | 1383 | * Check if PhpCharset config is UTF-8 |
1384 | 1384 | * |
1385 | - * @return string |
|
1385 | + * @return boolean |
|
1386 | 1386 | */ |
1387 | 1387 | public static function isPhpCharSetUtf8() { |
1388 | 1388 | return strtoupper(ini_get('default_charset')) === 'UTF-8'; |
@@ -10,8 +10,6 @@ |
||
10 | 10 | |
11 | 11 | |
12 | 12 | use OC\Files\FileInfo; |
13 | -use OC\Files\Storage\Temporary; |
|
14 | -use PHPUnit_Framework_TestCase; |
|
15 | 13 | |
16 | 14 | class TestDoubleFileView extends \OC\Files\View { |
17 | 15 |