diff options
| author | Côme Chilliet <come.chilliet@nextcloud.com> | 2023-01-20 11:45:08 +0100 |
|---|---|---|
| committer | Côme Chilliet <come.chilliet@nextcloud.com> | 2023-01-20 11:45:08 +0100 |
| commit | f5c361cf44739058b79f322576a1bad2d8c142d9 (patch) | |
| tree | a22217c6995751023112832d191d213e494e2fbc /tests | |
| parent | 37bb33c5799b834dfef3fb73936bd0e5a4773fb8 (diff) | |
| download | nextcloud-server-f5c361cf44739058b79f322576a1bad2d8c142d9.tar.gz nextcloud-server-f5c361cf44739058b79f322576a1bad2d8c142d9.zip | |
composer run cs:fix
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Diffstat (limited to 'tests')
230 files changed, 238 insertions, 461 deletions
diff --git a/tests/Core/Command/Apps/AppsDisableTest.php b/tests/Core/Command/Apps/AppsDisableTest.php index 493dfc16f3e..8995ee2673f 100644 --- a/tests/Core/Command/Apps/AppsDisableTest.php +++ b/tests/Core/Command/Apps/AppsDisableTest.php @@ -33,7 +33,6 @@ use Test\TestCase; * @group DB */ class AppsDisableTest extends TestCase { - /** @var CommandTester */ private $commandTester; diff --git a/tests/Core/Command/Apps/AppsEnableTest.php b/tests/Core/Command/Apps/AppsEnableTest.php index 0c45362d997..02bf86cfd43 100644 --- a/tests/Core/Command/Apps/AppsEnableTest.php +++ b/tests/Core/Command/Apps/AppsEnableTest.php @@ -33,7 +33,6 @@ use Test\TestCase; * @group DB */ class AppsEnableTest extends TestCase { - /** @var CommandTester */ private $commandTester; diff --git a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php index fc916ad4099..1d5e2ac420d 100644 --- a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php +++ b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php @@ -34,7 +34,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class ChangeKeyStorageRootTest extends TestCase { - /** @var ChangeKeyStorageRoot */ protected $changeKeyStorageRoot; @@ -147,7 +146,6 @@ class ChangeKeyStorageRootTest extends TestCase { } public function testMoveAllKeys() { - /** @var \OC\Core\Command\Encryption\ChangeKeyStorageRoot $changeKeyStorageRoot */ $changeKeyStorageRoot = $this->getMockBuilder('OC\Core\Command\Encryption\ChangeKeyStorageRoot') ->setConstructorArgs( diff --git a/tests/Core/Command/Encryption/DecryptAllTest.php b/tests/Core/Command/Encryption/DecryptAllTest.php index 12ace5fe371..c78500fd9d8 100644 --- a/tests/Core/Command/Encryption/DecryptAllTest.php +++ b/tests/Core/Command/Encryption/DecryptAllTest.php @@ -31,7 +31,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class DecryptAllTest extends TestCase { - /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IConfig */ protected $config; @@ -86,7 +85,6 @@ class DecryptAllTest extends TestCase { } public function testMaintenanceAndTrashbin() { - // on construct we enable single-user-mode and disable the trash bin $this->config->expects($this->at(1)) ->method('setSystemValue') diff --git a/tests/Core/Command/Encryption/EncryptAllTest.php b/tests/Core/Command/Encryption/EncryptAllTest.php index 68cd4971e4f..1190a98843f 100644 --- a/tests/Core/Command/Encryption/EncryptAllTest.php +++ b/tests/Core/Command/Encryption/EncryptAllTest.php @@ -32,7 +32,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class EncryptAllTest extends TestCase { - /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IConfig */ protected $config; diff --git a/tests/Core/Command/Group/AddTest.php b/tests/Core/Command/Group/AddTest.php index 65806fa538b..bfddee468a4 100644 --- a/tests/Core/Command/Group/AddTest.php +++ b/tests/Core/Command/Group/AddTest.php @@ -31,7 +31,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class AddTest extends TestCase { - /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; diff --git a/tests/Core/Command/Group/AddUserTest.php b/tests/Core/Command/Group/AddUserTest.php index d9471956dfd..c885365f8c6 100644 --- a/tests/Core/Command/Group/AddUserTest.php +++ b/tests/Core/Command/Group/AddUserTest.php @@ -33,7 +33,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class AddUserTest extends TestCase { - /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; diff --git a/tests/Core/Command/Group/DeleteTest.php b/tests/Core/Command/Group/DeleteTest.php index 3b29fb4e6ad..393f33aea98 100644 --- a/tests/Core/Command/Group/DeleteTest.php +++ b/tests/Core/Command/Group/DeleteTest.php @@ -31,7 +31,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class DeleteTest extends TestCase { - /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; diff --git a/tests/Core/Command/Group/InfoTest.php b/tests/Core/Command/Group/InfoTest.php index fc98cf647c7..3f1cc359799 100644 --- a/tests/Core/Command/Group/InfoTest.php +++ b/tests/Core/Command/Group/InfoTest.php @@ -31,7 +31,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class InfoTest extends TestCase { - /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; diff --git a/tests/Core/Command/Group/ListCommandTest.php b/tests/Core/Command/Group/ListCommandTest.php index ed454a796a6..f8e750bbe65 100644 --- a/tests/Core/Command/Group/ListCommandTest.php +++ b/tests/Core/Command/Group/ListCommandTest.php @@ -32,7 +32,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class ListCommandTest extends TestCase { - /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; diff --git a/tests/Core/Command/Group/RemoveUserTest.php b/tests/Core/Command/Group/RemoveUserTest.php index 495046402a8..470d5965333 100644 --- a/tests/Core/Command/Group/RemoveUserTest.php +++ b/tests/Core/Command/Group/RemoveUserTest.php @@ -33,7 +33,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class RemoveUserTest extends TestCase { - /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; diff --git a/tests/Core/Command/SystemTag/AddTest.php b/tests/Core/Command/SystemTag/AddTest.php index c875c8f3ec3..93a79e1e1a9 100644 --- a/tests/Core/Command/SystemTag/AddTest.php +++ b/tests/Core/Command/SystemTag/AddTest.php @@ -32,7 +32,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class AddTest extends TestCase { - /** @var ISystemTagManager|\PHPUnit\Framework\MockObject\MockObject */ private $systemTagManager; diff --git a/tests/Core/Command/SystemTag/DeleteTest.php b/tests/Core/Command/SystemTag/DeleteTest.php index 138606049ee..16c0c9e7b04 100644 --- a/tests/Core/Command/SystemTag/DeleteTest.php +++ b/tests/Core/Command/SystemTag/DeleteTest.php @@ -31,7 +31,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class DeleteTest extends TestCase { - /** @var ISystemTagManager|\PHPUnit\Framework\MockObject\MockObject */ private $systemTagManager; diff --git a/tests/Core/Command/SystemTag/EditTest.php b/tests/Core/Command/SystemTag/EditTest.php index 7794ac5aefd..a5340cf6b53 100644 --- a/tests/Core/Command/SystemTag/EditTest.php +++ b/tests/Core/Command/SystemTag/EditTest.php @@ -32,7 +32,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class EditTest extends TestCase { - /** @var ISystemTagManager|\PHPUnit\Framework\MockObject\MockObject */ private $systemTagManager; diff --git a/tests/Core/Command/SystemTag/ListCommandTest.php b/tests/Core/Command/SystemTag/ListCommandTest.php index 2e2fba1017f..6488e130947 100644 --- a/tests/Core/Command/SystemTag/ListCommandTest.php +++ b/tests/Core/Command/SystemTag/ListCommandTest.php @@ -31,7 +31,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class ListCommandTest extends TestCase { - /** @var ISystemTagManager|\PHPUnit\Framework\MockObject\MockObject */ private $systemTagManager; diff --git a/tests/Core/Command/TwoFactorAuth/CleanupTest.php b/tests/Core/Command/TwoFactorAuth/CleanupTest.php index 75e869ad06f..b23e9c9b4c4 100644 --- a/tests/Core/Command/TwoFactorAuth/CleanupTest.php +++ b/tests/Core/Command/TwoFactorAuth/CleanupTest.php @@ -33,7 +33,6 @@ use Symfony\Component\Console\Tester\CommandTester; use Test\TestCase; class CleanupTest extends TestCase { - /** @var IRegistry|MockObject */ private $registry; diff --git a/tests/Core/Command/TwoFactorAuth/DisableTest.php b/tests/Core/Command/TwoFactorAuth/DisableTest.php index 5accaccb907..35b810c637f 100644 --- a/tests/Core/Command/TwoFactorAuth/DisableTest.php +++ b/tests/Core/Command/TwoFactorAuth/DisableTest.php @@ -35,7 +35,6 @@ use Symfony\Component\Console\Tester\CommandTester; use Test\TestCase; class DisableTest extends TestCase { - /** @var ProviderManager|MockObject */ private $providerManager; diff --git a/tests/Core/Command/TwoFactorAuth/EnableTest.php b/tests/Core/Command/TwoFactorAuth/EnableTest.php index fc71cc32148..0e26bcb9578 100644 --- a/tests/Core/Command/TwoFactorAuth/EnableTest.php +++ b/tests/Core/Command/TwoFactorAuth/EnableTest.php @@ -35,7 +35,6 @@ use Symfony\Component\Console\Tester\CommandTester; use Test\TestCase; class EnableTest extends TestCase { - /** @var ProviderManager|MockObject */ private $providerManager; diff --git a/tests/Core/Command/TwoFactorAuth/EnforceTest.php b/tests/Core/Command/TwoFactorAuth/EnforceTest.php index ed3deaa3fb3..194e16e8699 100644 --- a/tests/Core/Command/TwoFactorAuth/EnforceTest.php +++ b/tests/Core/Command/TwoFactorAuth/EnforceTest.php @@ -34,7 +34,6 @@ use Symfony\Component\Console\Tester\CommandTester; use Test\TestCase; class EnforceTest extends TestCase { - /** @var MandatoryTwoFactor|MockObject */ private $mandatoryTwoFactor; diff --git a/tests/Core/Command/TwoFactorAuth/StateTest.php b/tests/Core/Command/TwoFactorAuth/StateTest.php index 54ab85b51b8..bc683c11886 100644 --- a/tests/Core/Command/TwoFactorAuth/StateTest.php +++ b/tests/Core/Command/TwoFactorAuth/StateTest.php @@ -35,7 +35,6 @@ use Symfony\Component\Console\Tester\CommandTester; use Test\TestCase; class StateTest extends TestCase { - /** @var IRegistry|MockObject */ private $registry; diff --git a/tests/Core/Controller/AppPasswordControllerTest.php b/tests/Core/Controller/AppPasswordControllerTest.php index 7d81e0ec115..47220fcf5ab 100644 --- a/tests/Core/Controller/AppPasswordControllerTest.php +++ b/tests/Core/Controller/AppPasswordControllerTest.php @@ -43,7 +43,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class AppPasswordControllerTest extends TestCase { - /** @var ISession|MockObject */ private $session; diff --git a/tests/Core/Controller/CSRFTokenControllerTest.php b/tests/Core/Controller/CSRFTokenControllerTest.php index 875d5a79168..ba01675e978 100644 --- a/tests/Core/Controller/CSRFTokenControllerTest.php +++ b/tests/Core/Controller/CSRFTokenControllerTest.php @@ -33,7 +33,6 @@ use OCP\IRequest; use Test\TestCase; class CSRFTokenControllerTest extends TestCase { - /** @var CSRFTokenController */ private $controller; diff --git a/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php b/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php index 53d5f392ac6..2f5cc507378 100644 --- a/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php +++ b/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php @@ -43,7 +43,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class ClientFlowLoginV2ControllerTest extends TestCase { - /** @var IRequest|MockObject */ private $request; /** @var LoginFlowV2Service|MockObject */ diff --git a/tests/Core/Controller/ContactsMenuControllerTest.php b/tests/Core/Controller/ContactsMenuControllerTest.php index 0bed7b8e7a1..f51bab0f006 100644 --- a/tests/Core/Controller/ContactsMenuControllerTest.php +++ b/tests/Core/Controller/ContactsMenuControllerTest.php @@ -34,7 +34,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class ContactsMenuControllerTest extends TestCase { - /** @var IUserSession|MockObject */ private $userSession; diff --git a/tests/Core/Controller/CssControllerTest.php b/tests/Core/Controller/CssControllerTest.php index d2a791ec1b0..9659d76a7cb 100644 --- a/tests/Core/Controller/CssControllerTest.php +++ b/tests/Core/Controller/CssControllerTest.php @@ -38,7 +38,6 @@ use OCP\IRequest; use Test\TestCase; class CssControllerTest extends TestCase { - /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ private $appData; diff --git a/tests/Core/Controller/GuestAvatarControllerTest.php b/tests/Core/Controller/GuestAvatarControllerTest.php index 8688f531519..42a00e1618c 100644 --- a/tests/Core/Controller/GuestAvatarControllerTest.php +++ b/tests/Core/Controller/GuestAvatarControllerTest.php @@ -14,7 +14,6 @@ use Psr\Log\LoggerInterface; * This class provides tests for the guest avatar controller. */ class GuestAvatarControllerTest extends \Test\TestCase { - /** * @var GuestAvatarController */ diff --git a/tests/Core/Controller/JsControllerTest.php b/tests/Core/Controller/JsControllerTest.php index 3f76e19efc9..6561d22f264 100644 --- a/tests/Core/Controller/JsControllerTest.php +++ b/tests/Core/Controller/JsControllerTest.php @@ -38,7 +38,6 @@ use OCP\IRequest; use Test\TestCase; class JsControllerTest extends TestCase { - /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ private $appData; diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php index 2c8aedf99c4..c97ed53d331 100644 --- a/tests/Core/Controller/LoginControllerTest.php +++ b/tests/Core/Controller/LoginControllerTest.php @@ -47,7 +47,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class LoginControllerTest extends TestCase { - /** @var LoginController */ private $loginController; diff --git a/tests/Core/Controller/NavigationControllerTest.php b/tests/Core/Controller/NavigationControllerTest.php index e98d0e8ed40..39f389faa5e 100644 --- a/tests/Core/Controller/NavigationControllerTest.php +++ b/tests/Core/Controller/NavigationControllerTest.php @@ -32,7 +32,6 @@ use OCP\IURLGenerator; use Test\TestCase; class NavigationControllerTest extends TestCase { - /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; diff --git a/tests/Core/Controller/PreviewControllerTest.php b/tests/Core/Controller/PreviewControllerTest.php index e6045386538..7815505d5a8 100644 --- a/tests/Core/Controller/PreviewControllerTest.php +++ b/tests/Core/Controller/PreviewControllerTest.php @@ -37,7 +37,6 @@ use OCP\IPreview; use OCP\IRequest; class PreviewControllerTest extends \Test\TestCase { - /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ private $rootFolder; diff --git a/tests/Core/Controller/TwoFactorChallengeControllerTest.php b/tests/Core/Controller/TwoFactorChallengeControllerTest.php index 94bb959fbbc..27b0f476b61 100644 --- a/tests/Core/Controller/TwoFactorChallengeControllerTest.php +++ b/tests/Core/Controller/TwoFactorChallengeControllerTest.php @@ -41,7 +41,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class TwoFactorChallengeControllerTest extends TestCase { - /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; diff --git a/tests/Core/Controller/UserControllerTest.php b/tests/Core/Controller/UserControllerTest.php index 8b9c11ad4b1..b7b6e0c69f6 100644 --- a/tests/Core/Controller/UserControllerTest.php +++ b/tests/Core/Controller/UserControllerTest.php @@ -31,7 +31,6 @@ use OCP\IUserManager; use Test\TestCase; class UserControllerTest extends TestCase { - /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ private $userManager; diff --git a/tests/Core/Controller/WellKnownControllerTest.php b/tests/Core/Controller/WellKnownControllerTest.php index 2a35ed5ac85..08af2a214ae 100644 --- a/tests/Core/Controller/WellKnownControllerTest.php +++ b/tests/Core/Controller/WellKnownControllerTest.php @@ -34,7 +34,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class WellKnownControllerTest extends TestCase { - /** @var IRequest|MockObject */ private $request; diff --git a/tests/Core/Controller/WipeControllerTest.php b/tests/Core/Controller/WipeControllerTest.php index 298d11848b8..5c06a867b79 100644 --- a/tests/Core/Controller/WipeControllerTest.php +++ b/tests/Core/Controller/WipeControllerTest.php @@ -34,7 +34,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class WipeControllerTest extends TestCase { - /** @var RemoteWipe|MockObject */ private $remoteWipe; diff --git a/tests/Core/Middleware/TwoFactorMiddlewareTest.php b/tests/Core/Middleware/TwoFactorMiddlewareTest.php index c5de9f81fe5..fe1b53e3fa5 100644 --- a/tests/Core/Middleware/TwoFactorMiddlewareTest.php +++ b/tests/Core/Middleware/TwoFactorMiddlewareTest.php @@ -46,7 +46,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class TwoFactorMiddlewareTest extends TestCase { - /** @var Manager|MockObject */ private $twoFactorManager; diff --git a/tests/Test/Repair/Owncloud/CleanPreviewsTest.php b/tests/Test/Repair/Owncloud/CleanPreviewsTest.php index 7a6c374a2d7..b291b4d86d1 100644 --- a/tests/Test/Repair/Owncloud/CleanPreviewsTest.php +++ b/tests/Test/Repair/Owncloud/CleanPreviewsTest.php @@ -32,8 +32,6 @@ use OCP\Migration\IOutput; use Test\TestCase; class CleanPreviewsTest extends TestCase { - - /** @var IJobList|\PHPUnit_Framework_MockObject_MockObject */ private $jobList; diff --git a/tests/acceptance/features/bootstrap/AppNavigationContext.php b/tests/acceptance/features/bootstrap/AppNavigationContext.php index cba56856bfa..49d664e2333 100644 --- a/tests/acceptance/features/bootstrap/AppNavigationContext.php +++ b/tests/acceptance/features/bootstrap/AppNavigationContext.php @@ -114,9 +114,9 @@ class AppNavigationContext implements Context, ActorAwareInterface { */ public function iSeeThatTheSectionIsShown($section) { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::appNavigationSectionItemFor($section), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::appNavigationSectionItemFor($section), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The section $section in the app navigation is not shown yet after $timeout seconds"); } } @@ -126,9 +126,9 @@ class AppNavigationContext implements Context, ActorAwareInterface { */ public function iSeeThatTheSectionIsNotShown($section) { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::appNavigationSectionItemFor($section), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::appNavigationSectionItemFor($section), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The section $section in the app navigation is still shown after $timeout seconds"); } } @@ -145,9 +145,9 @@ class AppNavigationContext implements Context, ActorAwareInterface { */ public function iSeeThatTheSectionDoesNotHaveACount($section) { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::counterForTheSection($section), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::counterForTheSection($section), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The counter for section $section is still shown after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/AppSettingsContext.php b/tests/acceptance/features/bootstrap/AppSettingsContext.php index 210e907a9bc..c8033a46f2d 100644 --- a/tests/acceptance/features/bootstrap/AppSettingsContext.php +++ b/tests/acceptance/features/bootstrap/AppSettingsContext.php @@ -90,9 +90,9 @@ class AppSettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatTheSettingsAreOpened() { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::appSettingsContent(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::appSettingsContent(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The app settings are not open yet after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/AppsManagementContext.php b/tests/acceptance/features/bootstrap/AppsManagementContext.php index 908754163d7..7b06b77d117 100644 --- a/tests/acceptance/features/bootstrap/AppsManagementContext.php +++ b/tests/acceptance/features/bootstrap/AppsManagementContext.php @@ -200,9 +200,9 @@ class AppsManagementContext implements Context, ActorAwareInterface { */ public function iSeeThatThereSomeAppsListedFromTheAppStore() { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::appEntries(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::appEntries(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The apps from the app store were not shown yet after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/CommentsAppContext.php b/tests/acceptance/features/bootstrap/CommentsAppContext.php index 577b14b7e72..b193ba9fb33 100644 --- a/tests/acceptance/features/bootstrap/CommentsAppContext.php +++ b/tests/acceptance/features/bootstrap/CommentsAppContext.php @@ -85,9 +85,9 @@ class CommentsAppContext implements Context, ActorAwareInterface { */ public function iSeeThatThereAreNoComments() { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::emptyContent(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::emptyContent(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The no comments message is not visible yet after $timeout seconds"); } } @@ -97,7 +97,7 @@ class CommentsAppContext implements Context, ActorAwareInterface { */ public function iSeeACommentWithAsMessage($commentText) { Assert::assertTrue( - $this->actor->find(self::commentWithText($commentText), 10)->isVisible()); + $this->actor->find(self::commentWithText($commentText), 10)->isVisible()); } /** @@ -106,7 +106,7 @@ class CommentsAppContext implements Context, ActorAwareInterface { public function iSeeThatThereIsNoCommentWithAsMessage($commentText) { try { Assert::assertFalse( - $this->actor->find(self::commentWithText($commentText))->isVisible()); + $this->actor->find(self::commentWithText($commentText))->isVisible()); } catch (NoSuchElementException $exception) { } } diff --git a/tests/acceptance/features/bootstrap/ContactsMenuContext.php b/tests/acceptance/features/bootstrap/ContactsMenuContext.php index b22f33a3c55..72c33410b28 100644 --- a/tests/acceptance/features/bootstrap/ContactsMenuContext.php +++ b/tests/acceptance/features/bootstrap/ContactsMenuContext.php @@ -89,7 +89,7 @@ class ContactsMenuContext implements Context, ActorAwareInterface { */ public function iSeeThatTheContactsMenuIsShown() { Assert::assertTrue( - $this->actor->find(self::contactsMenu(), 10)->isVisible()); + $this->actor->find(self::contactsMenu(), 10)->isVisible()); } /** @@ -97,7 +97,7 @@ class ContactsMenuContext implements Context, ActorAwareInterface { */ public function iSeeThatTheContactsMenuSearchInputIsShown() { Assert::assertTrue( - $this->actor->find(self::contactsMenuSearchInput(), 10)->isVisible()); + $this->actor->find(self::contactsMenuSearchInput(), 10)->isVisible()); } /** @@ -105,7 +105,7 @@ class ContactsMenuContext implements Context, ActorAwareInterface { */ public function iSeeThatTheNoResultsMessageInTheContactsMenuIsShown() { Assert::assertTrue( - $this->actor->find(self::noResultsMessage(), 10)->isVisible()); + $this->actor->find(self::noResultsMessage(), 10)->isVisible()); } /** @@ -113,7 +113,7 @@ class ContactsMenuContext implements Context, ActorAwareInterface { */ public function iSeeThatTheContactInTheContactsMenuIsShown($contactName) { Assert::assertTrue( - $this->actor->find(self::menuItemFor($contactName), 10)->isVisible()); + $this->actor->find(self::menuItemFor($contactName), 10)->isVisible()); } /** @@ -124,7 +124,7 @@ class ContactsMenuContext implements Context, ActorAwareInterface { try { Assert::assertFalse( - $this->actor->find(self::menuItemFor($contactName))->isVisible()); + $this->actor->find(self::menuItemFor($contactName))->isVisible()); } catch (NoSuchElementException $exception) { } } @@ -136,9 +136,9 @@ class ContactsMenuContext implements Context, ActorAwareInterface { $this->iSeeThatThecontactsMenuIsShown(); if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::menuItemFor($contactName), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::menuItemFor($contactName), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The $contactName contact in Contacts menu is still shown after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/DialogContext.php b/tests/acceptance/features/bootstrap/DialogContext.php index dea9f434bab..3deea2f5ebf 100644 --- a/tests/acceptance/features/bootstrap/DialogContext.php +++ b/tests/acceptance/features/bootstrap/DialogContext.php @@ -56,9 +56,9 @@ class DialogContext implements Context, ActorAwareInterface { */ public function iSeeThatTheConfirmationDialogIsShown() { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::theDialog(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::theDialog(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The confirmation dialog was not shown yet after $timeout seconds"); } } @@ -68,9 +68,9 @@ class DialogContext implements Context, ActorAwareInterface { */ public function iSeeThatTheConfirmationDialogIsNotShown() { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::theDialog(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::theDialog(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The confirmation dialog is still shown after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/FileListAncestorSetter.php b/tests/acceptance/features/bootstrap/FileListAncestorSetter.php index af8534f012c..b87d1d7dee3 100644 --- a/tests/acceptance/features/bootstrap/FileListAncestorSetter.php +++ b/tests/acceptance/features/bootstrap/FileListAncestorSetter.php @@ -37,7 +37,6 @@ use Behat\Behat\Hook\Scope\BeforeScenarioScope; * "setFileListAncestorForActor" when needed. */ trait FileListAncestorSetter { - /** * @var FileListContext */ diff --git a/tests/acceptance/features/bootstrap/FileListContext.php b/tests/acceptance/features/bootstrap/FileListContext.php index 12402c07cc0..501bad73c06 100644 --- a/tests/acceptance/features/bootstrap/FileListContext.php +++ b/tests/acceptance/features/bootstrap/FileListContext.php @@ -25,7 +25,6 @@ use Behat\Behat\Context\Context; use PHPUnit\Framework\Assert; class FileListContext implements Context, ActorAwareInterface { - /** * @var Actor */ @@ -484,9 +483,9 @@ class FileListContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileListIsEventuallyLoaded() { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::mainWorkingIcon($this->fileListAncestor), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::mainWorkingIcon($this->fileListAncestor), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The main working icon for the file list is still shown after $timeout seconds"); } } @@ -522,9 +521,9 @@ class FileListContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileListDoesNotContainAFileNamed($fileName) { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::rowForFile($this->fileListAncestor, $fileName), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::rowForFile($this->fileListAncestor, $fileName), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The file list still contains a file named $fileName after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/FilesAppContext.php b/tests/acceptance/features/bootstrap/FilesAppContext.php index 124000f878d..b4b6e72e5b5 100644 --- a/tests/acceptance/features/bootstrap/FilesAppContext.php +++ b/tests/acceptance/features/bootstrap/FilesAppContext.php @@ -297,8 +297,8 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheCurrentPageIsTheFilesApp() { Assert::assertStringStartsWith( - $this->actor->locatePath("/apps/files/"), - $this->actor->getSession()->getCurrentUrl()); + $this->actor->locatePath("/apps/files/"), + $this->actor->getSession()->getCurrentUrl()); $this->setFileListAncestorForActor(self::currentSectionMainView(), $this->actor); } @@ -311,9 +311,9 @@ class FilesAppContext implements Context, ActorAwareInterface { // waited for it to be visible instead of relying on the implicit wait // made to find the element. if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::detailsView(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::detailsView(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The details view is not open yet after $timeout seconds"); } } @@ -323,9 +323,9 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheDetailsViewIsClosed() { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::detailsView(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::detailsView(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The details view is not closed yet after $timeout seconds"); } } @@ -335,7 +335,7 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileNameShownInTheDetailsViewIs($fileName) { Assert::assertEquals( - $this->actor->find(self::fileNameInDetailsView(), 10)->getText(), $fileName); + $this->actor->find(self::fileNameInDetailsView(), 10)->getText(), $fileName); } /** @@ -343,7 +343,7 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileIsMarkedAsFavoriteInTheDetailsView() { Assert::assertNotNull( - $this->actor->find(self::favoritedStateIconInFileDetailsInDetailsView(), 10)); + $this->actor->find(self::favoritedStateIconInFileDetailsInDetailsView(), 10)); } /** @@ -351,7 +351,7 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileIsNotMarkedAsFavoriteInTheDetailsView() { Assert::assertNotNull( - $this->actor->find(self::notFavoritedStateIconInFileDetailsInDetailsView(), 10)); + $this->actor->find(self::notFavoritedStateIconInFileDetailsInDetailsView(), 10)); } /** @@ -359,7 +359,7 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheInputFieldForTagsInTheDetailsViewIsShown() { Assert::assertTrue( - $this->actor->find(self::inputFieldForTagsInDetailsView(), 10)->isVisible()); + $this->actor->find(self::inputFieldForTagsInDetailsView(), 10)->isVisible()); } /** @@ -367,7 +367,7 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheInputFieldForTagsInTheDetailsViewContainsTheTag($tag) { Assert::assertTrue( - $this->actor->find(self::itemInInputFieldForTagsInDetailsViewForTag($tag), 10)->isVisible()); + $this->actor->find(self::itemInInputFieldForTagsInDetailsViewForTag($tag), 10)->isVisible()); } /** @@ -378,7 +378,7 @@ class FilesAppContext implements Context, ActorAwareInterface { try { Assert::assertFalse( - $this->actor->find(self::itemInInputFieldForTagsInDetailsViewForTag($tag))->isVisible()); + $this->actor->find(self::itemInInputFieldForTagsInDetailsViewForTag($tag))->isVisible()); } catch (NoSuchElementException $exception) { } } @@ -388,7 +388,7 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheTagInTheDropdownForTagsInTheDetailsViewIsChecked($tag) { Assert::assertTrue( - $this->actor->find(self::checkmarkInItemInDropdownForTag($tag), 10)->isVisible()); + $this->actor->find(self::checkmarkInItemInDropdownForTag($tag), 10)->isVisible()); } /** @@ -396,10 +396,10 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheTagInTheDropdownForTagsInTheDetailsViewIsNotChecked($tag) { Assert::assertTrue( - $this->actor->find(self::itemInDropdownForTag($tag), 10)->isVisible()); + $this->actor->find(self::itemInDropdownForTag($tag), 10)->isVisible()); Assert::assertFalse( - $this->actor->find(self::checkmarkInItemInDropdownForTag($tag))->isVisible()); + $this->actor->find(self::checkmarkInItemInDropdownForTag($tag))->isVisible()); } /** @@ -407,9 +407,9 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheTabInTheDetailsViewIsEventuallyLoaded($tabName) { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::loadingIconForTabInDetailsViewNamed($tabName), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::loadingIconForTabInDetailsViewNamed($tabName), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The $tabName tab in the details view has not been loaded after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/FilesAppSharingContext.php b/tests/acceptance/features/bootstrap/FilesAppSharingContext.php index 95398423e3b..40c055ed06e 100644 --- a/tests/acceptance/features/bootstrap/FilesAppSharingContext.php +++ b/tests/acceptance/features/bootstrap/FilesAppSharingContext.php @@ -378,9 +378,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { // Close the share link menu if it is open to ensure that it does not // cover the copy link button. if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::shareLinkMenu($shareLinkMenuTriggerElement), - $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::shareLinkMenu($shareLinkMenuTriggerElement), + $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { // It may not be possible to click on the menu button (due to the // menu itself covering it), so "Enter" key is pressed instead. $this->actor->find(self::shareLinkMenuButton(), 2)->getWrappedElement()->keyPress(13); @@ -528,7 +528,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileIsSharedWithMeBy($sharedByName) { Assert::assertEquals( - $this->actor->find(self::sharedByLabel(), 10)->getText(), "Shared with you by $sharedByName"); + $this->actor->find(self::sharedByLabel(), 10)->getText(), "Shared with you by $sharedByName"); } /** @@ -536,7 +536,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileIsSharedWith($sharedWithName) { Assert::assertTrue( - $this->actor->find(self::sharedWithRow($sharedWithName), 10)->isVisible()); + $this->actor->find(self::sharedWithRow($sharedWithName), 10)->isVisible()); } /** @@ -544,9 +544,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileIsNotSharedWith($sharedWithName) { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::sharedWithRow($sharedWithName), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::sharedWithRow($sharedWithName), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The shared with $sharedWithName row is still shown after $timeout seconds"); } } @@ -556,9 +556,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { */ public function iSeeThatResharingTheFileIsNotAllowed() { Assert::assertEquals( - $this->actor->find(self::shareWithInput(), 10)->getWrappedElement()->getAttribute("disabled"), "disabled"); + $this->actor->find(self::shareWithInput(), 10)->getWrappedElement()->getAttribute("disabled"), "disabled"); Assert::assertEquals( - $this->actor->find(self::shareWithInput(), 10)->getWrappedElement()->getAttribute("placeholder"), "Resharing is not allowed"); + $this->actor->find(self::shareWithInput(), 10)->getWrappedElement()->getAttribute("placeholder"), "Resharing is not allowed"); } /** @@ -566,9 +566,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { */ public function iSeeThatResharingTheFileByLinkIsNotAvailable() { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::shareLinkAddNewButton(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::shareLinkAddNewButton(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The add new share link button is still shown after $timeout seconds"); } } @@ -581,7 +581,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertEquals( - $this->actor->find(self::canEditCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->getWrappedElement()->getAttribute("disabled"), "disabled"); + $this->actor->find(self::canEditCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->getWrappedElement()->getAttribute("disabled"), "disabled"); } /** @@ -592,7 +592,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertTrue( - $this->actor->find(self::canEditCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); + $this->actor->find(self::canEditCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); } /** @@ -603,7 +603,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertFalse( - $this->actor->find(self::canEditCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); + $this->actor->find(self::canEditCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); } /** @@ -614,7 +614,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertEquals( - $this->actor->find(self::canCreateCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->getWrappedElement()->getAttribute("disabled"), "disabled"); + $this->actor->find(self::canCreateCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->getWrappedElement()->getAttribute("disabled"), "disabled"); } /** @@ -625,7 +625,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertTrue( - $this->actor->find(self::canCreateCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); + $this->actor->find(self::canCreateCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); } /** @@ -636,7 +636,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertFalse( - $this->actor->find(self::canCreateCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); + $this->actor->find(self::canCreateCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); } /** @@ -647,9 +647,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::canReshareCheckbox($sharedWithName, $shareWithMenuTriggerElement), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::canReshareCheckbox($sharedWithName, $shareWithMenuTriggerElement), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The resharing checkbox for $sharedWithName is still shown after $timeout seconds"); } } @@ -662,7 +662,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertTrue( - $this->actor->find(self::canReshareCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); + $this->actor->find(self::canReshareCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); } /** @@ -673,7 +673,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertFalse( - $this->actor->find(self::canReshareCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); + $this->actor->find(self::canReshareCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); } /** @@ -719,9 +719,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { } if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::disabledPasswordProtectField($shareLinkMenuTriggerElement), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::disabledPasswordProtectField($shareLinkMenuTriggerElement), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The password protect field is still disabled after $timeout seconds"); } } @@ -766,7 +766,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareLinkMenuTriggerElement = $this->actor->find(self::shareLinkMenuTrigger(), 10); try { Assert::assertFalse( - $this->actor->find(self::passwordProtectByTalkCheckbox($shareLinkMenuTriggerElement))->isVisible()); + $this->actor->find(self::passwordProtectByTalkCheckbox($shareLinkMenuTriggerElement))->isVisible()); } catch (NoSuchElementException $exception) { } } @@ -788,9 +788,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { // case it is in the process of being hidden due to a previous action, // in which case it is shown again. if (WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::shareLinkMenu($shareLinkMenuTriggerElement), - $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::shareLinkMenu($shareLinkMenuTriggerElement), + $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { $this->actor->find(self::shareLinkMenuButton(), 10)->click(); } } @@ -803,9 +803,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { // case it is in the process of being hidden due to a previous action, // in which case it is shown again. if (WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::shareWithMenu($shareWithName, $shareWithMenuTriggerElement), - $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::shareWithMenu($shareWithName, $shareWithMenuTriggerElement), + $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { $this->actor->find(self::shareWithMenuButton($shareWithName), 10)->click(); } } diff --git a/tests/acceptance/features/bootstrap/LoginPageContext.php b/tests/acceptance/features/bootstrap/LoginPageContext.php index 01ad34ba149..fc924bbff80 100644 --- a/tests/acceptance/features/bootstrap/LoginPageContext.php +++ b/tests/acceptance/features/bootstrap/LoginPageContext.php @@ -80,8 +80,8 @@ class LoginPageContext implements Context, ActorAwareInterface { */ public function iSeeThatTheCurrentPageIsTheLoginPage() { Assert::assertStringStartsWith( - $this->actor->locatePath("/login"), - $this->actor->getSession()->getCurrentUrl()); + $this->actor->locatePath("/login"), + $this->actor->getSession()->getCurrentUrl()); } /** @@ -89,7 +89,7 @@ class LoginPageContext implements Context, ActorAwareInterface { */ public function iSeeThatAWrongPasswordMessageIsShown() { Assert::assertTrue( - $this->actor->find(self::wrongPasswordMessage(), 10)->isVisible()); + $this->actor->find(self::wrongPasswordMessage(), 10)->isVisible()); } /** @@ -97,7 +97,7 @@ class LoginPageContext implements Context, ActorAwareInterface { */ public function iSeeThatTheDisabledUserMessageIsShown() { Assert::assertTrue( - $this->actor->find(self::userDisabledMessage(), 10)->isVisible()); + $this->actor->find(self::userDisabledMessage(), 10)->isVisible()); } /** diff --git a/tests/acceptance/features/bootstrap/PublicShareContext.php b/tests/acceptance/features/bootstrap/PublicShareContext.php index d31d6541335..ce25afa792b 100644 --- a/tests/acceptance/features/bootstrap/PublicShareContext.php +++ b/tests/acceptance/features/bootstrap/PublicShareContext.php @@ -145,8 +145,8 @@ class PublicShareContext implements Context, ActorAwareInterface { */ public function iSeeThatTheCurrentPageIsTheAuthenticatePageForTheSharedLinkIWroteDown() { Assert::assertEquals( - $this->actor->getSharedNotebook()["shared link"] . "/authenticate/showShare", - $this->actor->getSession()->getCurrentUrl()); + $this->actor->getSharedNotebook()["shared link"] . "/authenticate/showShare", + $this->actor->getSession()->getCurrentUrl()); } /** @@ -154,8 +154,8 @@ class PublicShareContext implements Context, ActorAwareInterface { */ public function iSeeThatTheCurrentPageIsTheAuthenticatePageForTheDirectDownloadSharedLinkIWroteDown() { Assert::assertEquals( - $this->actor->getSharedNotebook()["shared link"] . "/authenticate/downloadShare", - $this->actor->getSession()->getCurrentUrl()); + $this->actor->getSharedNotebook()["shared link"] . "/authenticate/downloadShare", + $this->actor->getSession()->getCurrentUrl()); } /** @@ -163,8 +163,8 @@ class PublicShareContext implements Context, ActorAwareInterface { */ public function iSeeThatTheCurrentPageIsTheSharedLinkIWroteDown() { Assert::assertEquals( - $this->actor->getSharedNotebook()["shared link"], - $this->actor->getSession()->getCurrentUrl()); + $this->actor->getSharedNotebook()["shared link"], + $this->actor->getSession()->getCurrentUrl()); $this->setFileListAncestorForActor(null, $this->actor); } @@ -174,8 +174,8 @@ class PublicShareContext implements Context, ActorAwareInterface { */ public function iSeeThatTheCurrentPageIsTheDirectDownloadSharedLinkIWroteDown() { Assert::assertEquals( - $this->actor->getSharedNotebook()["shared link"] . "/download", - $this->actor->getSession()->getCurrentUrl()); + $this->actor->getSharedNotebook()["shared link"] . "/download", + $this->actor->getSession()->getCurrentUrl()); } /** @@ -183,7 +183,7 @@ class PublicShareContext implements Context, ActorAwareInterface { */ public function iSeeThatAWrongPasswordForTheSharedFileMessageIsShown() { Assert::assertTrue( - $this->actor->find(self::wrongPasswordMessage(), 10)->isVisible()); + $this->actor->find(self::wrongPasswordMessage(), 10)->isVisible()); } /** @@ -194,7 +194,7 @@ class PublicShareContext implements Context, ActorAwareInterface { // the element could be found when it was no made visible yet due to the // command not having been processed by the browser. if (!WaitFor::elementToBeEventuallyShown( - $this->actor, self::shareMenu(), $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, self::shareMenu(), $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The Share menu is not visible yet after $timeout seconds"); } @@ -202,14 +202,14 @@ class PublicShareContext implements Context, ActorAwareInterface { // download item should not be shown in the menu (although it will be in // the DOM). Assert::assertFalse( - $this->actor->find(self::downloadItemInShareMenu())->isVisible(), - "Download item in share menu is visible"); + $this->actor->find(self::downloadItemInShareMenu())->isVisible(), + "Download item in share menu is visible"); Assert::assertTrue( - $this->actor->find(self::directLinkItemInShareMenu())->isVisible(), - "Direct link item in share menu is not visible"); + $this->actor->find(self::directLinkItemInShareMenu())->isVisible(), + "Direct link item in share menu is not visible"); Assert::assertTrue( - $this->actor->find(self::saveItemInShareMenu())->isVisible(), - "Save item in share menu is not visible"); + $this->actor->find(self::saveItemInShareMenu())->isVisible(), + "Save item in share menu is not visible"); } /** @@ -218,7 +218,7 @@ class PublicShareContext implements Context, ActorAwareInterface { public function iSeeThatTheShareMenuButtonIsNotShown() { try { Assert::assertFalse( - $this->actor->find(self::shareMenuButton())->isVisible()); + $this->actor->find(self::shareMenuButton())->isVisible()); } catch (NoSuchElementException $exception) { } } @@ -235,7 +235,7 @@ class PublicShareContext implements Context, ActorAwareInterface { */ public function iSeeThatTheDownloadButtonIsShown() { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, self::downloadButton(), $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, self::downloadButton(), $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The download button is not visible yet after $timeout seconds"); } } @@ -246,7 +246,7 @@ class PublicShareContext implements Context, ActorAwareInterface { public function iSeeThatTheDownloadButtonIsNotShown() { try { Assert::assertFalse( - $this->actor->find(self::downloadButton())->isVisible()); + $this->actor->find(self::downloadButton())->isVisible()); } catch (NoSuchElementException $exception) { } } diff --git a/tests/acceptance/features/bootstrap/SearchContext.php b/tests/acceptance/features/bootstrap/SearchContext.php index db7aeb90ffe..f776c078c68 100644 --- a/tests/acceptance/features/bootstrap/SearchContext.php +++ b/tests/acceptance/features/bootstrap/SearchContext.php @@ -101,7 +101,7 @@ class SearchContext implements Context, ActorAwareInterface { */ public function iSeeThatTheSearchResultIs($number, $name) { Assert::assertEquals( - $name, $this->actor->find(self::searchResultName($number), 10)->getText()); + $name, $this->actor->find(self::searchResultName($number), 10)->getText()); } /** @@ -109,6 +109,6 @@ class SearchContext implements Context, ActorAwareInterface { */ public function iSeeThatTheSearchResultWasFoundIn($number, $path) { Assert::assertEquals( - $path, $this->actor->find(self::searchResultPath($number), 10)->getText()); + $path, $this->actor->find(self::searchResultPath($number), 10)->getText()); } } diff --git a/tests/acceptance/features/bootstrap/SettingsContext.php b/tests/acceptance/features/bootstrap/SettingsContext.php index 1e0eadd044a..ae1a559a360 100644 --- a/tests/acceptance/features/bootstrap/SettingsContext.php +++ b/tests/acceptance/features/bootstrap/SettingsContext.php @@ -182,7 +182,7 @@ class SettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatSharesAreAcceptedByDefault() { Assert::assertTrue( - $this->actor->find(self::acceptSharesByDefaultCheckboxInput(), 10)->isChecked()); + $this->actor->find(self::acceptSharesByDefaultCheckboxInput(), 10)->isChecked()); } /** @@ -190,7 +190,7 @@ class SettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatResharingIsEnabled() { Assert::assertTrue( - $this->actor->find(self::allowResharingCheckboxInput(), 10)->isChecked()); + $this->actor->find(self::allowResharingCheckboxInput(), 10)->isChecked()); } /** @@ -198,7 +198,7 @@ class SettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatResharingIsDisabled() { Assert::assertFalse( - $this->actor->find(self::allowResharingCheckboxInput(), 10)->isChecked()); + $this->actor->find(self::allowResharingCheckboxInput(), 10)->isChecked()); } /** @@ -206,7 +206,7 @@ class SettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatUsernameAutocompletionIsRestrictedToGroups() { Assert::assertTrue( - $this->actor->find(self::restrictUsernameAutocompletionToGroupsCheckboxInput(), 10)->isChecked()); + $this->actor->find(self::restrictUsernameAutocompletionToGroupsCheckboxInput(), 10)->isChecked()); } /** @@ -214,7 +214,7 @@ class SettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatUsernameAutocompletionIsNotRestrictedToGroups() { Assert::assertFalse( - $this->actor->find(self::restrictUsernameAutocompletionToGroupsCheckboxInput(), 10)->isChecked()); + $this->actor->find(self::restrictUsernameAutocompletionToGroupsCheckboxInput(), 10)->isChecked()); } /** @@ -222,7 +222,7 @@ class SettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatSharesAreNotAcceptedByDefault() { Assert::assertFalse( - $this->actor->find(self::acceptSharesByDefaultCheckboxInput(), 10)->isChecked()); + $this->actor->find(self::acceptSharesByDefaultCheckboxInput(), 10)->isChecked()); } /** diff --git a/tests/acceptance/features/bootstrap/SettingsMenuContext.php b/tests/acceptance/features/bootstrap/SettingsMenuContext.php index f89d8782198..eaf667d4423 100644 --- a/tests/acceptance/features/bootstrap/SettingsMenuContext.php +++ b/tests/acceptance/features/bootstrap/SettingsMenuContext.php @@ -165,7 +165,7 @@ class SettingsMenuContext implements Context, ActorAwareInterface { */ public function iSeeThatTheSettingsMenuIsShown() { Assert::assertTrue( - $this->actor->find(self::settingsMenu(), 10)->isVisible()); + $this->actor->find(self::settingsMenu(), 10)->isVisible()); } /** @@ -180,7 +180,7 @@ class SettingsMenuContext implements Context, ActorAwareInterface { */ public function iSeeThatTheItemInTheSettingsMenuIsShown($itemText) { Assert::assertTrue( - $this->actor->find(self::menuItemFor($itemText), 10)->isVisible()); + $this->actor->find(self::menuItemFor($itemText), 10)->isVisible()); } /** @@ -191,7 +191,7 @@ class SettingsMenuContext implements Context, ActorAwareInterface { try { Assert::assertFalse( - $this->actor->find(self::menuItemFor($itemText))->isVisible()); + $this->actor->find(self::menuItemFor($itemText))->isVisible()); } catch (NoSuchElementException $exception) { } } diff --git a/tests/acceptance/features/bootstrap/ToastContext.php b/tests/acceptance/features/bootstrap/ToastContext.php index 3dc941901c1..7ca3df2f47e 100644 --- a/tests/acceptance/features/bootstrap/ToastContext.php +++ b/tests/acceptance/features/bootstrap/ToastContext.php @@ -49,6 +49,6 @@ class ToastContext implements Context, ActorAwareInterface { */ public function iSeeThatTheToastIsShown($message) { Assert::assertTrue($this->actor->find( - self::toastMessage($message), 10)->isVisible()); + self::toastMessage($message), 10)->isVisible()); } } diff --git a/tests/acceptance/features/bootstrap/UsersSettingsContext.php b/tests/acceptance/features/bootstrap/UsersSettingsContext.php index 4d17b3b5118..33c47850202 100644 --- a/tests/acceptance/features/bootstrap/UsersSettingsContext.php +++ b/tests/acceptance/features/bootstrap/UsersSettingsContext.php @@ -270,9 +270,9 @@ class UsersSettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatTheListOfUsersContainsTheUser($user) { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::rowForUser($user), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::rowForUser($user), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The user $user in the list of users is not shown yet after $timeout seconds"); } } @@ -282,9 +282,9 @@ class UsersSettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatTheListOfUsersDoesNotContainsTheUser($user) { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::rowForUser($user), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::rowForUser($user), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The user $user in the list of users is still shown after $timeout seconds"); } } @@ -294,9 +294,9 @@ class UsersSettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatTheNewUserFormIsShown() { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::newUserForm(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::newUserForm(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The new user form is not shown yet after $timeout seconds"); } } @@ -352,9 +352,9 @@ class UsersSettingsContext implements Context, ActorAwareInterface { } if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::classCellForUser($cell . ' icon-loading-small', $user), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::classCellForUser($cell . ' icon-loading-small', $user), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The loading icon for user $user is still shown after $timeout seconds"); } } @@ -372,9 +372,9 @@ class UsersSettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatTheEditModeIsOn($user) { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::editModeOn($user), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::editModeOn($user), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The edit mode for user $user in the list of users is not on yet after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/WaitFor.php b/tests/acceptance/features/bootstrap/WaitFor.php index b07586c4662..37a268360aa 100644 --- a/tests/acceptance/features/bootstrap/WaitFor.php +++ b/tests/acceptance/features/bootstrap/WaitFor.php @@ -25,7 +25,6 @@ * Helper class with common "wait for" functions. */ class WaitFor { - /** * Waits for the element to be visible. * diff --git a/tests/acceptance/features/core/Actor.php b/tests/acceptance/features/core/Actor.php index ea33e7df21e..abe9a390920 100644 --- a/tests/acceptance/features/core/Actor.php +++ b/tests/acceptance/features/core/Actor.php @@ -59,7 +59,6 @@ * performs them. */ class Actor { - /** * @var string */ diff --git a/tests/acceptance/features/core/ActorAware.php b/tests/acceptance/features/core/ActorAware.php index 5a1a7542355..c734d7e1906 100644 --- a/tests/acceptance/features/core/ActorAware.php +++ b/tests/acceptance/features/core/ActorAware.php @@ -22,7 +22,6 @@ */ trait ActorAware { - /** * @var Actor */ diff --git a/tests/acceptance/features/core/ActorAwareInterface.php b/tests/acceptance/features/core/ActorAwareInterface.php index 37261773cbb..7b855aed4d3 100644 --- a/tests/acceptance/features/core/ActorAwareInterface.php +++ b/tests/acceptance/features/core/ActorAwareInterface.php @@ -22,7 +22,6 @@ */ interface ActorAwareInterface { - /** * @param Actor $actor */ diff --git a/tests/acceptance/features/core/ActorContext.php b/tests/acceptance/features/core/ActorContext.php index aa538f06069..7f152a1f3eb 100644 --- a/tests/acceptance/features/core/ActorContext.php +++ b/tests/acceptance/features/core/ActorContext.php @@ -48,7 +48,6 @@ use Behat\MinkExtension\Context\RawMinkContext; * are stopped after each scenario is run. */ class ActorContext extends RawMinkContext { - /** * @var array */ diff --git a/tests/acceptance/features/core/ElementFinder.php b/tests/acceptance/features/core/ElementFinder.php index 9981321c90d..714b100bfa2 100644 --- a/tests/acceptance/features/core/ElementFinder.php +++ b/tests/acceptance/features/core/ElementFinder.php @@ -44,7 +44,6 @@ * NoSuchElementException is thrown. */ class ElementFinder { - /** * Finds an element in the given Mink Session. * diff --git a/tests/acceptance/features/core/ElementWrapper.php b/tests/acceptance/features/core/ElementWrapper.php index 89a73d5aa79..6ac9a6b8e8f 100644 --- a/tests/acceptance/features/core/ElementWrapper.php +++ b/tests/acceptance/features/core/ElementWrapper.php @@ -90,7 +90,6 @@ * the ElementWrapper). */ class ElementWrapper { - /** * @var ElementFinder */ diff --git a/tests/acceptance/features/core/Locator.php b/tests/acceptance/features/core/Locator.php index dd971147f86..1b933399e6b 100644 --- a/tests/acceptance/features/core/Locator.php +++ b/tests/acceptance/features/core/Locator.php @@ -29,7 +29,6 @@ * fluent interface with Locator::forThe(). */ class Locator { - /** * @var string */ @@ -102,7 +101,6 @@ class Locator { } class LocatorBuilder { - /** * @param string $selector * @param string|array $locator @@ -242,7 +240,6 @@ class LocatorBuilder { } class LocatorBuilderSecondStep { - /** * @var string */ @@ -280,7 +277,6 @@ class LocatorBuilderSecondStep { } class LocatorBuilderThirdStep { - /** * @var string */ diff --git a/tests/acceptance/features/core/NextcloudTestServerContext.php b/tests/acceptance/features/core/NextcloudTestServerContext.php index 682811248e1..d0dc0c32181 100644 --- a/tests/acceptance/features/core/NextcloudTestServerContext.php +++ b/tests/acceptance/features/core/NextcloudTestServerContext.php @@ -59,7 +59,6 @@ use Behat\Behat\Hook\Scope\BeforeScenarioScope; * - second-parameter-value */ class NextcloudTestServerContext implements Context { - /** * @var NextcloudTestServerHelper */ diff --git a/tests/acceptance/features/core/NextcloudTestServerHelper.php b/tests/acceptance/features/core/NextcloudTestServerHelper.php index cd50616e34c..69b8ce70505 100644 --- a/tests/acceptance/features/core/NextcloudTestServerHelper.php +++ b/tests/acceptance/features/core/NextcloudTestServerHelper.php @@ -46,7 +46,6 @@ * nothing to be explicitly catched a plain base Exception is used. */ interface NextcloudTestServerHelper { - /** * Sets up the Nextcloud test server. * diff --git a/tests/acceptance/features/core/NextcloudTestServerLocalApacheHelper.php b/tests/acceptance/features/core/NextcloudTestServerLocalApacheHelper.php index 36cffc325dc..367e950931d 100644 --- a/tests/acceptance/features/core/NextcloudTestServerLocalApacheHelper.php +++ b/tests/acceptance/features/core/NextcloudTestServerLocalApacheHelper.php @@ -47,7 +47,6 @@ * server can be got from "getBaseUrl". */ class NextcloudTestServerLocalApacheHelper implements NextcloudTestServerHelper { - /** * @var string */ diff --git a/tests/acceptance/features/core/NextcloudTestServerLocalBuiltInHelper.php b/tests/acceptance/features/core/NextcloudTestServerLocalBuiltInHelper.php index ce81881c9c4..a1ab1f8720a 100644 --- a/tests/acceptance/features/core/NextcloudTestServerLocalBuiltInHelper.php +++ b/tests/acceptance/features/core/NextcloudTestServerLocalBuiltInHelper.php @@ -44,7 +44,6 @@ * server can be got from "getBaseUrl". */ class NextcloudTestServerLocalBuiltInHelper implements NextcloudTestServerHelper { - /** * @var string */ diff --git a/tests/acceptance/features/core/NoSuchElementException.php b/tests/acceptance/features/core/NoSuchElementException.php index dca884556ad..35583c7e63f 100644 --- a/tests/acceptance/features/core/NoSuchElementException.php +++ b/tests/acceptance/features/core/NoSuchElementException.php @@ -25,7 +25,6 @@ * Exception to signal that the element looked for could not be found. */ class NoSuchElementException extends \Exception { - /** * @param string $message * @param null|\Exception $previous diff --git a/tests/acceptance/features/core/Utils.php b/tests/acceptance/features/core/Utils.php index 1650df4f824..eb7c65e993a 100644 --- a/tests/acceptance/features/core/Utils.php +++ b/tests/acceptance/features/core/Utils.php @@ -22,7 +22,6 @@ */ class Utils { - /** * Waits at most $timeout seconds for the given condition to be true, * checking it again every $timeoutStep seconds. diff --git a/tests/lib/APITest.php b/tests/lib/APITest.php index 22d1270ccd6..5e29629c92e 100644 --- a/tests/lib/APITest.php +++ b/tests/lib/APITest.php @@ -11,7 +11,6 @@ namespace Test; use OCP\IRequest; class APITest extends \Test\TestCase { - // Helps build a response variable /** diff --git a/tests/lib/Accounts/HooksTest.php b/tests/lib/Accounts/HooksTest.php index d5c7cd60b1b..0907f31d842 100644 --- a/tests/lib/Accounts/HooksTest.php +++ b/tests/lib/Accounts/HooksTest.php @@ -38,7 +38,6 @@ use Test\TestCase; * @group DB */ class HooksTest extends TestCase { - /** @var LoggerInterface|MockObject */ private $logger; diff --git a/tests/lib/Activity/ManagerTest.php b/tests/lib/Activity/ManagerTest.php index f8b34b4c716..9a39f21f4e5 100644 --- a/tests/lib/Activity/ManagerTest.php +++ b/tests/lib/Activity/ManagerTest.php @@ -32,7 +32,6 @@ use OCP\RichObjectStrings\IValidator; use Test\TestCase; class ManagerTest extends TestCase { - /** @var \OC\Activity\Manager */ private $activityManager; diff --git a/tests/lib/AllConfigTest.php b/tests/lib/AllConfigTest.php index 8570b94456f..fca4e8d8308 100644 --- a/tests/lib/AllConfigTest.php +++ b/tests/lib/AllConfigTest.php @@ -20,7 +20,6 @@ use OC\SystemConfig; use OCP\IDBConnection; class AllConfigTest extends \Test\TestCase { - /** @var \OCP\IDBConnection */ protected $connection; @@ -52,9 +51,9 @@ class AllConfigTest extends \Test\TestCase { $config->deleteUserValue('userDelete', 'appDelete', 'keyDelete'); $result = $this->connection->executeQuery( - 'SELECT COUNT(*) AS `count` FROM `*PREFIX*preferences` WHERE `userid` = ?', - ['userDelete'] - )->fetch(); + 'SELECT COUNT(*) AS `count` FROM `*PREFIX*preferences` WHERE `userid` = ?', + ['userDelete'] + )->fetch(); $actualCount = $result['count']; $this->assertEquals(0, $actualCount, 'There was one value in the database and after the tests there should be no entry left.'); diff --git a/tests/lib/App/CompareVersionTest.php b/tests/lib/App/CompareVersionTest.php index cec4f1114df..0988304f8fc 100644 --- a/tests/lib/App/CompareVersionTest.php +++ b/tests/lib/App/CompareVersionTest.php @@ -31,7 +31,6 @@ use OC\App\CompareVersion; use Test\TestCase; class CompareVersionTest extends TestCase { - /** @var CompareVersion */ private $compare; diff --git a/tests/lib/App/DependencyAnalyzerTest.php b/tests/lib/App/DependencyAnalyzerTest.php index 75cc991cf99..f2ae412c2f6 100644 --- a/tests/lib/App/DependencyAnalyzerTest.php +++ b/tests/lib/App/DependencyAnalyzerTest.php @@ -16,7 +16,6 @@ use OCP\IL10N; use Test\TestCase; class DependencyAnalyzerTest extends TestCase { - /** @var Platform|\PHPUnit\Framework\MockObject\MockObject */ private $platformMock; diff --git a/tests/lib/App/PlatformRepositoryTest.php b/tests/lib/App/PlatformRepositoryTest.php index 6bc256c20b0..51884b26e71 100644 --- a/tests/lib/App/PlatformRepositoryTest.php +++ b/tests/lib/App/PlatformRepositoryTest.php @@ -12,7 +12,6 @@ namespace Test\App; use OC; class PlatformRepositoryTest extends \Test\TestCase { - /** * @dataProvider providesVersions * @param $expected diff --git a/tests/lib/AppFramework/Bootstrap/BootContextTest.php b/tests/lib/AppFramework/Bootstrap/BootContextTest.php index b566347e3ff..86f653604a9 100644 --- a/tests/lib/AppFramework/Bootstrap/BootContextTest.php +++ b/tests/lib/AppFramework/Bootstrap/BootContextTest.php @@ -32,7 +32,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class BootContextTest extends TestCase { - /** @var IAppContainer|MockObject */ private $appContainer; diff --git a/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php b/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php index 5a151806adf..a706abecc4f 100644 --- a/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php +++ b/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php @@ -42,7 +42,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class CoordinatorTest extends TestCase { - /** @var IAppManager|MockObject */ private $appManager; diff --git a/tests/lib/AppFramework/Bootstrap/FunctionInjectorTest.php b/tests/lib/AppFramework/Bootstrap/FunctionInjectorTest.php index cd2332b0588..909a98f97c8 100644 --- a/tests/lib/AppFramework/Bootstrap/FunctionInjectorTest.php +++ b/tests/lib/AppFramework/Bootstrap/FunctionInjectorTest.php @@ -33,7 +33,6 @@ interface Foo { } class FunctionInjectorTest extends TestCase { - /** @var SimpleContainer */ private $container; diff --git a/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php b/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php index 81fac49348b..22111f5b68e 100644 --- a/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php +++ b/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php @@ -35,7 +35,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class RegistrationContextTest extends TestCase { - /** @var LoggerInterface|MockObject */ private $logger; diff --git a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php index c8adef80966..e996f287c16 100644 --- a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php +++ b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php @@ -31,7 +31,6 @@ use OCP\ISession; use OCP\IURLGenerator; class AuthPublicShareControllerTest extends \Test\TestCase { - /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ diff --git a/tests/lib/AppFramework/Controller/ControllerTest.php b/tests/lib/AppFramework/Controller/ControllerTest.php index 4d36fcadce1..1f347cea535 100644 --- a/tests/lib/AppFramework/Controller/ControllerTest.php +++ b/tests/lib/AppFramework/Controller/ControllerTest.php @@ -56,7 +56,6 @@ class ChildController extends Controller { }; class ControllerTest extends \Test\TestCase { - /** * @var Controller */ diff --git a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php b/tests/lib/AppFramework/Controller/PublicShareControllerTest.php index deffedcec05..9c03ba4cb6e 100644 --- a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php +++ b/tests/lib/AppFramework/Controller/PublicShareControllerTest.php @@ -28,7 +28,6 @@ use OCP\IRequest; use OCP\ISession; class TestController extends PublicShareController { - /** @var string */ private $hash; @@ -56,7 +55,6 @@ class TestController extends PublicShareController { } class PublicShareControllerTest extends \Test\TestCase { - /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ diff --git a/tests/lib/AppFramework/Db/QBMapperTest.php b/tests/lib/AppFramework/Db/QBMapperTest.php index 96d319923b3..82830dcc05a 100644 --- a/tests/lib/AppFramework/Db/QBMapperTest.php +++ b/tests/lib/AppFramework/Db/QBMapperTest.php @@ -80,7 +80,6 @@ class QBTestMapper extends QBMapper { * @package Test\AppFramework\Db */ class QBMapperTest extends \Test\TestCase { - /** * @var \PHPUnit\Framework\MockObject\MockObject|IDBConnection */ diff --git a/tests/lib/AppFramework/Db/TransactionalTest.php b/tests/lib/AppFramework/Db/TransactionalTest.php index 060badca0eb..fc2d4121382 100644 --- a/tests/lib/AppFramework/Db/TransactionalTest.php +++ b/tests/lib/AppFramework/Db/TransactionalTest.php @@ -31,7 +31,6 @@ use RuntimeException; use Test\TestCase; class TransactionalTest extends TestCase { - /** @var IDBConnection|MockObject */ private IDBConnection $db; diff --git a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php index 9a3d40d1c6b..69367ad6ce2 100644 --- a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php +++ b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php @@ -36,7 +36,6 @@ use OCP\IRequestId; * @group DB */ class DIContainerTest extends \Test\TestCase { - /** @var DIContainer|\PHPUnit\Framework\MockObject\MockObject */ private $container; diff --git a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php index 78a1d40bea6..369a30ba7a3 100644 --- a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php +++ b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php @@ -52,7 +52,6 @@ class ClassB { } class DIIntergrationTests extends TestCase { - /** @var DIContainer */ private $container; diff --git a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php index a96cd4a163b..5c3f3ead5b0 100644 --- a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php +++ b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php @@ -16,7 +16,6 @@ use OCP\AppFramework\Http\ContentSecurityPolicy; * @package OC\AppFramework\Http */ class ContentSecurityPolicyTest extends \Test\TestCase { - /** @var ContentSecurityPolicy */ private $contentSecurityPolicy; diff --git a/tests/lib/AppFramework/Http/DataResponseTest.php b/tests/lib/AppFramework/Http/DataResponseTest.php index f933b3102b7..575698dd878 100644 --- a/tests/lib/AppFramework/Http/DataResponseTest.php +++ b/tests/lib/AppFramework/Http/DataResponseTest.php @@ -28,7 +28,6 @@ use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; class DataResponseTest extends \Test\TestCase { - /** * @var DataResponse */ diff --git a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php index 5fe81bb0136..68e54886527 100644 --- a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php +++ b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php @@ -16,7 +16,6 @@ use OCP\AppFramework\Http\EmptyContentSecurityPolicy; * @package OC\AppFramework\Http */ class EmptyContentSecurityPolicyTest extends \Test\TestCase { - /** @var EmptyContentSecurityPolicy */ private $contentSecurityPolicy; diff --git a/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php b/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php index 18c255463c5..6ced435286c 100644 --- a/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php +++ b/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php @@ -28,7 +28,6 @@ namespace Test\AppFramework\Http; use OCP\AppFramework\Http\EmptyFeaturePolicy; class EmptyFeaturePolicyTest extends \Test\TestCase { - /** @var EmptyFeaturePolicy */ private $policy; diff --git a/tests/lib/AppFramework/Http/FeaturePolicyTest.php b/tests/lib/AppFramework/Http/FeaturePolicyTest.php index 869650f42b1..60ddca7481b 100644 --- a/tests/lib/AppFramework/Http/FeaturePolicyTest.php +++ b/tests/lib/AppFramework/Http/FeaturePolicyTest.php @@ -28,7 +28,6 @@ namespace Test\AppFramework\Http; use OCP\AppFramework\Http\FeaturePolicy; class FeaturePolicyTest extends \Test\TestCase { - /** @var EmptyFeaturePolicy */ private $policy; diff --git a/tests/lib/AppFramework/Http/JSONResponseTest.php b/tests/lib/AppFramework/Http/JSONResponseTest.php index 8c8318eb602..82f00457907 100644 --- a/tests/lib/AppFramework/Http/JSONResponseTest.php +++ b/tests/lib/AppFramework/Http/JSONResponseTest.php @@ -29,7 +29,6 @@ use OCP\AppFramework\Http; use OCP\AppFramework\Http\JSONResponse; class JSONResponseTest extends \Test\TestCase { - /** * @var JSONResponse */ diff --git a/tests/lib/AppFramework/Http/RedirectResponseTest.php b/tests/lib/AppFramework/Http/RedirectResponseTest.php index 5130d36937f..c49c4a7c1f7 100644 --- a/tests/lib/AppFramework/Http/RedirectResponseTest.php +++ b/tests/lib/AppFramework/Http/RedirectResponseTest.php @@ -27,7 +27,6 @@ use OCP\AppFramework\Http; use OCP\AppFramework\Http\RedirectResponse; class RedirectResponseTest extends \Test\TestCase { - /** * @var RedirectResponse */ diff --git a/tests/lib/AppFramework/Http/ResponseTest.php b/tests/lib/AppFramework/Http/ResponseTest.php index c725e2fb602..c5d228e5753 100644 --- a/tests/lib/AppFramework/Http/ResponseTest.php +++ b/tests/lib/AppFramework/Http/ResponseTest.php @@ -28,7 +28,6 @@ use OCP\AppFramework\Http\Response; use OCP\AppFramework\Utility\ITimeFactory; class ResponseTest extends \Test\TestCase { - /** * @var \OCP\AppFramework\Http\Response */ diff --git a/tests/lib/AppFramework/Http/StreamResponseTest.php b/tests/lib/AppFramework/Http/StreamResponseTest.php index 97aced01506..3c0105ad145 100644 --- a/tests/lib/AppFramework/Http/StreamResponseTest.php +++ b/tests/lib/AppFramework/Http/StreamResponseTest.php @@ -28,7 +28,6 @@ use OCP\AppFramework\Http\IOutput; use OCP\AppFramework\Http\StreamResponse; class StreamResponseTest extends \Test\TestCase { - /** @var IOutput */ private $output; diff --git a/tests/lib/AppFramework/Http/TemplateResponseTest.php b/tests/lib/AppFramework/Http/TemplateResponseTest.php index 6cbf112494e..13eef5c7c22 100644 --- a/tests/lib/AppFramework/Http/TemplateResponseTest.php +++ b/tests/lib/AppFramework/Http/TemplateResponseTest.php @@ -27,7 +27,6 @@ use OCP\AppFramework\Http; use OCP\AppFramework\Http\TemplateResponse; class TemplateResponseTest extends \Test\TestCase { - /** * @var \OCP\AppFramework\Http\TemplateResponse */ diff --git a/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php b/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php index 5127248215b..1cd6b614aad 100644 --- a/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php @@ -38,7 +38,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\EventDispatcher\EventDispatcherInterface; class AdditionalScriptsMiddlewareTest extends \Test\TestCase { - /** @var EventDispatcherInterface|MockObject */ private $legacyDispatcher; /** @var IUserSession|MockObject */ diff --git a/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php b/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php index 5dd13942097..79e07ac6686 100644 --- a/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php @@ -35,7 +35,6 @@ use OCP\AppFramework\Http\JSONResponse; use OCP\IRequest; class CompressionMiddlewareTest extends \Test\TestCase { - /** @var IRequest */ private $request; /** @var Controller */ diff --git a/tests/lib/AppFramework/Middleware/MiddlewareTest.php b/tests/lib/AppFramework/Middleware/MiddlewareTest.php index bd61aab4673..f9d8926db7e 100644 --- a/tests/lib/AppFramework/Middleware/MiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/MiddlewareTest.php @@ -36,7 +36,6 @@ class ChildMiddleware extends Middleware { class MiddlewareTest extends \Test\TestCase { - /** * @var Middleware */ diff --git a/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php b/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php index c62384302fb..3b69a289e99 100644 --- a/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php @@ -31,7 +31,6 @@ use OCP\AppFramework\Http; use OCP\IRequest; class NotModifiedMiddlewareTest extends \Test\TestCase { - /** @var IRequest */ private $request; /** @var Controller */ diff --git a/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php index 83b764f6c65..4839ff75b5e 100644 --- a/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php @@ -36,7 +36,6 @@ use OCP\AppFramework\OCSController; use OCP\IRequest; class OCSMiddlewareTest extends \Test\TestCase { - /** * @var IRequest */ diff --git a/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php b/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php index 7d07bffc46b..3e48078cbad 100644 --- a/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php @@ -38,7 +38,6 @@ use OCP\ISession; use OCP\IURLGenerator; class PublicShareMiddlewareTest extends \Test\TestCase { - /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ diff --git a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php index cc6c74c16c4..f3c1f7934ef 100644 --- a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php @@ -24,7 +24,6 @@ use OCP\IConfig; use OCP\IRequestId; class CORSMiddlewareTest extends \Test\TestCase { - /** @var ControllerMethodReflector */ private $reflector; /** @var Session|\PHPUnit\Framework\MockObject\MockObject */ diff --git a/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php index 2dfb04e138e..284634f7db2 100644 --- a/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php @@ -37,7 +37,6 @@ use OCP\AppFramework\Http\Response; use PHPUnit\Framework\MockObject\MockObject; class CSPMiddlewareTest extends \Test\TestCase { - /** @var CSPMiddleware|MockObject */ private $middleware; /** @var Controller|MockObject */ diff --git a/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php index 0a4b3c4f34c..154b43f69a5 100644 --- a/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php @@ -34,7 +34,6 @@ use OCP\AppFramework\Http\Response; use PHPUnit\Framework\MockObject\MockObject; class FeaturePolicyMiddlewareTest extends \Test\TestCase { - /** @var FeaturePolicyMiddleware|MockObject */ private $middleware; /** @var Controller|MockObject */ diff --git a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php index 61f5eeb5aea..787f5c92fd7 100644 --- a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php @@ -33,7 +33,6 @@ use OCP\AppFramework\Http; use Test\TestCase; class SameSiteCookieMiddlewareTest extends TestCase { - /** @var SameSiteCookieMiddleware */ private $middleware; diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php index 276ebe8f9ac..c68ada87657 100644 --- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php @@ -48,7 +48,6 @@ use OCP\IUserSession; use Psr\Log\LoggerInterface; class SecurityMiddlewareTest extends \Test\TestCase { - /** @var SecurityMiddleware|\PHPUnit\Framework\MockObject\MockObject */ private $middleware; /** @var Controller|\PHPUnit\Framework\MockObject\MockObject */ diff --git a/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php b/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php index be684e36013..9641042d1b9 100644 --- a/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php @@ -17,7 +17,6 @@ use OCP\AppFramework\Controller; use OCP\AppFramework\Http\Response; class SessionMiddlewareTest extends \Test\TestCase { - /** @var ControllerMethodReflector */ private $reflector; diff --git a/tests/lib/AppFramework/OCS/BaseResponseTest.php b/tests/lib/AppFramework/OCS/BaseResponseTest.php index aca8c355f41..9038aee6baf 100644 --- a/tests/lib/AppFramework/OCS/BaseResponseTest.php +++ b/tests/lib/AppFramework/OCS/BaseResponseTest.php @@ -30,7 +30,6 @@ use OC\AppFramework\OCS\BaseResponse; class BaseResponseTest extends \Test\TestCase { public function testToXml(): void { - /** @var BaseResponse $response */ $response = $this->createMock(BaseResponse::class); diff --git a/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php b/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php index 6bf683ef2ed..5452fb853b9 100644 --- a/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php +++ b/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php @@ -26,7 +26,6 @@ namespace Test\AppFramework\Utility; use OC\AppFramework\Utility\ControllerMethodReflector; class BaseController { - /** * @Annotation */ @@ -47,7 +46,6 @@ class BaseController { } class MiddleController extends BaseController { - /** * @NoAnnotation */ @@ -62,8 +60,6 @@ class EndController extends MiddleController { } class ControllerMethodReflectorTest extends \Test\TestCase { - - /** * @Annotation */ diff --git a/tests/lib/AppFramework/Utility/SimpleContainerTest.php b/tests/lib/AppFramework/Utility/SimpleContainerTest.php index 36fa1febfcf..8caaf517f5c 100644 --- a/tests/lib/AppFramework/Utility/SimpleContainerTest.php +++ b/tests/lib/AppFramework/Utility/SimpleContainerTest.php @@ -128,9 +128,9 @@ class SimpleContainerTest extends \Test\TestCase { public function testConstructorComplexInterface() { $this->container->registerParameter('test', 'abc'); $this->container->registerService( - 'Test\AppFramework\Utility\IInterfaceConstructor', function ($c) { - return $c->query('Test\AppFramework\Utility\ClassSimpleConstructor'); - }); + 'Test\AppFramework\Utility\IInterfaceConstructor', function ($c) { + return $c->query('Test\AppFramework\Utility\ClassSimpleConstructor'); + }); $object = $this->container->query( 'Test\AppFramework\Utility\ClassInterfaceConstructor' ); @@ -142,13 +142,13 @@ class SimpleContainerTest extends \Test\TestCase { public function testOverrideService() { $this->container->registerService( - 'Test\AppFramework\Utility\IInterfaceConstructor', function ($c) { - return $c->query('Test\AppFramework\Utility\ClassSimpleConstructor'); - }); + 'Test\AppFramework\Utility\IInterfaceConstructor', function ($c) { + return $c->query('Test\AppFramework\Utility\ClassSimpleConstructor'); + }); $this->container->registerService( - 'Test\AppFramework\Utility\IInterfaceConstructor', function ($c) { - return $c->query('Test\AppFramework\Utility\ClassEmptyConstructor'); - }); + 'Test\AppFramework\Utility\IInterfaceConstructor', function ($c) { + return $c->query('Test\AppFramework\Utility\ClassEmptyConstructor'); + }); $object = $this->container->query( 'Test\AppFramework\Utility\IInterfaceConstructor' ); diff --git a/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php b/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php index a5038dd23b2..daf8d272c2f 100644 --- a/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php +++ b/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php @@ -38,7 +38,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class RemoteWipeActivityListenerTest extends TestCase { - /** @var IActivityManager|MockObject */ private $activityManager; diff --git a/tests/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php b/tests/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php index 932097d875f..7a715dd3f0c 100644 --- a/tests/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php +++ b/tests/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php @@ -43,7 +43,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class RemoteWipeEmailListenerTest extends TestCase { - /** @var IMailer|MockObject */ private $mailer; diff --git a/tests/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php b/tests/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php index ef5545438c2..e5a329a4a7f 100644 --- a/tests/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php +++ b/tests/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php @@ -39,7 +39,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class RemoteWipeNotificationsListenerTest extends TestCase { - /** @var INotificationManager|MockObject */ private $notificationManager; diff --git a/tests/lib/Authentication/Listeners/UserDeletedTokenCleanupListenerTest.php b/tests/lib/Authentication/Listeners/UserDeletedTokenCleanupListenerTest.php index bf8405a4422..20b85a293d4 100644 --- a/tests/lib/Authentication/Listeners/UserDeletedTokenCleanupListenerTest.php +++ b/tests/lib/Authentication/Listeners/UserDeletedTokenCleanupListenerTest.php @@ -37,8 +37,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class UserDeletedTokenCleanupListenerTest extends TestCase { - - /** @var Manager|MockObject */ private $manager; diff --git a/tests/lib/Authentication/Login/ALoginCommandTest.php b/tests/lib/Authentication/Login/ALoginCommandTest.php index 7c66e102704..7d56a76e10c 100644 --- a/tests/lib/Authentication/Login/ALoginCommandTest.php +++ b/tests/lib/Authentication/Login/ALoginCommandTest.php @@ -32,7 +32,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; abstract class ALoginCommandTest extends TestCase { - /** @var IRequest|MockObject */ protected $request; diff --git a/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php b/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php index ded03cd95cd..1d6250415a9 100644 --- a/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php +++ b/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php @@ -30,7 +30,6 @@ use OCP\IConfig; use PHPUnit\Framework\MockObject\MockObject; class ClearLostPasswordTokensCommandTest extends ALoginCommandTest { - /** @var IConfig|MockObject */ private $config; diff --git a/tests/lib/Authentication/Login/CompleteLoginCommandTest.php b/tests/lib/Authentication/Login/CompleteLoginCommandTest.php index f90de10cdda..3f7f9e4fe73 100644 --- a/tests/lib/Authentication/Login/CompleteLoginCommandTest.php +++ b/tests/lib/Authentication/Login/CompleteLoginCommandTest.php @@ -30,7 +30,6 @@ use OC\User\Session; use PHPUnit\Framework\MockObject\MockObject; class CompleteLoginCommandTest extends ALoginCommandTest { - /** @var Session|MockObject */ private $session; diff --git a/tests/lib/Authentication/Login/CreateSessionTokenCommandTest.php b/tests/lib/Authentication/Login/CreateSessionTokenCommandTest.php index ef23e072c60..eb48463402d 100644 --- a/tests/lib/Authentication/Login/CreateSessionTokenCommandTest.php +++ b/tests/lib/Authentication/Login/CreateSessionTokenCommandTest.php @@ -32,7 +32,6 @@ use OCP\IConfig; use PHPUnit\Framework\MockObject\MockObject; class CreateSessionTokenCommandTest extends ALoginCommandTest { - /** @var IConfig|MockObject */ private $config; diff --git a/tests/lib/Authentication/Login/EmailLoginCommandTest.php b/tests/lib/Authentication/Login/EmailLoginCommandTest.php index 0e70c40a1df..4544aedec11 100644 --- a/tests/lib/Authentication/Login/EmailLoginCommandTest.php +++ b/tests/lib/Authentication/Login/EmailLoginCommandTest.php @@ -31,7 +31,6 @@ use OCP\IUserManager; use PHPUnit\Framework\MockObject\MockObject; class EmailLoginCommandTest extends ALoginCommandTest { - /** @var IUserManager|MockObject */ private $userManager; diff --git a/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php b/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php index e24a3ca8f8d..d6f18ad9eff 100644 --- a/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php +++ b/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php @@ -31,7 +31,6 @@ use OCP\IConfig; use PHPUnit\Framework\MockObject\MockObject; class FinishRememberedLoginCommandTest extends ALoginCommandTest { - /** @var Session|MockObject */ private $userSession; /** @var IConfig|MockObject */ diff --git a/tests/lib/Authentication/Login/LoggedInCheckCommandTest.php b/tests/lib/Authentication/Login/LoggedInCheckCommandTest.php index afe486ab095..d3ebf205943 100644 --- a/tests/lib/Authentication/Login/LoggedInCheckCommandTest.php +++ b/tests/lib/Authentication/Login/LoggedInCheckCommandTest.php @@ -32,7 +32,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Psr\Log\LoggerInterface; class LoggedInCheckCommandTest extends ALoginCommandTest { - /** @var LoggerInterface|MockObject */ private $logger; diff --git a/tests/lib/Authentication/Login/PreLoginHookCommandTest.php b/tests/lib/Authentication/Login/PreLoginHookCommandTest.php index d83717399d4..2e83ef51ffa 100644 --- a/tests/lib/Authentication/Login/PreLoginHookCommandTest.php +++ b/tests/lib/Authentication/Login/PreLoginHookCommandTest.php @@ -31,7 +31,6 @@ use OCP\IUserManager; use PHPUnit\Framework\MockObject\MockObject; class PreLoginHookCommandTest extends ALoginCommandTest { - /** @var IUserManager|MockObject */ private $userManager; diff --git a/tests/lib/Authentication/Login/SetUserTimezoneCommandTest.php b/tests/lib/Authentication/Login/SetUserTimezoneCommandTest.php index 8f7057e9d69..ae08b6205d5 100644 --- a/tests/lib/Authentication/Login/SetUserTimezoneCommandTest.php +++ b/tests/lib/Authentication/Login/SetUserTimezoneCommandTest.php @@ -31,7 +31,6 @@ use OCP\ISession; use PHPUnit\Framework\MockObject\MockObject; class SetUserTimezoneCommandTest extends ALoginCommandTest { - /** @var IConfig|MockObject */ private $config; diff --git a/tests/lib/Authentication/Login/TwoFactorCommandTest.php b/tests/lib/Authentication/Login/TwoFactorCommandTest.php index fd37712c130..679bae07351 100644 --- a/tests/lib/Authentication/Login/TwoFactorCommandTest.php +++ b/tests/lib/Authentication/Login/TwoFactorCommandTest.php @@ -35,7 +35,6 @@ use OCP\IURLGenerator; use PHPUnit\Framework\MockObject\MockObject; class TwoFactorCommandTest extends ALoginCommandTest { - /** @var Manager|MockObject */ private $twoFactorManager; diff --git a/tests/lib/Authentication/Login/UidLoginCommandTest.php b/tests/lib/Authentication/Login/UidLoginCommandTest.php index 1f00ba77da4..812215f266e 100644 --- a/tests/lib/Authentication/Login/UidLoginCommandTest.php +++ b/tests/lib/Authentication/Login/UidLoginCommandTest.php @@ -30,7 +30,6 @@ use OC\User\Manager; use PHPUnit\Framework\MockObject\MockObject; class UidLoginCommandTest extends ALoginCommandTest { - /** @var Manager|MockObject */ private $userManager; diff --git a/tests/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php b/tests/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php index 3ff82b38acc..07b32daa065 100644 --- a/tests/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php +++ b/tests/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php @@ -30,7 +30,6 @@ use OCP\ISession; use PHPUnit\Framework\MockObject\MockObject; class UpdateLastPasswordConfirmCommandTest extends ALoginCommandTest { - /** @var ISession|MockObject */ private $session; diff --git a/tests/lib/Authentication/Login/UserDisabledCheckCommandTest.php b/tests/lib/Authentication/Login/UserDisabledCheckCommandTest.php index 65cfd0a71ac..fe30d3b4fea 100644 --- a/tests/lib/Authentication/Login/UserDisabledCheckCommandTest.php +++ b/tests/lib/Authentication/Login/UserDisabledCheckCommandTest.php @@ -32,7 +32,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Psr\Log\LoggerInterface; class UserDisabledCheckCommandTest extends ALoginCommandTest { - /** @var IUserManager|MockObject */ private $userManager; diff --git a/tests/lib/Authentication/LoginCredentials/CredentialsTest.php b/tests/lib/Authentication/LoginCredentials/CredentialsTest.php index d3dcd9f4d6b..f550325a6dc 100644 --- a/tests/lib/Authentication/LoginCredentials/CredentialsTest.php +++ b/tests/lib/Authentication/LoginCredentials/CredentialsTest.php @@ -28,7 +28,6 @@ use OC\Authentication\LoginCredentials\Credentials; use Test\TestCase; class CredentialsTest extends TestCase { - /** @var string */ private $uid; diff --git a/tests/lib/Authentication/LoginCredentials/StoreTest.php b/tests/lib/Authentication/LoginCredentials/StoreTest.php index 797dbc08da9..80d64d5466f 100644 --- a/tests/lib/Authentication/LoginCredentials/StoreTest.php +++ b/tests/lib/Authentication/LoginCredentials/StoreTest.php @@ -38,7 +38,6 @@ use Test\TestCase; use function json_encode; class StoreTest extends TestCase { - /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ private $session; diff --git a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php index bfb92932e81..27646f19888 100644 --- a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php +++ b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php @@ -38,7 +38,6 @@ use Test\TestCase; * @group DB */ class PublicKeyTokenMapperTest extends TestCase { - /** @var PublicKeyTokenMapper */ private $mapper; diff --git a/tests/lib/Authentication/Token/RemoteWipeTest.php b/tests/lib/Authentication/Token/RemoteWipeTest.php index e2506562dd4..843dd4aec5c 100644 --- a/tests/lib/Authentication/Token/RemoteWipeTest.php +++ b/tests/lib/Authentication/Token/RemoteWipeTest.php @@ -40,7 +40,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class RemoteWipeTest extends TestCase { - /** @var ITokenProvider|MockObject */ private $tokenProvider; diff --git a/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php b/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php index 7975108c59b..4f1b8d25b58 100644 --- a/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php @@ -35,7 +35,6 @@ use Test\TestCase; * @group DB */ class ProviderUserAssignmentDaoTest extends TestCase { - /** @var IDBConnection */ private $dbConn; diff --git a/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php b/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php index ae6fadc790c..da11b11e537 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php @@ -44,7 +44,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Test\TestCase; class ManagerTest extends TestCase { - /** @var IUser|MockObject */ private $user; diff --git a/tests/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php b/tests/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php index 525defd671b..0119c977696 100644 --- a/tests/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php @@ -35,7 +35,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class MandatoryTwoFactorTest extends TestCase { - /** @var IConfig|MockObject */ private $config; diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php index d9c565a3f6d..b71339dd0ed 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php @@ -37,7 +37,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class ProviderLoaderTest extends TestCase { - /** @var IAppManager|MockObject */ private $appManager; diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php index 0c85d0cf1ba..65447e1d8d6 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php @@ -37,7 +37,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class ProviderManagerTest extends TestCase { - /** @var ProviderLoader|MockObject */ private $providerLoader; diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderSetTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderSetTest.php index ef221851894..f6afbf245ee 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ProviderSetTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ProviderSetTest.php @@ -32,7 +32,6 @@ use OCP\Authentication\TwoFactorAuth\IProvider; use Test\TestCase; class ProviderSetTest extends TestCase { - /** @var ProviderSet */ private $providerSet; diff --git a/tests/lib/Authentication/TwoFactorAuth/RegistryTest.php b/tests/lib/Authentication/TwoFactorAuth/RegistryTest.php index b0d0ef8efef..b6e0caff427 100644 --- a/tests/lib/Authentication/TwoFactorAuth/RegistryTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/RegistryTest.php @@ -38,7 +38,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class RegistryTest extends TestCase { - /** @var ProviderUserAssignmentDao|MockObject */ private $dao; diff --git a/tests/lib/Calendar/ManagerTest.php b/tests/lib/Calendar/ManagerTest.php index 540fd5c0c69..fcf6ab3a588 100644 --- a/tests/lib/Calendar/ManagerTest.php +++ b/tests/lib/Calendar/ManagerTest.php @@ -43,7 +43,6 @@ interface ICreateFromStringAndHandleImipMessage extends ICreateFromString, IHand } class ManagerTest extends TestCase { - /** @var Coordinator|MockObject */ private $coordinator; diff --git a/tests/lib/Calendar/Resource/ManagerTest.php b/tests/lib/Calendar/Resource/ManagerTest.php index 8753f547fb2..854f83af845 100644 --- a/tests/lib/Calendar/Resource/ManagerTest.php +++ b/tests/lib/Calendar/Resource/ManagerTest.php @@ -36,7 +36,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class ManagerTest extends TestCase { - /** @var Coordinator|MockObject */ private $coordinator; diff --git a/tests/lib/Calendar/Room/ManagerTest.php b/tests/lib/Calendar/Room/ManagerTest.php index 598415246dc..9309a3fa0bb 100644 --- a/tests/lib/Calendar/Room/ManagerTest.php +++ b/tests/lib/Calendar/Room/ManagerTest.php @@ -36,7 +36,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class ManagerTest extends TestCase { - /** @var Coordinator|MockObject */ private $coordinator; diff --git a/tests/lib/CapabilitiesManagerTest.php b/tests/lib/CapabilitiesManagerTest.php index ec07f3dfa36..690ee1496ac 100644 --- a/tests/lib/CapabilitiesManagerTest.php +++ b/tests/lib/CapabilitiesManagerTest.php @@ -28,7 +28,6 @@ use OCP\Capabilities\IPublicCapability; use Psr\Log\LoggerInterface; class CapabilitiesManagerTest extends TestCase { - /** @var CapabilitiesManager */ private $manager; diff --git a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php index b52e1d2745e..462497c637b 100644 --- a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php @@ -41,7 +41,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class LookupPluginTest extends TestCase { - /** @var IConfig|MockObject */ protected $config; /** @var IClientService|MockObject */ diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php index 22bd6f84be9..4fed1f179e7 100644 --- a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php +++ b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php @@ -40,7 +40,6 @@ use OCP\Share\IShare; use Test\TestCase; class RemotePluginTest extends TestCase { - /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ protected $userManager; diff --git a/tests/lib/Collaboration/Resources/ManagerTest.php b/tests/lib/Collaboration/Resources/ManagerTest.php index 01a39660a7c..80b1ac464a6 100644 --- a/tests/lib/Collaboration/Resources/ManagerTest.php +++ b/tests/lib/Collaboration/Resources/ManagerTest.php @@ -31,7 +31,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class ManagerTest extends TestCase { - /** @var LoggerInterface */ protected $logger; /** @var IProviderManager */ diff --git a/tests/lib/Collaboration/Resources/ProviderManagerTest.php b/tests/lib/Collaboration/Resources/ProviderManagerTest.php index 8f408418409..6c66422c9d3 100644 --- a/tests/lib/Collaboration/Resources/ProviderManagerTest.php +++ b/tests/lib/Collaboration/Resources/ProviderManagerTest.php @@ -32,7 +32,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class ProviderManagerTest extends TestCase { - /** @var IServerContainer */ protected $serverContainer; /** @var LoggerInterface */ diff --git a/tests/lib/Comments/CommentTest.php b/tests/lib/Comments/CommentTest.php index 28e38d7b143..328e6fd5447 100644 --- a/tests/lib/Comments/CommentTest.php +++ b/tests/lib/Comments/CommentTest.php @@ -7,7 +7,6 @@ use OCP\Comments\IComment; use Test\TestCase; class CommentTest extends TestCase { - /** * @throws \OCP\Comments\IllegalIDChangeException */ diff --git a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php index 2543746ddb5..549bfd8670d 100644 --- a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php +++ b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php @@ -39,7 +39,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class ActionProviderStoreTest extends TestCase { - /** @var IServerContainer|MockObject */ private $serverContainer; diff --git a/tests/lib/Contacts/ContactsMenu/ManagerTest.php b/tests/lib/Contacts/ContactsMenu/ManagerTest.php index ecd925faffa..eb776a6e39d 100644 --- a/tests/lib/Contacts/ContactsMenu/ManagerTest.php +++ b/tests/lib/Contacts/ContactsMenu/ManagerTest.php @@ -37,7 +37,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class ManagerTest extends TestCase { - /** @var ContactsStore|MockObject */ private $contactsStore; diff --git a/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php b/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php index 39deeeaecc9..e9eb41ad397 100644 --- a/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php +++ b/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php @@ -33,7 +33,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class EMailproviderTest extends TestCase { - /** @var IActionFactory|MockObject */ private $actionFactory; diff --git a/tests/lib/Contacts/ContactsMenu/Providers/LocalTimeProviderTest.php b/tests/lib/Contacts/ContactsMenu/Providers/LocalTimeProviderTest.php index b87b4047071..96fb7909d6b 100644 --- a/tests/lib/Contacts/ContactsMenu/Providers/LocalTimeProviderTest.php +++ b/tests/lib/Contacts/ContactsMenu/Providers/LocalTimeProviderTest.php @@ -42,7 +42,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class LocalTimeProviderTest extends TestCase { - /** @var IActionFactory|MockObject */ private $actionFactory; /** @var IL10N|MockObject */ diff --git a/tests/lib/ContactsManagerTest.php b/tests/lib/ContactsManagerTest.php index c02a95a4162..d15cd74bef8 100644 --- a/tests/lib/ContactsManagerTest.php +++ b/tests/lib/ContactsManagerTest.php @@ -5,7 +5,6 @@ namespace Test; use OCP\IAddressBook; class ContactsManagerTest extends \Test\TestCase { - /** @var \OC\ContactsManager */ private $cm; diff --git a/tests/lib/DB/Exception/DbalExceptionTest.php b/tests/lib/DB/Exception/DbalExceptionTest.php index 0cb8ebf046c..da57264aa76 100644 --- a/tests/lib/DB/Exception/DbalExceptionTest.php +++ b/tests/lib/DB/Exception/DbalExceptionTest.php @@ -39,7 +39,6 @@ use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use OC\DB\Exceptions\DbalException; class DbalExceptionTest extends \Test\TestCase { - /** @var TheDriverException */ protected $driverException; diff --git a/tests/lib/Diagnostics/EventLoggerTest.php b/tests/lib/Diagnostics/EventLoggerTest.php index 4e24c24f225..18cd3a91b1a 100644 --- a/tests/lib/Diagnostics/EventLoggerTest.php +++ b/tests/lib/Diagnostics/EventLoggerTest.php @@ -28,7 +28,6 @@ use OC\SystemConfig; use Test\TestCase; class EventLoggerTest extends TestCase { - /** @var \OC\Diagnostics\EventLogger */ private $logger; diff --git a/tests/lib/Diagnostics/QueryLoggerTest.php b/tests/lib/Diagnostics/QueryLoggerTest.php index 50d62d3d0e6..9a614a4c441 100644 --- a/tests/lib/Diagnostics/QueryLoggerTest.php +++ b/tests/lib/Diagnostics/QueryLoggerTest.php @@ -25,7 +25,6 @@ use OC\Diagnostics\QueryLogger; use Test\TestCase; class QueryLoggerTest extends TestCase { - /** @var \OC\Diagnostics\QueryLogger */ private $logger; diff --git a/tests/lib/EmojiHelperTest.php b/tests/lib/EmojiHelperTest.php index 19197bce360..dba7e631e6f 100644 --- a/tests/lib/EmojiHelperTest.php +++ b/tests/lib/EmojiHelperTest.php @@ -29,7 +29,6 @@ use OCP\IDBConnection; use OCP\IEmojiHelper; class EmojiHelperTest extends TestCase { - /** @var IDBConnection|\PHPUnit\Framework\MockObject\MockObject */ private $db; diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php index 92ed2dcd701..f33f88eb214 100644 --- a/tests/lib/Encryption/DecryptAllTest.php +++ b/tests/lib/Encryption/DecryptAllTest.php @@ -43,7 +43,6 @@ use Test\TestCase; * @package Test\Encryption */ class DecryptAllTest extends TestCase { - /** @var \PHPUnit\Framework\MockObject\MockObject | IUserManager */ protected $userManager; @@ -201,7 +200,6 @@ class DecryptAllTest extends TestCase { * @dataProvider dataTestDecryptAllUsersFiles */ public function testDecryptAllUsersFiles($user) { - /** @var DecryptAll | \PHPUnit\Framework\MockObject\MockObject | $instance */ $instance = $this->getMockBuilder('OC\Encryption\DecryptAll') ->setConstructorArgs( diff --git a/tests/lib/Encryption/EncryptionWrapperTest.php b/tests/lib/Encryption/EncryptionWrapperTest.php index 5d707ca6ec6..8c357e2a50d 100644 --- a/tests/lib/Encryption/EncryptionWrapperTest.php +++ b/tests/lib/Encryption/EncryptionWrapperTest.php @@ -29,7 +29,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class EncryptionWrapperTest extends TestCase { - /** @var EncryptionWrapper */ private $instance; diff --git a/tests/lib/Encryption/ManagerTest.php b/tests/lib/Encryption/ManagerTest.php index 00448db87d6..79d2c216080 100644 --- a/tests/lib/Encryption/ManagerTest.php +++ b/tests/lib/Encryption/ManagerTest.php @@ -13,7 +13,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class ManagerTest extends TestCase { - /** @var Manager */ private $manager; diff --git a/tests/lib/Encryption/UpdateTest.php b/tests/lib/Encryption/UpdateTest.php index ca1d5493993..df7d137f0b6 100644 --- a/tests/lib/Encryption/UpdateTest.php +++ b/tests/lib/Encryption/UpdateTest.php @@ -31,7 +31,6 @@ use OC\Encryption\File; use OCP\Encryption\IEncryptionModule; class UpdateTest extends TestCase { - /** @var \OC\Encryption\Update */ private $update; diff --git a/tests/lib/ErrorHandlerTest.php b/tests/lib/ErrorHandlerTest.php index f6bf850f0b5..468273c4dea 100644 --- a/tests/lib/ErrorHandlerTest.php +++ b/tests/lib/ErrorHandlerTest.php @@ -31,7 +31,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Psr\Log\LoggerInterface; class ErrorHandlerTest extends TestCase { - /** @var MockObject */ private LoggerInterface $logger; diff --git a/tests/lib/EventDispatcher/SymfonyAdapterTest.php b/tests/lib/EventDispatcher/SymfonyAdapterTest.php index 785b4bfdfcb..1b770c94e56 100644 --- a/tests/lib/EventDispatcher/SymfonyAdapterTest.php +++ b/tests/lib/EventDispatcher/SymfonyAdapterTest.php @@ -39,7 +39,6 @@ use Symfony\Component\EventDispatcher\GenericEvent as SymfonyGenericEvent; use Test\TestCase; class SymfonyAdapterTest extends TestCase { - /** @var EventDispatcher|MockObject */ private $eventDispatcher; diff --git a/tests/lib/Files/Cache/WatcherTest.php b/tests/lib/Files/Cache/WatcherTest.php index 42115c1c477..509b9d6ba2a 100644 --- a/tests/lib/Files/Cache/WatcherTest.php +++ b/tests/lib/Files/Cache/WatcherTest.php @@ -16,7 +16,6 @@ namespace Test\Files\Cache; * @package Test\Files\Cache */ class WatcherTest extends \Test\TestCase { - /** * @var \OC\Files\Storage\Storage[] $storages */ diff --git a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php index 7ce87140122..e53069ee2b8 100644 --- a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php +++ b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php @@ -8,7 +8,6 @@ use OCP\IConfig; use OCP\IUser; class ObjectHomeMountProviderTest extends \Test\TestCase { - /** @var ObjectHomeMountProvider */ protected $provider; diff --git a/tests/lib/Files/Mount/ObjectStorePreviewCacheMountProviderTest.php b/tests/lib/Files/Mount/ObjectStorePreviewCacheMountProviderTest.php index ef2ede729ce..da9ba8bacaf 100644 --- a/tests/lib/Files/Mount/ObjectStorePreviewCacheMountProviderTest.php +++ b/tests/lib/Files/Mount/ObjectStorePreviewCacheMountProviderTest.php @@ -39,7 +39,6 @@ use Psr\Log\LoggerInterface; * The DB permission is needed for the fake root storage initialization */ class ObjectStorePreviewCacheMountProviderTest extends \Test\TestCase { - /** @var ObjectStorePreviewCacheMountProvider */ protected $provider; diff --git a/tests/lib/Files/ObjectStore/MapperTest.php b/tests/lib/Files/ObjectStore/MapperTest.php index d8427f993fe..dbe5fe5d32f 100644 --- a/tests/lib/Files/ObjectStore/MapperTest.php +++ b/tests/lib/Files/ObjectStore/MapperTest.php @@ -26,7 +26,6 @@ use OCP\IConfig; use OCP\IUser; class MapperTest extends \Test\TestCase { - /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */ private $user; diff --git a/tests/lib/Files/ObjectStore/ObjectStoreTest.php b/tests/lib/Files/ObjectStore/ObjectStoreTest.php index 2333168d838..c5580e4a2bf 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreTest.php @@ -25,7 +25,6 @@ namespace Test\Files\ObjectStore; use Test\TestCase; abstract class ObjectStoreTest extends TestCase { - /** @var string[] */ private $cleanup = []; diff --git a/tests/lib/Files/PathVerificationTest.php b/tests/lib/Files/PathVerificationTest.php index 3570acfaab4..ededab14d0b 100644 --- a/tests/lib/Files/PathVerificationTest.php +++ b/tests/lib/Files/PathVerificationTest.php @@ -19,7 +19,6 @@ use OCP\Files\InvalidPathException; * @package Test\Files */ class PathVerificationTest extends \Test\TestCase { - /** * @var \OC\Files\View */ diff --git a/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php b/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php index f36958ad552..7d5d7d31808 100644 --- a/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php +++ b/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php @@ -27,7 +27,6 @@ use OC\Files\Storage\Wrapper\Availability; use OCP\Files\StorageNotAvailableException; class AvailabilityTest extends \Test\TestCase { - /** @var \PHPUnit\Framework\MockObject\MockObject|StorageCache */ protected $storageCache; /** @var \PHPUnit\Framework\MockObject\MockObject|Temporary */ diff --git a/tests/lib/Files/Storage/Wrapper/EncryptionTest.php b/tests/lib/Files/Storage/Wrapper/EncryptionTest.php index ebb97a25c77..ae776e40666 100644 --- a/tests/lib/Files/Storage/Wrapper/EncryptionTest.php +++ b/tests/lib/Files/Storage/Wrapper/EncryptionTest.php @@ -24,7 +24,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Test\Files\Storage\Storage; class EncryptionTest extends Storage { - /** * block size will always be 8192 for a PHP stream * @see https://bugs.php.net/bug.php?id=21641 @@ -497,13 +496,13 @@ class EncryptionTest extends Storage { $this->encryptionManager->expects($this->any())->method('isEnabled')->willReturn($encryptionEnabled); $encryptionStorage = new \OC\Files\Storage\Wrapper\Encryption( - [ - 'storage' => $sourceStorage, - 'root' => 'foo', - 'mountPoint' => '/mountPoint', - 'mount' => $this->mount - ], - $this->encryptionManager, $util, $this->logger, $this->file, null, $this->keyStore, $this->update + [ + 'storage' => $sourceStorage, + 'root' => 'foo', + 'mountPoint' => '/mountPoint', + 'mount' => $this->mount + ], + $this->encryptionManager, $util, $this->logger, $this->file, null, $this->keyStore, $this->update ); @@ -712,15 +711,15 @@ class EncryptionTest extends Storage { */ public function testParseRawHeader($rawHeader, $expected) { $instance = new \OC\Files\Storage\Wrapper\Encryption( - [ - 'storage' => $this->sourceStorage, - 'root' => 'foo', - 'mountPoint' => '/', - 'mount' => $this->mount - ], - $this->encryptionManager, $this->util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager, $this->arrayCache + [ + 'storage' => $this->sourceStorage, + 'root' => 'foo', + 'mountPoint' => '/', + 'mount' => $this->mount + ], + $this->encryptionManager, $this->util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager, $this->arrayCache - ); + ); $result = $this->invokePrivate($instance, 'parseRawHeader', [$rawHeader]); $this->assertSameSize($expected, $result); diff --git a/tests/lib/Files/Storage/Wrapper/JailTest.php b/tests/lib/Files/Storage/Wrapper/JailTest.php index 6c8905af765..148bd3a4f30 100644 --- a/tests/lib/Files/Storage/Wrapper/JailTest.php +++ b/tests/lib/Files/Storage/Wrapper/JailTest.php @@ -9,7 +9,6 @@ namespace Test\Files\Storage\Wrapper; class JailTest extends \Test\Files\Storage\Storage { - /** * @var \OC\Files\Storage\Temporary */ diff --git a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php index 1e69ee7165e..ea01a0e3e94 100644 --- a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php +++ b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php @@ -16,7 +16,6 @@ use OCP\Files\Cache\IScanner; * @group DB */ class PermissionsMaskTest extends \Test\Files\Storage\Storage { - /** * @var \OC\Files\Storage\Temporary */ diff --git a/tests/lib/Files/Stream/DummyEncryptionWrapper.php b/tests/lib/Files/Stream/DummyEncryptionWrapper.php index e66fae3d15d..223e8256cd2 100644 --- a/tests/lib/Files/Stream/DummyEncryptionWrapper.php +++ b/tests/lib/Files/Stream/DummyEncryptionWrapper.php @@ -22,7 +22,6 @@ namespace Test\Files\Stream; class DummyEncryptionWrapper extends \OC\Files\Stream\Encryption { - /** * simulate a non-seekable stream wrapper by always return false * diff --git a/tests/lib/Files/Stream/EncryptionTest.php b/tests/lib/Files/Stream/EncryptionTest.php index 79a845fe7a6..67311e886e8 100644 --- a/tests/lib/Files/Stream/EncryptionTest.php +++ b/tests/lib/Files/Stream/EncryptionTest.php @@ -87,7 +87,6 @@ class EncryptionTest extends \Test\TestCase { $expectedSize, $expectedUnencryptedSize, $expectedReadOnly) { - // build mocks $encryptionModuleMock = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule') ->disableOriginalConstructor()->getMock(); diff --git a/tests/lib/Files/Stream/QuotaTest.php b/tests/lib/Files/Stream/QuotaTest.php index 24b0e7f9474..69cd322a2b3 100644 --- a/tests/lib/Files/Stream/QuotaTest.php +++ b/tests/lib/Files/Stream/QuotaTest.php @@ -9,7 +9,6 @@ namespace Test\Files\Stream; class QuotaTest extends \Test\TestCase { - /** * @param string $mode * @param integer $limit diff --git a/tests/lib/GlobalScale/ConfigTest.php b/tests/lib/GlobalScale/ConfigTest.php index 5689fd0fb1f..e67cb392d64 100644 --- a/tests/lib/GlobalScale/ConfigTest.php +++ b/tests/lib/GlobalScale/ConfigTest.php @@ -26,7 +26,6 @@ use OCP\IConfig; use Test\TestCase; class ConfigTest extends TestCase { - /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; diff --git a/tests/lib/Group/GroupTest.php b/tests/lib/Group/GroupTest.php index b85496620b8..60f15a65732 100644 --- a/tests/lib/Group/GroupTest.php +++ b/tests/lib/Group/GroupTest.php @@ -15,7 +15,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\EventDispatcher\EventDispatcherInterface; class GroupTest extends \Test\TestCase { - /** @var EventDispatcherInterface|MockObject */ protected $dispatcher; diff --git a/tests/lib/Group/ManagerTest.php b/tests/lib/Group/ManagerTest.php index 65210bcc0f7..5e29f974706 100644 --- a/tests/lib/Group/ManagerTest.php +++ b/tests/lib/Group/ManagerTest.php @@ -559,7 +559,7 @@ class ManagerTest extends TestCase { case 'user33': return true; default: return null; - } + } }); $this->userManager->expects($this->any()) @@ -611,14 +611,14 @@ class ManagerTest extends TestCase { ->method('inGroup') ->willReturnCallback(function ($uid, $gid) { switch ($uid) { - case 'user1': return false; - case 'user2': return true; - case 'user3': return false; - case 'user33': return true; - case 'user333': return true; - default: - return null; - } + case 'user1': return false; + case 'user2': return true; + case 'user3': return false; + case 'user33': return true; + case 'user333': return true; + default: + return null; + } }); $this->userManager->expects($this->any()) @@ -672,14 +672,14 @@ class ManagerTest extends TestCase { ->method('inGroup') ->willReturnCallback(function ($uid) { switch ($uid) { - case 'user1': return false; - case 'user2': return true; - case 'user3': return false; - case 'user33': return true; - case 'user333': return true; - default: - return null; - } + case 'user1': return false; + case 'user2': return true; + case 'user3': return false; + case 'user33': return true; + case 'user333': return true; + default: + return null; + } }); $this->userManager->expects($this->any()) diff --git a/tests/lib/Http/WellKnown/RequestManagerTest.php b/tests/lib/Http/WellKnown/RequestManagerTest.php index 1fa92804cfa..d3fd487aa60 100644 --- a/tests/lib/Http/WellKnown/RequestManagerTest.php +++ b/tests/lib/Http/WellKnown/RequestManagerTest.php @@ -43,7 +43,6 @@ use Test\TestCase; use function get_class; class RequestManagerTest extends TestCase { - /** @var Coordinator|MockObject */ private $coordinator; diff --git a/tests/lib/InitialStateServiceTest.php b/tests/lib/InitialStateServiceTest.php index db4c98b20cf..f4decb43e1e 100644 --- a/tests/lib/InitialStateServiceTest.php +++ b/tests/lib/InitialStateServiceTest.php @@ -34,7 +34,6 @@ use OC\InitialStateService; use stdClass; class InitialStateServiceTest extends TestCase { - /** @var InitialStateService */ private $service; diff --git a/tests/lib/IntegrityCheck/CheckerTest.php b/tests/lib/IntegrityCheck/CheckerTest.php index 37f6885c0ac..62938ad6c1b 100644 --- a/tests/lib/IntegrityCheck/CheckerTest.php +++ b/tests/lib/IntegrityCheck/CheckerTest.php @@ -139,13 +139,13 @@ class CheckerTest extends TestCase { ->expects($this->once()) ->method('file_put_contents') ->with( - $this->equalTo(\OC::$SERVERROOT . '/tests/data/integritycheck/app//appinfo/signature.json'), - $this->callback(function ($signature) use ($expectedSignatureFileData) { - $expectedArray = json_decode($expectedSignatureFileData, true); - $actualArray = json_decode($signature, true); - $this->assertEquals($expectedArray, $actualArray); - return true; - }) + $this->equalTo(\OC::$SERVERROOT . '/tests/data/integritycheck/app//appinfo/signature.json'), + $this->callback(function ($signature) use ($expectedSignatureFileData) { + $expectedArray = json_decode($expectedSignatureFileData, true); + $actualArray = json_decode($signature, true); + $this->assertEquals($expectedArray, $actualArray); + return true; + }) ); $keyBundle = file_get_contents(__DIR__ .'/../../data/integritycheck/SomeApp.crt'); @@ -529,13 +529,13 @@ class CheckerTest extends TestCase { ->expects($this->once()) ->method('file_put_contents') ->with( - \OC::$SERVERROOT . '/tests/data/integritycheck/app//core/signature.json', - $this->callback(function ($signature) use ($expectedSignatureFileData) { - $expectedArray = json_decode($expectedSignatureFileData, true); - $actualArray = json_decode($signature, true); - $this->assertEquals($expectedArray, $actualArray); - return true; - }) + \OC::$SERVERROOT . '/tests/data/integritycheck/app//core/signature.json', + $this->callback(function ($signature) use ($expectedSignatureFileData) { + $expectedArray = json_decode($expectedSignatureFileData, true); + $actualArray = json_decode($signature, true); + $this->assertEquals($expectedArray, $actualArray); + return true; + }) ); $keyBundle = file_get_contents(__DIR__ .'/../../data/integritycheck/core.crt'); @@ -564,7 +564,7 @@ class CheckerTest extends TestCase { ->expects($this->once()) ->method('file_put_contents') ->with( - \OC::$SERVERROOT . '/tests/data/integritycheck/htaccessUnmodified//core/signature.json', + \OC::$SERVERROOT . '/tests/data/integritycheck/htaccessUnmodified//core/signature.json', $this->callback(function ($signature) use ($expectedSignatureFileData) { $expectedArray = json_decode($expectedSignatureFileData, true); $actualArray = json_decode($signature, true); @@ -594,7 +594,7 @@ class CheckerTest extends TestCase { ->expects($this->once()) ->method('file_put_contents') ->with( - \OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithInvalidModifiedContent//core/signature.json', + \OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithInvalidModifiedContent//core/signature.json', $this->callback(function ($signature) use ($expectedSignatureFileData) { $expectedArray = json_decode($expectedSignatureFileData, true); $actualArray = json_decode($signature, true); @@ -629,7 +629,7 @@ class CheckerTest extends TestCase { ->expects($this->once()) ->method('file_put_contents') ->with( - \OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithValidModifiedContent/core/signature.json', + \OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithValidModifiedContent/core/signature.json', $this->callback(function ($signature) use ($expectedSignatureFileData) { $expectedArray = json_decode($expectedSignatureFileData, true); $actualArray = json_decode($signature, true); diff --git a/tests/lib/L10N/FactoryTest.php b/tests/lib/L10N/FactoryTest.php index 7af069cbff3..0b536971e90 100644 --- a/tests/lib/L10N/FactoryTest.php +++ b/tests/lib/L10N/FactoryTest.php @@ -23,7 +23,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class FactoryTest extends TestCase { - /** @var IConfig|MockObject */ protected $config; diff --git a/tests/lib/LegacyHelperTest.php b/tests/lib/LegacyHelperTest.php index 4a253940931..08380dd50c9 100644 --- a/tests/lib/LegacyHelperTest.php +++ b/tests/lib/LegacyHelperTest.php @@ -112,9 +112,9 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(2)) ->method('file_exists') ->withConsecutive( - // Conflict on filename.ext - ['dir/filename.ext'], - ['dir/filename (2).ext'], + // Conflict on filename.ext + ['dir/filename.ext'], + ['dir/filename (2).ext'], ) ->will($this->onConsecutiveCalls(true, false)); $this->assertEquals('dir/filename (2).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename.ext', $viewMock)); @@ -123,9 +123,9 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(3)) ->method('file_exists') ->withConsecutive( - ['dir/filename.ext'], - ['dir/filename (2).ext'], - ['dir/filename (3).ext'], + ['dir/filename.ext'], + ['dir/filename (2).ext'], + ['dir/filename (3).ext'], ) ->will($this->onConsecutiveCalls(true, true, false)); $this->assertEquals('dir/filename (3).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename.ext', $viewMock)); @@ -134,8 +134,8 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(2)) ->method('file_exists') ->withConsecutive( - ['dir/filename (1).ext'], - ['dir/filename (2).ext'], + ['dir/filename (1).ext'], + ['dir/filename (2).ext'], ) ->will($this->onConsecutiveCalls(true, false)); $this->assertEquals('dir/filename (2).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename (1).ext', $viewMock)); @@ -144,8 +144,8 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(2)) ->method('file_exists') ->withConsecutive( - ['dir/filename (2).ext'], - ['dir/filename (3).ext'], + ['dir/filename (2).ext'], + ['dir/filename (3).ext'], ) ->will($this->onConsecutiveCalls(true, false)); $this->assertEquals('dir/filename (3).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename (2).ext', $viewMock)); @@ -154,9 +154,9 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(3)) ->method('file_exists') ->withConsecutive( - ['dir/filename (2).ext'], - ['dir/filename (3).ext'], - ['dir/filename (4).ext'], + ['dir/filename (2).ext'], + ['dir/filename (3).ext'], + ['dir/filename (4).ext'], ) ->will($this->onConsecutiveCalls(true, true, false)); $this->assertEquals('dir/filename (4).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename (2).ext', $viewMock)); @@ -165,8 +165,8 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(2)) ->method('file_exists') ->withConsecutive( - ['dir/filename(1).ext'], - ['dir/filename(2).ext'], + ['dir/filename(1).ext'], + ['dir/filename(2).ext'], ) ->will($this->onConsecutiveCalls(true, false)); $this->assertEquals('dir/filename(2).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename(1).ext', $viewMock)); @@ -175,8 +175,8 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(2)) ->method('file_exists') ->withConsecutive( - ['dir/filename(1) (1).ext'], - ['dir/filename(1) (2).ext'], + ['dir/filename(1) (1).ext'], + ['dir/filename(1) (2).ext'], ) ->will($this->onConsecutiveCalls(true, false)); $this->assertEquals('dir/filename(1) (2).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename(1) (1).ext', $viewMock)); @@ -185,9 +185,9 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(3)) ->method('file_exists') ->withConsecutive( - ['dir/filename(1) (1).ext'], - ['dir/filename(1) (2).ext'], - ['dir/filename(1) (3).ext'], + ['dir/filename(1) (1).ext'], + ['dir/filename(1) (2).ext'], + ['dir/filename(1) (3).ext'], ) ->will($this->onConsecutiveCalls(true, true, false)); $this->assertEquals('dir/filename(1) (3).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename(1) (1).ext', $viewMock)); @@ -196,8 +196,8 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(2)) ->method('file_exists') ->withConsecutive( - ['dir/filename(1) (2) (3).ext'], - ['dir/filename(1) (2) (4).ext'], + ['dir/filename(1) (2) (3).ext'], + ['dir/filename(1) (2) (4).ext'], ) ->will($this->onConsecutiveCalls(true, false)); $this->assertEquals('dir/filename(1) (2) (4).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename(1) (2) (3).ext', $viewMock)); diff --git a/tests/lib/Lock/MemcacheLockingProviderTest.php b/tests/lib/Lock/MemcacheLockingProviderTest.php index 7b7c649c886..b67be799d59 100644 --- a/tests/lib/Lock/MemcacheLockingProviderTest.php +++ b/tests/lib/Lock/MemcacheLockingProviderTest.php @@ -24,7 +24,6 @@ namespace Test\Lock; use OC\Memcache\ArrayCache; class MemcacheLockingProviderTest extends LockingProvider { - /** * @var \OCP\IMemcache */ diff --git a/tests/lib/Lockdown/Filesystem/NullCacheTest.php b/tests/lib/Lockdown/Filesystem/NullCacheTest.php index 67d44c430f5..0f979350bac 100644 --- a/tests/lib/Lockdown/Filesystem/NullCacheTest.php +++ b/tests/lib/Lockdown/Filesystem/NullCacheTest.php @@ -30,7 +30,6 @@ use OCP\Files\Cache\ICache; use OCP\Files\FileInfo; class NulLCacheTest extends \Test\TestCase { - /** @var NullCache */ private $cache; diff --git a/tests/lib/Lockdown/Filesystem/NullStorageTest.php b/tests/lib/Lockdown/Filesystem/NullStorageTest.php index c0349814570..b46066ac536 100644 --- a/tests/lib/Lockdown/Filesystem/NullStorageTest.php +++ b/tests/lib/Lockdown/Filesystem/NullStorageTest.php @@ -32,7 +32,6 @@ use OCP\Files\Storage; use Test\TestCase; class NullStorageTest extends TestCase { - /** @var NullStorage */ private $storage; diff --git a/tests/lib/LoggerTest.php b/tests/lib/LoggerTest.php index bec2119a8ad..367c34752c1 100644 --- a/tests/lib/LoggerTest.php +++ b/tests/lib/LoggerTest.php @@ -19,7 +19,6 @@ use OCP\Support\CrashReport\IRegistry; use PHPUnit\Framework\MockObject\MockObject; class LoggerTest extends TestCase implements IWriter { - /** @var SystemConfig|MockObject */ private $config; diff --git a/tests/lib/Migration/BackgroundRepairTest.php b/tests/lib/Migration/BackgroundRepairTest.php index e14b3179b27..2e68924a96d 100644 --- a/tests/lib/Migration/BackgroundRepairTest.php +++ b/tests/lib/Migration/BackgroundRepairTest.php @@ -34,7 +34,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class TestRepairStep implements IRepairStep { - /** * Returns the step's name * @@ -58,7 +57,6 @@ class TestRepairStep implements IRepairStep { } class BackgroundRepairTest extends TestCase { - /** @var JobList|MockObject */ private $jobList; diff --git a/tests/lib/NaturalSortTest.php b/tests/lib/NaturalSortTest.php index f8e7f31a285..9474d5c077c 100644 --- a/tests/lib/NaturalSortTest.php +++ b/tests/lib/NaturalSortTest.php @@ -9,7 +9,6 @@ namespace Test; class NaturalSortTest extends \Test\TestCase { - /** * @dataProvider naturalSortDataProvider */ diff --git a/tests/lib/Notification/DummyApp.php b/tests/lib/Notification/DummyApp.php index b1281f6b7a0..564a1ff7d54 100644 --- a/tests/lib/Notification/DummyApp.php +++ b/tests/lib/Notification/DummyApp.php @@ -27,7 +27,6 @@ use OCP\Notification\IApp; use OCP\Notification\INotification; class DummyApp implements IApp { - /** * @param INotification $notification * @throws \InvalidArgumentException When the notification is not valid diff --git a/tests/lib/Notification/DummyNotifier.php b/tests/lib/Notification/DummyNotifier.php index 92c1ddfb310..2df97a9057d 100644 --- a/tests/lib/Notification/DummyNotifier.php +++ b/tests/lib/Notification/DummyNotifier.php @@ -28,7 +28,6 @@ use OCP\Notification\INotification; use OCP\Notification\INotifier; class DummyNotifier implements INotifier { - /** * Identifier of the notifier, only use [a-z0-9_] * diff --git a/tests/lib/OCS/DiscoveryServiceTest.php b/tests/lib/OCS/DiscoveryServiceTest.php index 195dac697e5..da3897163cb 100644 --- a/tests/lib/OCS/DiscoveryServiceTest.php +++ b/tests/lib/OCS/DiscoveryServiceTest.php @@ -28,7 +28,6 @@ use OCP\OCS\IDiscoveryService; use Test\TestCase; class DiscoveryServiceTest extends TestCase { - /** @var \PHPUnit\Framework\MockObject\MockObject | ICacheFactory */ private $cacheFactory; diff --git a/tests/lib/OCS/MapStatusCodeTest.php b/tests/lib/OCS/MapStatusCodeTest.php index 27ebfe209f7..3022323870a 100644 --- a/tests/lib/OCS/MapStatusCodeTest.php +++ b/tests/lib/OCS/MapStatusCodeTest.php @@ -24,7 +24,6 @@ namespace Test\OCS; use OCP\AppFramework\Http; class MapStatusCodeTest extends \Test\TestCase { - /** * @dataProvider providesStatusCodes */ diff --git a/tests/lib/Preview/GeneratorTest.php b/tests/lib/Preview/GeneratorTest.php index b673100be9e..1f6f43dce1e 100644 --- a/tests/lib/Preview/GeneratorTest.php +++ b/tests/lib/Preview/GeneratorTest.php @@ -39,7 +39,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; class GeneratorTest extends \Test\TestCase { - /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; diff --git a/tests/lib/Preview/Provider.php b/tests/lib/Preview/Provider.php index 90287116512..a2e5170c82c 100644 --- a/tests/lib/Preview/Provider.php +++ b/tests/lib/Preview/Provider.php @@ -24,7 +24,6 @@ namespace Test\Preview; use OC\Files\Node\File; abstract class Provider extends \Test\TestCase { - /** @var string */ protected $imgPath; /** @var int */ diff --git a/tests/lib/Repair/CleanTagsTest.php b/tests/lib/Repair/CleanTagsTest.php index 3f3ac0bf18d..9fc3ef17150 100644 --- a/tests/lib/Repair/CleanTagsTest.php +++ b/tests/lib/Repair/CleanTagsTest.php @@ -20,7 +20,6 @@ use OCP\Migration\IOutput; * @see \OC\Repair\CleanTags */ class CleanTagsTest extends \Test\TestCase { - /** @var \OC\Repair\CleanTags */ protected $repair; diff --git a/tests/lib/Repair/ClearFrontendCachesTest.php b/tests/lib/Repair/ClearFrontendCachesTest.php index 09b96be7de3..0050f0e2340 100644 --- a/tests/lib/Repair/ClearFrontendCachesTest.php +++ b/tests/lib/Repair/ClearFrontendCachesTest.php @@ -29,7 +29,6 @@ use OCP\ICacheFactory; use OCP\Migration\IOutput; class ClearFrontendCachesTest extends \Test\TestCase { - /** @var ICacheFactory */ private $cacheFactory; diff --git a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php index 71842547462..7aa7831e44e 100644 --- a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php +++ b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php @@ -30,7 +30,6 @@ use OCP\IConfig; use OCP\Migration\IOutput; class ClearGeneratedAvatarCacheTest extends \Test\TestCase { - /** @var AvatarManager */ private $avatarManager; diff --git a/tests/lib/Repair/NC11/FixMountStoragesTest.php b/tests/lib/Repair/NC11/FixMountStoragesTest.php index 33c3fc1da11..843cc31392c 100644 --- a/tests/lib/Repair/NC11/FixMountStoragesTest.php +++ b/tests/lib/Repair/NC11/FixMountStoragesTest.php @@ -36,7 +36,6 @@ use Test\TestCase; * @group DB */ class FixMountStoragesTest extends TestCase { - /** @var IDBConnection */ private $db; diff --git a/tests/lib/Repair/OldGroupMembershipSharesTest.php b/tests/lib/Repair/OldGroupMembershipSharesTest.php index adfba4a1ce7..7ebc12732d6 100644 --- a/tests/lib/Repair/OldGroupMembershipSharesTest.php +++ b/tests/lib/Repair/OldGroupMembershipSharesTest.php @@ -20,7 +20,6 @@ use OCP\Share\IShare; * @package Test\Repair */ class OldGroupMembershipSharesTest extends \Test\TestCase { - /** @var OldGroupMembershipShares */ protected $repair; diff --git a/tests/lib/Repair/RepairCollationTest.php b/tests/lib/Repair/RepairCollationTest.php index 27d146fab43..902ddcd4539 100644 --- a/tests/lib/Repair/RepairCollationTest.php +++ b/tests/lib/Repair/RepairCollationTest.php @@ -33,7 +33,6 @@ class TestCollationRepair extends Collation { * @see \OC\Repair\RepairMimeTypes */ class RepairCollationTest extends TestCase { - /** * @var TestCollationRepair */ diff --git a/tests/lib/Repair/RepairDavSharesTest.php b/tests/lib/Repair/RepairDavSharesTest.php index f937a01f839..5eeafd7bf9f 100644 --- a/tests/lib/Repair/RepairDavSharesTest.php +++ b/tests/lib/Repair/RepairDavSharesTest.php @@ -38,7 +38,6 @@ use OCP\Migration\IOutput; use function in_array; class RepairDavSharesTest extends TestCase { - /** @var IOutput|\PHPUnit\Framework\MockObject\MockObject */ protected $output; /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ diff --git a/tests/lib/Repair/RepairInvalidSharesTest.php b/tests/lib/Repair/RepairInvalidSharesTest.php index 64ae6322657..f93940cc3ed 100644 --- a/tests/lib/Repair/RepairInvalidSharesTest.php +++ b/tests/lib/Repair/RepairInvalidSharesTest.php @@ -23,7 +23,6 @@ use Test\TestCase; * @see \OC\Repair\RepairInvalidShares */ class RepairInvalidSharesTest extends TestCase { - /** @var IRepairStep */ private $repair; diff --git a/tests/lib/Repair/RepairMimeTypesTest.php b/tests/lib/Repair/RepairMimeTypesTest.php index 53c8e53d486..176bc0ec102 100644 --- a/tests/lib/Repair/RepairMimeTypesTest.php +++ b/tests/lib/Repair/RepairMimeTypesTest.php @@ -23,7 +23,6 @@ use OCP\Migration\IRepairStep; * @see \OC\Repair\RepairMimeTypes */ class RepairMimeTypesTest extends \Test\TestCase { - /** @var IRepairStep */ private $repair; diff --git a/tests/lib/Repair/RepairSqliteAutoincrementTest.php b/tests/lib/Repair/RepairSqliteAutoincrementTest.php index c03eb12b894..5b3a388dea3 100644 --- a/tests/lib/Repair/RepairSqliteAutoincrementTest.php +++ b/tests/lib/Repair/RepairSqliteAutoincrementTest.php @@ -17,7 +17,6 @@ use OCP\Migration\IOutput; * @group DB */ class RepairSqliteAutoincrementTest extends \Test\TestCase { - /** * @var \OC\Repair\SqliteAutoincrement */ diff --git a/tests/lib/Security/CertificateTest.php b/tests/lib/Security/CertificateTest.php index 5d3fd602fb2..2c430fc1273 100644 --- a/tests/lib/Security/CertificateTest.php +++ b/tests/lib/Security/CertificateTest.php @@ -27,7 +27,6 @@ namespace Test\Security; use OC\Security\Certificate; class CertificateTest extends \Test\TestCase { - /** @var Certificate That contains a valid certificate */ protected $goodCertificate; /** @var Certificate That contains an invalid certificate */ diff --git a/tests/lib/Security/CredentialsManagerTest.php b/tests/lib/Security/CredentialsManagerTest.php index f81db330640..6f535c84275 100644 --- a/tests/lib/Security/CredentialsManagerTest.php +++ b/tests/lib/Security/CredentialsManagerTest.php @@ -28,7 +28,6 @@ namespace Test\Security; * @group DB */ class CredentialsManagerTest extends \Test\TestCase { - /** * @dataProvider credentialsProvider */ diff --git a/tests/lib/Security/HasherTest.php b/tests/lib/Security/HasherTest.php index a81f98533ce..37e2adcc13c 100644 --- a/tests/lib/Security/HasherTest.php +++ b/tests/lib/Security/HasherTest.php @@ -18,7 +18,6 @@ use OCP\IConfig; * Class HasherTest */ class HasherTest extends \Test\TestCase { - /** * @return array */ diff --git a/tests/lib/Security/IdentityProof/SignerTest.php b/tests/lib/Security/IdentityProof/SignerTest.php index f9abf84071d..36b7ef97bb6 100644 --- a/tests/lib/Security/IdentityProof/SignerTest.php +++ b/tests/lib/Security/IdentityProof/SignerTest.php @@ -35,7 +35,6 @@ use OCP\IUserManager; use Test\TestCase; class SignerTest extends TestCase { - /** @var string */ private $private = '-----BEGIN PRIVATE KEY----- MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDImc6QvHBjBIoo diff --git a/tests/lib/Security/RemoteHostValidatorIntegrationTest.php b/tests/lib/Security/RemoteHostValidatorIntegrationTest.php index 73cbbd7b0e8..3cf99161b77 100644 --- a/tests/lib/Security/RemoteHostValidatorIntegrationTest.php +++ b/tests/lib/Security/RemoteHostValidatorIntegrationTest.php @@ -35,7 +35,6 @@ use Psr\Log\NullLogger; use Test\TestCase; class RemoteHostValidatorIntegrationTest extends TestCase { - /** @var IConfig|IConfig&MockObject|MockObject */ private IConfig $config; private RemoteHostValidator $validator; diff --git a/tests/lib/Security/RemoteHostValidatorTest.php b/tests/lib/Security/RemoteHostValidatorTest.php index acaa7a4be30..030a75b1e79 100644 --- a/tests/lib/Security/RemoteHostValidatorTest.php +++ b/tests/lib/Security/RemoteHostValidatorTest.php @@ -34,7 +34,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class RemoteHostValidatorTest extends TestCase { - /** @var IConfig|IConfig&MockObject|MockObject */ private IConfig $config; /** @var HostnameClassifier|HostnameClassifier&MockObject|MockObject */ diff --git a/tests/lib/SetupTest.php b/tests/lib/SetupTest.php index 004fc9c866b..eacc165650c 100644 --- a/tests/lib/SetupTest.php +++ b/tests/lib/SetupTest.php @@ -19,7 +19,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Psr\Log\LoggerInterface; class SetupTest extends \Test\TestCase { - /** @var SystemConfig|MockObject */ protected $config; /** @var \bantu\IniGetWrapper\IniGetWrapper|MockObject */ diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php index d7b5dbc9b74..0a6f106a5db 100644 --- a/tests/lib/Share20/DefaultShareProviderTest.php +++ b/tests/lib/Share20/DefaultShareProviderTest.php @@ -49,7 +49,6 @@ use PHPUnit\Framework\MockObject\MockObject; * @group DB */ class DefaultShareProviderTest extends \Test\TestCase { - /** @var IDBConnection */ protected $dbConn; diff --git a/tests/lib/Share20/LegacyHooksTest.php b/tests/lib/Share20/LegacyHooksTest.php index 5afee588c34..c7ea141eaf8 100644 --- a/tests/lib/Share20/LegacyHooksTest.php +++ b/tests/lib/Share20/LegacyHooksTest.php @@ -34,7 +34,6 @@ use Symfony\Component\EventDispatcher\GenericEvent; use Test\TestCase; class LegacyHooksTest extends TestCase { - /** @var LegacyHooks */ private $hooks; diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php index a7bb6cbcefc..36680b7b926 100644 --- a/tests/lib/Share20/ManagerTest.php +++ b/tests/lib/Share20/ManagerTest.php @@ -70,7 +70,6 @@ use Symfony\Component\EventDispatcher\GenericEvent; * @group DB */ class ManagerTest extends \Test\TestCase { - /** @var Manager */ protected $manager; /** @var LoggerInterface|MockObject */ @@ -552,7 +551,7 @@ class ManagerTest extends \Test\TestCase { /** @var ValidatePasswordPolicyEvent $event */ $this->assertSame('password', $event->getPassword()); } - ); + ); $result = self::invokePrivate($this->manager, 'verifyPassword', ['password']); $this->assertNull($result); @@ -575,7 +574,7 @@ class ManagerTest extends \Test\TestCase { $this->assertSame('password', $event->getPassword()); throw new HintException('message', 'password not accepted'); } - ); + ); self::invokePrivate($this->manager, 'verifyPassword', ['password']); } @@ -4639,7 +4638,6 @@ class ManagerTest extends \Test\TestCase { } class DummyFactory implements IProviderFactory { - /** @var IShareProvider */ protected $provider; diff --git a/tests/lib/Share20/ShareByMailProviderTest.php b/tests/lib/Share20/ShareByMailProviderTest.php index 3558be93a8b..5116dfe9e58 100644 --- a/tests/lib/Share20/ShareByMailProviderTest.php +++ b/tests/lib/Share20/ShareByMailProviderTest.php @@ -52,7 +52,6 @@ use Test\TestCase; * @group DB */ class ShareByMailProviderTest extends TestCase { - /** @var IDBConnection */ protected $dbConn; diff --git a/tests/lib/Share20/ShareHelperTest.php b/tests/lib/Share20/ShareHelperTest.php index b3e76735aaa..857810e7881 100644 --- a/tests/lib/Share20/ShareHelperTest.php +++ b/tests/lib/Share20/ShareHelperTest.php @@ -30,7 +30,6 @@ use OCP\Share\IManager; use Test\TestCase; class ShareHelperTest extends TestCase { - /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ private $manager; diff --git a/tests/lib/SubAdminTest.php b/tests/lib/SubAdminTest.php index 907abf4b7d8..647141a73f7 100644 --- a/tests/lib/SubAdminTest.php +++ b/tests/lib/SubAdminTest.php @@ -29,7 +29,6 @@ use OCP\Group\Events\SubAdminRemovedEvent; * @group DB */ class SubAdminTest extends \Test\TestCase { - /** @var \OCP\IUserManager */ private $userManager; diff --git a/tests/lib/Support/CrashReport/RegistryTest.php b/tests/lib/Support/CrashReport/RegistryTest.php index f88902d7065..9424738cd70 100644 --- a/tests/lib/Support/CrashReport/RegistryTest.php +++ b/tests/lib/Support/CrashReport/RegistryTest.php @@ -36,7 +36,6 @@ use OCP\Support\CrashReport\IReporter; use Test\TestCase; class RegistryTest extends TestCase { - /** @var IServerContainer|\PHPUnit\Framework\MockObject\MockObject */ private $serverContainer; diff --git a/tests/lib/Support/Subscription/DummySubscription.php b/tests/lib/Support/Subscription/DummySubscription.php index f4e7e3484bb..dfbee2e9a5e 100644 --- a/tests/lib/Support/Subscription/DummySubscription.php +++ b/tests/lib/Support/Subscription/DummySubscription.php @@ -25,7 +25,6 @@ declare(strict_types=1); namespace Test\Support\Subscription; class DummySubscription implements \OCP\Support\Subscription\ISubscription { - /** @var bool */ private $hasValidSubscription; /** @var bool */ diff --git a/tests/lib/Support/Subscription/RegistryTest.php b/tests/lib/Support/Subscription/RegistryTest.php index 260232ac95d..f4a278cca4e 100644 --- a/tests/lib/Support/Subscription/RegistryTest.php +++ b/tests/lib/Support/Subscription/RegistryTest.php @@ -39,7 +39,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class RegistryTest extends TestCase { - /** @var Registry */ private $registry; diff --git a/tests/lib/SystemTag/SystemTagManagerTest.php b/tests/lib/SystemTag/SystemTagManagerTest.php index 698c2582b83..ef0546dbd88 100644 --- a/tests/lib/SystemTag/SystemTagManagerTest.php +++ b/tests/lib/SystemTag/SystemTagManagerTest.php @@ -27,7 +27,6 @@ use Test\TestCase; * @package Test\SystemTag */ class SystemTagManagerTest extends TestCase { - /** * @var ISystemTagManager **/ diff --git a/tests/lib/SystemTag/SystemTagObjectMapperTest.php b/tests/lib/SystemTag/SystemTagObjectMapperTest.php index a5158bbee68..c988db69c30 100644 --- a/tests/lib/SystemTag/SystemTagObjectMapperTest.php +++ b/tests/lib/SystemTag/SystemTagObjectMapperTest.php @@ -28,7 +28,6 @@ use Test\TestCase; * @package Test\SystemTag */ class SystemTagObjectMapperTest extends TestCase { - /** * @var ISystemTagManager **/ diff --git a/tests/lib/TagsTest.php b/tests/lib/TagsTest.php index 2a68dfe3124..28a8d4913f2 100644 --- a/tests/lib/TagsTest.php +++ b/tests/lib/TagsTest.php @@ -208,9 +208,9 @@ class TagsTest extends \Test\TestCase { $conn = \OC::$server->getDatabaseConnection(); $statement = $conn->prepare( - 'INSERT INTO `*PREFIX*vcategory_to_object` ' . - '(`objid`, `categoryid`, `type`) VALUES ' . - '(?, ?, ?)' + 'INSERT INTO `*PREFIX*vcategory_to_object` ' . + '(`objid`, `categoryid`, `type`) VALUES ' . + '(?, ?, ?)' ); // insert lots of entries diff --git a/tests/lib/TempManagerTest.php b/tests/lib/TempManagerTest.php index b85bbc8098b..4b342c365b5 100644 --- a/tests/lib/TempManagerTest.php +++ b/tests/lib/TempManagerTest.php @@ -170,7 +170,7 @@ class TempManagerTest extends \Test\TestCase { $logger = $this->createMock(LoggerInterface::class); $tmpManager = self::invokePrivate( $this->getManager($logger), - 'buildFileNameWithSuffix', + 'buildFileNameWithSuffix', ['/tmp/myTemporaryFile', ''] ); diff --git a/tests/lib/Template/JSCombinerTest.php b/tests/lib/Template/JSCombinerTest.php index 2c98d33d543..1f2342f2b4e 100644 --- a/tests/lib/Template/JSCombinerTest.php +++ b/tests/lib/Template/JSCombinerTest.php @@ -435,11 +435,11 @@ var b = \'world\'; ->expects($this->once()) ->method('putContent') ->with($this->callback( - function ($content) { - $deps = json_decode($content, true); - return array_key_exists(__DIR__ . '/data//1.js', $deps) - && array_key_exists(__DIR__ . '/data//2.js', $deps); - })) + function ($content) { + $deps = json_decode($content, true); + return array_key_exists(__DIR__ . '/data//1.js', $deps) + && array_key_exists(__DIR__ . '/data//2.js', $deps); + })) ->willThrowException(new NotPermittedException()); $actual = self::invokePrivate($this->jsCombiner, 'cache', [$path, 'combine.json', $folder]); diff --git a/tests/lib/TestMoveableMountPoint.php b/tests/lib/TestMoveableMountPoint.php index 262016b76c1..80cc6255071 100644 --- a/tests/lib/TestMoveableMountPoint.php +++ b/tests/lib/TestMoveableMountPoint.php @@ -27,7 +27,6 @@ use OC\Files\Mount; * Test moveable mount for mocking */ class TestMoveableMountPoint extends Mount\MountPoint implements Mount\MoveableMount { - /** * Move the mount point to $target * diff --git a/tests/lib/UrlGeneratorTest.php b/tests/lib/UrlGeneratorTest.php index 4c1cd29273f..420b2fe4eb9 100644 --- a/tests/lib/UrlGeneratorTest.php +++ b/tests/lib/UrlGeneratorTest.php @@ -22,7 +22,6 @@ use OCP\IUserSession; * @package Test */ class UrlGeneratorTest extends \Test\TestCase { - /** @var \PHPUnit\Framework\MockObject\MockObject|IConfig */ private $config; /** @var \PHPUnit\Framework\MockObject\MockObject|IUserSession */ diff --git a/tests/lib/User/ManagerTest.php b/tests/lib/User/ManagerTest.php index 19013c62be7..cf6f03a5a0d 100644 --- a/tests/lib/User/ManagerTest.php +++ b/tests/lib/User/ManagerTest.php @@ -28,7 +28,6 @@ use Test\TestCase; * @package Test\User */ class ManagerTest extends TestCase { - /** @var IConfig */ private $config; /** @var EventDispatcherInterface */ diff --git a/tests/lib/User/UserTest.php b/tests/lib/User/UserTest.php index cc65fbf3356..b8fa8efced0 100644 --- a/tests/lib/User/UserTest.php +++ b/tests/lib/User/UserTest.php @@ -33,7 +33,6 @@ use Test\TestCase; * @package Test\User */ class UserTest extends TestCase { - /** @var EventDispatcherInterface|MockObject */ protected $dispatcher; @@ -217,7 +216,6 @@ class UserTest extends TestCase { } public function testDeleteWithDifferentHome() { - /** @var ObjectHomeMountProvider $homeProvider */ $homeProvider = \OC::$server->get(ObjectHomeMountProvider::class); $user = $this->createMock(IUser::class); |