Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
This commit is contained in:
Scrutinizer Auto-Fixer 2015-12-07 20:08:20 +00:00
parent b15d77c934
commit 0f1be1b601
7 changed files with 46 additions and 10 deletions

View File

@ -48,6 +48,11 @@ class SharedMount extends MountPoint implements MoveableMount {
*/
private $user;
/**
* @param string $storage
* @param string $mountpoint
* @param \OCP\Files\Storage\IStorageFactory $loader
*/
public function __construct($storage, $mountpoint, $arguments = null, $loader = null) {
$this->user = $arguments['user'];
$this->recipientView = new View('/' . $this->user . '/files');

View File

@ -88,6 +88,10 @@ class ShareesTest extends TestCase {
);
}
/**
* @param string $uid
* @param string $displayName
*/
protected function getUserMock($uid, $displayName) {
$user = $this->getMockBuilder('OCP\IUser')
->disableOriginalConstructor()
@ -104,6 +108,9 @@ class ShareesTest extends TestCase {
return $user;
}
/**
* @param string $gid
*/
protected function getGroupMock($gid) {
$group = $this->getMockBuilder('OCP\IGroup')
->disableOriginalConstructor()

View File

@ -220,6 +220,10 @@ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase {
}
/**
* @param OC\Files\FileInfo[] $content
* @param string[] $expected
*/
public function verifyDirContent($content, $expected) {
foreach ($content as $c) {
if (!in_array($c['name'], $expected)) {

View File

@ -147,7 +147,7 @@ class Trashbin {
*
* @param string $sourcePath
* @param string $owner
* @param $targetPath
* @param string $targetPath
* @param $user
* @param integer $timestamp
*/
@ -410,7 +410,7 @@ class Trashbin {
* @param string $uniqueFilename new file name to restore the file without overwriting existing files
* @param string $location location if file
* @param int $timestamp deletion time
* @return bool
* @return false|null
*/
private static function restoreVersions(\OC\Files\View $view, $file, $filename, $uniqueFilename, $location, $timestamp) {
@ -500,9 +500,10 @@ class Trashbin {
/**
* @param \OC\Files\View $view
* @param $file
* @param $filename
* @param $timestamp
* @param string $file
* @param string $filename
* @param integer|null $timestamp
* @param string $user
* @return int
*/
private static function deleteVersions(\OC\Files\View $view, $file, $filename, $timestamp, $user) {
@ -684,7 +685,7 @@ class Trashbin {
*
* @param array $files list of files sorted by mtime
* @param string $user
* @return array size of deleted files and number of deleted files
* @return integer[] size of deleted files and number of deleted files
*/
public static function deleteExpiredFiles($files, $user) {
$application = new Application();

View File

@ -248,8 +248,8 @@ class Test_Trashbin extends \Test\TestCase {
/**
* verify that the array contains the expected results
* @param array $result
* @param array $expected
* @param OCP\Files\FileInfo[] $result
* @param string[] $expected
*/
private function verifyArray($result, $expected) {
$this->assertSame(count($expected), count($result));
@ -268,6 +268,11 @@ class Test_Trashbin extends \Test\TestCase {
}
}
/**
* @param OCP\Files\FileInfo[] $files
* @param string $trashRoot
* @param integer $expireDate
*/
private function manipulateDeleteTime($files, $trashRoot, $expireDate) {
$counter = 0;
foreach ($files as &$file) {
@ -627,7 +632,6 @@ class Test_Trashbin extends \Test\TestCase {
/**
* @param string $user
* @param bool $create
* @param bool $password
*/
public static function loginHelper($user, $create = false) {
if ($create) {
@ -650,11 +654,20 @@ class Test_Trashbin extends \Test\TestCase {
// just a dummy class to make protected methods available for testing
class TrashbinForTesting extends Files_Trashbin\Trashbin {
/**
* @param OCP\Files\FileInfo[] $files
* @param integer $limit
*/
public function dummyDeleteExpiredFiles($files, $limit) {
// dummy value for $retention_obligation because it is not needed here
return parent::deleteExpiredFiles($files, \Test_Trashbin::TEST_TRASHBIN_USER1, $limit, 0);
}
/**
* @param OCP\Files\FileInfo[] $files
* @param integer $availableSpace
*/
public function dummyDeleteFiles($files, $availableSpace) {
return parent::deleteFiles($files, \Test_Trashbin::TEST_TRASHBIN_USER1, $availableSpace);
}

View File

@ -649,7 +649,7 @@ class Storage {
/**
* Expire versions which exceed the quota
*
* @param $filename
* @param string $filename
* @param int|null $versionsSize
* @param int $offset
* @return bool|int|null

View File

@ -58,6 +58,9 @@ class GroupsTest extends \Test\TestCase {
);
}
/**
* @param string $gid
*/
private function createGroup($gid) {
$group = $this->getMock('OCP\IGroup');
$group
@ -66,6 +69,9 @@ class GroupsTest extends \Test\TestCase {
return $group;
}
/**
* @param string $uid
*/
private function createUser($uid) {
$user = $this->getMock('OCP\IUser');
$user