diff options
Diffstat (limited to 'apps/files_sharing/tests')
-rw-r--r-- | apps/files_sharing/tests/ApiTest.php | 3 | ||||
-rw-r--r-- | apps/files_sharing/tests/CacheTest.php | 12 | ||||
-rw-r--r-- | apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php | 3 | ||||
-rw-r--r-- | apps/files_sharing/tests/Controller/ShareAPIControllerTest.php | 6 | ||||
-rw-r--r-- | apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php | 3 | ||||
-rw-r--r-- | apps/files_sharing/tests/EtagPropagationTest.php | 2 | ||||
-rw-r--r-- | apps/files_sharing/tests/ExpireSharesJobTest.php | 3 | ||||
-rw-r--r-- | apps/files_sharing/tests/External/CacheTest.php | 3 | ||||
-rw-r--r-- | apps/files_sharing/tests/External/ManagerTest.php | 2 | ||||
-rw-r--r-- | apps/files_sharing/tests/External/ScannerTest.php | 3 | ||||
-rw-r--r-- | apps/files_sharing/tests/Migration/SetPasswordColumnTest.php | 3 | ||||
-rw-r--r-- | apps/files_sharing/tests/PropagationTestCase.php | 3 | ||||
-rw-r--r-- | apps/files_sharing/tests/ShareTest.php | 3 | ||||
-rw-r--r-- | apps/files_sharing/tests/SharedStorageTest.php | 3 | ||||
-rw-r--r-- | apps/files_sharing/tests/TestCase.php | 9 | ||||
-rw-r--r-- | apps/files_sharing/tests/WatcherTest.php | 12 |
16 files changed, 44 insertions, 29 deletions
diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php index d549d441df4..ec76186c566 100644 --- a/apps/files_sharing/tests/ApiTest.php +++ b/apps/files_sharing/tests/ApiTest.php @@ -18,6 +18,7 @@ use OCP\AppFramework\OCS\OCSException; use OCP\AppFramework\OCS\OCSForbiddenException; use OCP\AppFramework\OCS\OCSNotFoundException; use OCP\Constants; +use OCP\Files\Folder; use OCP\IConfig; use OCP\IDateTimeZone; use OCP\IL10N; @@ -42,7 +43,7 @@ class ApiTest extends TestCase { private static $tempStorage; - /** @var \OCP\Files\Folder */ + /** @var Folder */ private $userFolder; /** @var string */ diff --git a/apps/files_sharing/tests/CacheTest.php b/apps/files_sharing/tests/CacheTest.php index 1d622e6a14a..6813accd9be 100644 --- a/apps/files_sharing/tests/CacheTest.php +++ b/apps/files_sharing/tests/CacheTest.php @@ -6,7 +6,9 @@ */ namespace OCA\Files_Sharing\Tests; +use OC\Files\Cache\Cache; use OC\Files\Filesystem; +use OC\Files\Storage\Storage; use OC\Files\Storage\Temporary; use OC\Files\Storage\Wrapper\Jail; use OC\Files\View; @@ -22,20 +24,20 @@ use OCP\Share\IShare; class CacheTest extends TestCase { /** - * @var \OC\Files\View + * @var View */ public $user2View; - /** @var \OC\Files\Cache\Cache */ + /** @var Cache */ protected $ownerCache; - /** @var \OC\Files\Cache\Cache */ + /** @var Cache */ protected $sharedCache; - /** @var \OC\Files\Storage\Storage */ + /** @var Storage */ protected $ownerStorage; - /** @var \OC\Files\Storage\Storage */ + /** @var Storage */ protected $sharedStorage; /** @var \OCP\Share\IManager */ diff --git a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php index 05b412a60b6..81e2de72ec1 100644 --- a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php +++ b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php @@ -9,6 +9,7 @@ namespace OCA\Files_Sharing\Tests\Command; use OCA\Files_Sharing\Command\CleanupRemoteStorages; use OCP\Federation\ICloudId; use OCP\Federation\ICloudIdManager; +use OCP\IDBConnection; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; @@ -28,7 +29,7 @@ class CleanupRemoteStoragesTest extends TestCase { private $command; /** - * @var \OCP\IDBConnection + * @var IDBConnection */ private $connection; diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php index 7ae010b026f..aeba8cb9aea 100644 --- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php @@ -1570,7 +1570,7 @@ class ShareAPIControllerTest extends TestCase { * @dataProvider dataCanAccessRoomShare * * @param bool $expects - * @param \OCP\Share\IShare $share + * @param IShare $share * @param bool helperAvailable * @param bool canAccessShareByHelper */ @@ -4701,7 +4701,7 @@ class ShareAPIControllerTest extends TestCase { * @dataProvider dataFormatShare * * @param array $expects - * @param \OCP\Share\IShare $share + * @param IShare $share * @param array $users * @param $exception */ @@ -4920,7 +4920,7 @@ class ShareAPIControllerTest extends TestCase { * @dataProvider dataFormatRoomShare * * @param array $expects - * @param \OCP\Share\IShare $share + * @param IShare $share * @param bool $helperAvailable * @param array $formatShareByHelper */ diff --git a/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php b/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php index a35642b0793..ad3caa2d3f8 100644 --- a/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php +++ b/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php @@ -9,6 +9,7 @@ namespace OCA\Files_Sharing\Tests; use OC\Files\Filesystem; use OCA\Files_Sharing\DeleteOrphanedSharesJob; use OCP\Constants; +use OCP\IDBConnection; use OCP\Server; use OCP\Share\IShare; @@ -31,7 +32,7 @@ class DeleteOrphanedSharesJobTest extends \Test\TestCase { private $job; /** - * @var \OCP\IDBConnection + * @var IDBConnection */ private $connection; diff --git a/apps/files_sharing/tests/EtagPropagationTest.php b/apps/files_sharing/tests/EtagPropagationTest.php index 2b6d45561ba..cca19e7afd9 100644 --- a/apps/files_sharing/tests/EtagPropagationTest.php +++ b/apps/files_sharing/tests/EtagPropagationTest.php @@ -437,7 +437,7 @@ class EtagPropagationTest extends PropagationTestCase { $node = $userFolder->get('/sub1/sub2/folder'); $shares = $this->shareManager->getSharesBy(self::TEST_FILES_SHARING_API_USER1, IShare::TYPE_USER, $node); - /** @var \OCP\Share\IShare[] $shares */ + /** @var IShare[] $shares */ $shares = array_filter($shares, function (IShare $share) { return $share->getSharedWith() === self::TEST_FILES_SHARING_API_USER2; }); diff --git a/apps/files_sharing/tests/ExpireSharesJobTest.php b/apps/files_sharing/tests/ExpireSharesJobTest.php index c3b81591ebc..b0f78d12eed 100644 --- a/apps/files_sharing/tests/ExpireSharesJobTest.php +++ b/apps/files_sharing/tests/ExpireSharesJobTest.php @@ -9,6 +9,7 @@ namespace OCA\Files_Sharing\Tests; use OCA\Files_Sharing\ExpireSharesJob; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Constants; +use OCP\IDBConnection; use OCP\Share\IManager; use OCP\Share\IShare; @@ -24,7 +25,7 @@ class ExpireSharesJobTest extends \Test\TestCase { /** @var ExpireSharesJob */ private $job; - /** @var \OCP\IDBConnection */ + /** @var IDBConnection */ private $connection; /** @var string */ diff --git a/apps/files_sharing/tests/External/CacheTest.php b/apps/files_sharing/tests/External/CacheTest.php index 0f5c204f79e..5a862d8ddc0 100644 --- a/apps/files_sharing/tests/External/CacheTest.php +++ b/apps/files_sharing/tests/External/CacheTest.php @@ -7,6 +7,7 @@ namespace OCA\Files_Sharing\Tests\External; use OC\Federation\CloudIdManager; +use OC\Files\Storage\Storage; use OCA\Files_Sharing\External\Cache; use OCA\Files_Sharing\Tests\TestCase; use OCP\Contacts\IManager; @@ -29,7 +30,7 @@ class CacheTest extends TestCase { protected $contactsManager; /** - * @var \OC\Files\Storage\Storage + * @var Storage **/ private $storage; diff --git a/apps/files_sharing/tests/External/ManagerTest.php b/apps/files_sharing/tests/External/ManagerTest.php index 282467c4e28..2bd0a1e14bf 100644 --- a/apps/files_sharing/tests/External/ManagerTest.php +++ b/apps/files_sharing/tests/External/ManagerTest.php @@ -73,7 +73,7 @@ class ManagerTest extends TestCase { private $uid; /** - * @var \OCP\IUser + * @var IUser */ private $user; private $testMountProvider; diff --git a/apps/files_sharing/tests/External/ScannerTest.php b/apps/files_sharing/tests/External/ScannerTest.php index 3966fe9f71f..6241174fb28 100644 --- a/apps/files_sharing/tests/External/ScannerTest.php +++ b/apps/files_sharing/tests/External/ScannerTest.php @@ -6,6 +6,7 @@ */ namespace OCA\Files_Sharing\Tests\External; +use OC\Files\Cache\Cache; use OCA\Files_Sharing\External\Scanner; use OCA\Files_Sharing\External\Storage; use Test\TestCase; @@ -17,7 +18,7 @@ class ScannerTest extends TestCase { protected Scanner $scanner; /** @var Storage|\PHPUnit\Framework\MockObject\MockObject */ protected $storage; - /** @var \OC\Files\Cache\Cache|\PHPUnit\Framework\MockObject\MockObject */ + /** @var Cache|\PHPUnit\Framework\MockObject\MockObject */ protected $cache; protected function setUp(): void { diff --git a/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php b/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php index e15914f6ba1..9e46232aa39 100644 --- a/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php +++ b/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php @@ -9,6 +9,7 @@ namespace OCA\Files_Sharing\Tests\Migration; use OCA\Files_Sharing\Migration\SetPasswordColumn; use OCA\Files_Sharing\Tests\TestCase; use OCP\IConfig; +use OCP\IDBConnection; use OCP\Migration\IOutput; use OCP\Share\IShare; @@ -19,7 +20,7 @@ use OCP\Share\IShare; */ class SetPasswordColumnTest extends TestCase { - /** @var \OCP\IDBConnection */ + /** @var IDBConnection */ private $connection; /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ diff --git a/apps/files_sharing/tests/PropagationTestCase.php b/apps/files_sharing/tests/PropagationTestCase.php index 78ff394bb80..04852e53e21 100644 --- a/apps/files_sharing/tests/PropagationTestCase.php +++ b/apps/files_sharing/tests/PropagationTestCase.php @@ -6,11 +6,12 @@ */ namespace OCA\Files_Sharing\Tests; +use OC\Files\View; use OCA\Files_Sharing\Helper; abstract class PropagationTestCase extends TestCase { /** - * @var \OC\Files\View + * @var View */ protected $rootView; protected $fileIds = []; // [$user=>[$path=>$id]] diff --git a/apps/files_sharing/tests/ShareTest.php b/apps/files_sharing/tests/ShareTest.php index 2a3800dec19..b79235676e2 100644 --- a/apps/files_sharing/tests/ShareTest.php +++ b/apps/files_sharing/tests/ShareTest.php @@ -6,6 +6,7 @@ */ namespace OCA\Files_Sharing\Tests; +use OC\Files\FileInfo; use OC\Files\Filesystem; use OCA\Files_Sharing\Helper; use OCP\Constants; @@ -100,7 +101,7 @@ class ShareTest extends TestCase { } /** - * @param \OC\Files\FileInfo[] $content + * @param FileInfo[] $content * @param string[] $expected */ public function verifyDirContent($content, $expected) { diff --git a/apps/files_sharing/tests/SharedStorageTest.php b/apps/files_sharing/tests/SharedStorageTest.php index 2aa4f38c0da..a91931501b4 100644 --- a/apps/files_sharing/tests/SharedStorageTest.php +++ b/apps/files_sharing/tests/SharedStorageTest.php @@ -9,6 +9,7 @@ namespace OCA\Files_Sharing\Tests; use OC\Files\Cache\FailedCache; use OC\Files\Filesystem; use OC\Files\Storage\FailedStorage; +use OC\Files\Storage\Storage; use OC\Files\Storage\Temporary; use OC\Files\View; use OCA\Files_Sharing\SharedStorage; @@ -88,7 +89,7 @@ class SharedStorageTest extends TestCase { $this->assertFalse($user2View->is_dir($this->folder)); // delete the local folder - /** @var \OC\Files\Storage\Storage $storage */ + /** @var Storage $storage */ [$storage, $internalPath] = Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/localfolder'); $storage->rmdir($internalPath); diff --git a/apps/files_sharing/tests/TestCase.php b/apps/files_sharing/tests/TestCase.php index 473b7cb7227..d12a6bf0ec2 100644 --- a/apps/files_sharing/tests/TestCase.php +++ b/apps/files_sharing/tests/TestCase.php @@ -15,6 +15,7 @@ use OCA\Files_Sharing\AppInfo\Application; use OCA\Files_Sharing\External\MountProvider as ExternalMountProvider; use OCA\Files_Sharing\MountProvider; use OCP\Files\Config\IMountProviderCollection; +use OCP\Files\IRootFolder; use OCP\Share\IShare; use Test\Traits\MountProviderTrait; @@ -38,11 +39,11 @@ abstract class TestCase extends \Test\TestCase { public $filename; public $data; /** - * @var \OC\Files\View + * @var View */ public $view; /** - * @var \OC\Files\View + * @var View */ public $view2; public $folder; @@ -50,7 +51,7 @@ abstract class TestCase extends \Test\TestCase { /** @var \OCP\Share\IManager */ protected $shareManager; - /** @var \OCP\Files\IRootFolder */ + /** @var IRootFolder */ protected $rootFolder; public static function setUpBeforeClass(): void { @@ -218,7 +219,7 @@ abstract class TestCase extends \Test\TestCase { * @param string $initiator * @param string $recipient * @param int $permissions - * @return \OCP\Share\IShare + * @return IShare */ protected function share($type, $path, $initiator, $recipient, $permissions) { $userFolder = $this->rootFolder->getUserFolder($initiator); diff --git a/apps/files_sharing/tests/WatcherTest.php b/apps/files_sharing/tests/WatcherTest.php index cddba7db735..2d1568e6a31 100644 --- a/apps/files_sharing/tests/WatcherTest.php +++ b/apps/files_sharing/tests/WatcherTest.php @@ -6,6 +6,8 @@ */ namespace OCA\Files_Sharing\Tests; +use OC\Files\Cache\Cache; +use OC\Files\Storage\Storage; use OC\Files\View; use OCP\Constants; use OCP\Share\IShare; @@ -17,19 +19,19 @@ use OCP\Share\IShare; */ class WatcherTest extends TestCase { - /** @var \OC\Files\Storage\Storage */ + /** @var Storage */ private $ownerStorage; - /** @var \OC\Files\Cache\Cache */ + /** @var Cache */ private $ownerCache; - /** @var \OC\Files\Storage\Storage */ + /** @var Storage */ private $sharedStorage; - /** @var \OC\Files\Cache\Cache */ + /** @var Cache */ private $sharedCache; - /** @var \OCP\Share\IShare */ + /** @var IShare */ private $_share; protected function setUp(): void { |