Browse Source

Adjust coding style

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/7757/head
Joas Schilling 3 years ago
parent
commit
a22a546401
No known key found for this signature in database GPG Key ID: 74434EFE0D2E2205
  1. 1
      lib/Activity/Provider/Call.php
  2. 1
      lib/Activity/Provider/Invitation.php
  3. 2
      lib/BackgroundJob/CheckHostedSignalingServer.php
  4. 1
      lib/Chat/Parser/Changelog.php
  5. 1
      lib/Chat/Parser/UserMention.php
  6. 2
      lib/Controller/RoomController.php
  7. 3
      lib/Controller/SignalingController.php
  8. 1
      lib/Events/EndCallForEveryoneEvent.php
  9. 12
      lib/Federation/Notifications.php
  10. 1
      lib/Flow/Operation.php
  11. 16
      lib/Manager.php
  12. 2
      lib/Migration/Version10000Date20201015134000.php
  13. 1
      lib/Migration/Version10000Date20201015143852.php
  14. 1
      lib/Migration/Version10000Date20201015150000.php
  15. 1
      lib/Migration/Version11000Date20201011082810.php
  16. 1
      lib/Migration/Version12000Date20210217134030.php
  17. 1
      lib/Migration/Version12000Date20210401124139.php
  18. 1
      lib/Migration/Version12000Date20210528100404.php
  19. 1
      lib/Migration/Version14000Date20220328153054.php
  20. 1
      lib/Migration/Version15000Date20220506005058.php
  21. 1
      lib/Migration/Version2000Date20170707093535.php
  22. 1
      lib/Migration/Version2001Date20170913104501.php
  23. 1
      lib/Migration/Version2001Date20170921145301.php
  24. 1
      lib/Migration/Version2001Date20171009132424.php
  25. 1
      lib/Migration/Version2001Date20171026141336.php
  26. 1
      lib/Migration/Version2001Date20171031102049.php
  27. 1
      lib/Migration/Version2001Date20180103150836.php
  28. 1
      lib/Migration/Version3002Date20180319104030.php
  29. 1
      lib/Migration/Version3003Date20180707222130.php
  30. 1
      lib/Migration/Version3003Date20180720162342.php
  31. 1
      lib/Migration/Version3003Date20180722152733.php
  32. 1
      lib/Migration/Version3003Date20180722152849.php
  33. 1
      lib/Migration/Version3003Date20180730080327.php
  34. 1
      lib/Migration/Version4099Date20181001123058.php
  35. 1
      lib/Migration/Version5099Date20190319134820.php
  36. 1
      lib/Migration/Version6099Date20190627172429.php
  37. 1
      lib/Migration/Version7000Date20190717141457.php
  38. 1
      lib/Model/AttendeeMapper.php
  39. 1
      lib/Model/CommandMapper.php
  40. 1
      lib/Model/Message.php
  41. 1
      lib/Model/PollMapper.php
  42. 1
      lib/Model/SessionMapper.php
  43. 1
      lib/Model/VoteMapper.php
  44. 1
      lib/Room.php
  45. 1
      lib/Search/CurrentMessageSearch.php
  46. 8
      lib/Service/HostedSignalingServerService.php
  47. 8
      lib/Service/PollService.php
  48. 1
      lib/Share/RoomShareProvider.php
  49. 1
      lib/TInitialState.php
  50. 2
      psalm.xml
  51. 1
      tests/acceptance/features/bootstrap/ChatAncestorSetter.php
  52. 31
      tests/acceptance/features/bootstrap/ChatContext.php
  53. 6
      tests/acceptance/features/bootstrap/ConversationInfoContext.php
  54. 24
      tests/acceptance/features/bootstrap/ConversationListContext.php
  55. 12
      tests/acceptance/features/bootstrap/FilesAppChatTabContext.php
  56. 2
      tests/acceptance/features/bootstrap/FilesAppRoomSharingContext.php
  57. 12
      tests/acceptance/features/bootstrap/ParticipantListContext.php
  58. 16
      tests/acceptance/features/bootstrap/PublicConversationContext.php
  59. 8
      tests/acceptance/features/bootstrap/PublicSharePasswordRequestContext.php
  60. 22
      tests/acceptance/features/bootstrap/TalkAppContext.php
  61. 8
      tests/acceptance/features/bootstrap/TalkPublicShareContext.php
  62. 1
      tests/integration/features/bootstrap/CommandLineTrait.php
  63. 1
      tests/integration/features/bootstrap/FederationContext.php
  64. 1
      tests/integration/features/bootstrap/SharingContext.php
  65. 1
      tests/integration/spreedcheats/lib/Controller/ApiController.php
  66. 1
      tests/php/Activity/Provider/BaseTest.php
  67. 1
      tests/php/Activity/Provider/InvitationTest.php
  68. 1
      tests/php/BackgroundJob/CheckHostedSignalingServerTest.php
  69. 1
      tests/php/BackgroundJob/RemoveEmptyRoomsTest.php
  70. 1
      tests/php/CapabilitiesTest.php
  71. 1
      tests/php/Chat/AutoComplete/SearchPluginTest.php
  72. 1
      tests/php/Chat/AutoComplete/SorterTest.php
  73. 1
      tests/php/Chat/ChatManagerTest.php
  74. 1
      tests/php/Chat/Command/ExecutorTest.php
  75. 1
      tests/php/Chat/NotifierTest.php
  76. 2
      tests/php/Chat/Parser/SystemMessageTest.php
  77. 1
      tests/php/Chat/Parser/UserMentionTest.php
  78. 2
      tests/php/Chat/SystemMessage/ListenerTest.php
  79. 1
      tests/php/Collaboration/Resources/ConversationProviderTest.php
  80. 1
      tests/php/Command/Signaling/AddTest.php
  81. 1
      tests/php/Command/Signaling/DeleteTest.php
  82. 1
      tests/php/Command/Signaling/ListCommandTest.php
  83. 1
      tests/php/Command/Stun/AddTest.php
  84. 1
      tests/php/Command/Stun/DeleteTest.php
  85. 1
      tests/php/Command/Stun/ListCommandTest.php
  86. 1
      tests/php/Command/Turn/AddTest.php
  87. 1
      tests/php/Command/Turn/DeleteTest.php
  88. 1
      tests/php/Command/Turn/ListCommandTest.php
  89. 1
      tests/php/ConfigTest.php
  90. 1
      tests/php/Listener/RestrictStartingCallsTest.php
  91. 1
      tests/php/Notification/NotifierTest.php
  92. 1
      tests/php/Service/ParticipantServiceTest.php
  93. 1
      tests/php/Service/RoomServiceTest.php
  94. 1
      tests/php/Settings/Admin/AdminSettingsTest.php
  95. 1
      tests/php/Settings/Admin/SectionTest.php
  96. 4
      tests/php/Signaling/BackendNotifierTest.php
  97. 1
      tests/php/TalkSessionTest.php
  98. 8
      tests/stubs/Symfony_Component_EventDispatcher_GenericEvent.php

1
lib/Activity/Provider/Call.php

@ -27,7 +27,6 @@ use OCP\Activity\IEvent;
use OCP\IL10N;
class Call extends Base {
/**
* @param string $language
* @param IEvent $event

1
lib/Activity/Provider/Invitation.php

@ -27,7 +27,6 @@ use OCA\Talk\Exceptions\RoomNotFoundException;
use OCP\Activity\IEvent;
class Invitation extends Base {
/**
* @param string $language
* @param IEvent $event

2
lib/BackgroundJob/CheckHostedSignalingServer.php

@ -122,7 +122,7 @@ class CheckHostedSignalingServer extends TimedJob {
];
}
// only credentials have changed
// only credentials have changed
} elseif ($newStatus === 'active' && (
$oldAccountInfo['signaling']['url'] !== $accountInfo['signaling']['url'] ||
$oldAccountInfo['signaling']['secret'] !== $accountInfo['signaling']['secret'])

1
lib/Chat/Parser/Changelog.php

@ -27,7 +27,6 @@ use OCA\Talk\Model\Attendee;
use OCA\Talk\Model\Message;
class Changelog {
/**
* @param Message $chatMessage
* @throws \OutOfBoundsException

1
lib/Chat/Parser/UserMention.php

@ -37,7 +37,6 @@ use OCP\IUserManager;
* Helper class to get a rich message from a plain text message.
*/
class UserMention {
/**
* Do NOT inject OCA\Talk\Chat\CommentsManager here
* otherwise the display name resolvers are lost

2
lib/Controller/RoomController.php

@ -161,7 +161,7 @@ class RoomController extends AEnvironmentAwareController {
$this->config->getAppValue('spreed', 'sip_bridge_dialin_info') . '#' .
$this->config->getAppValue('spreed', 'sip_bridge_shared_secret') . '#' .
$this->config->getAppValue('theming', 'cachebuster', '1')
)];
)];
}
/**

3
lib/Controller/SignalingController.php

@ -54,7 +54,6 @@ use OCP\IUserManager;
use Psr\Log\LoggerInterface;
class SignalingController extends OCSController {
/** @var int */
private const PULL_MESSAGES_TIMEOUT = 30;
@ -445,7 +444,7 @@ class SignalingController extends OCSController {
*/
private function validateBackendRequest(string $data): bool {
if (!isset($_SERVER['HTTP_SPREED_SIGNALING_RANDOM'],
$_SERVER['HTTP_SPREED_SIGNALING_CHECKSUM'])) {
$_SERVER['HTTP_SPREED_SIGNALING_CHECKSUM'])) {
return false;
}
$random = $_SERVER['HTTP_SPREED_SIGNALING_RANDOM'];

1
lib/Events/EndCallForEveryoneEvent.php

@ -27,7 +27,6 @@ use OCA\Talk\Participant;
use OCA\Talk\Room;
class EndCallForEveryoneEvent extends ModifyRoomEvent {
/** @var string[] */
protected array $sessionIds = [];
/** @var string[] */

12
lib/Federation/Notifications.php

@ -149,12 +149,12 @@ class Notifications {
$notification = $this->cloudFederationFactory->getCloudFederationNotification();
$notification->setMessage(
'SHARE_ACCEPTED',
FederationManager::TALK_ROOM_RESOURCE,
$id,
[
'sharedSecret' => $token,
'message' => 'Recipient accepted the share',
]);
FederationManager::TALK_ROOM_RESOURCE,
$id,
[
'sharedSecret' => $token,
'message' => 'Recipient accepted the share',
]);
$response = $this->federationProviderManager->sendNotification($remote, $notification);
if (!is_array($response)) {
$this->logger->info(

1
lib/Flow/Operation.php

@ -45,7 +45,6 @@ use OCP\WorkflowEngine\IRuleMatcher;
use UnexpectedValueException;
class Operation implements IOperation {
/** @var int[] */
public const MESSAGE_MODES = [
'NO_MENTION' => 1,

16
lib/Manager.php

@ -489,10 +489,10 @@ class Manager {
// Non guest user
$helper->selectAttendeesTable($query);
$query->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
$query->expr()->eq('a.room_id', 'r.id')
))
$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
$query->expr()->eq('a.room_id', 'r.id')
))
->andWhere($query->expr()->isNotNull('a.id'));
}
@ -550,10 +550,10 @@ class Manager {
// Non guest user
$helper->selectAttendeesTable($query);
$query->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
$query->expr()->eq('a.room_id', 'r.id')
));
$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
$query->expr()->eq('a.room_id', 'r.id')
));
if ($sessionId !== null) {
$helper->selectSessionsTable($query);
$query->leftJoin('a', 'talk_sessions', 's', $query->expr()->andX(

2
lib/Migration/Version10000Date20201015134000.php

@ -219,7 +219,7 @@ class Version10000Date20201015134000 extends SimpleMigrationStep {
->setParameter('last_joined_call', $lastJoinedCall, IQueryBuilder::PARAM_INT)
->setParameter('last_read_message', (int) $row['last_read_message'], IQueryBuilder::PARAM_INT)
->setParameter('last_mention_message', (int) $row['last_mention_message'], IQueryBuilder::PARAM_INT)
;
;
try {
$insert->executeStatement();

1
lib/Migration/Version10000Date20201015143852.php

@ -31,7 +31,6 @@ use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
class Version10000Date20201015143852 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version10000Date20201015150000.php

@ -35,7 +35,6 @@ use OCP\Migration\SimpleMigrationStep;
* But the install migration was fixed, so this only does something on update.
*/
class Version10000Date20201015150000 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version11000Date20201011082810.php

@ -32,7 +32,6 @@ use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
class Version11000Date20201011082810 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version12000Date20210217134030.php

@ -35,7 +35,6 @@ use OCP\Migration\SimpleMigrationStep;
* allowing an attendee to have multiple sessions in the same conversation.
*/
class Version12000Date20210217134030 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version12000Date20210401124139.php

@ -32,7 +32,6 @@ use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
class Version12000Date20210401124139 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version12000Date20210528100404.php

@ -32,7 +32,6 @@ use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
class Version12000Date20210528100404 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version14000Date20220328153054.php

@ -31,7 +31,6 @@ use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
class Version14000Date20220328153054 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version15000Date20220506005058.php

@ -33,7 +33,6 @@ use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
class Version15000Date20220506005058 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version2000Date20170707093535.php

@ -30,7 +30,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version2000Date20170707093535 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version2001Date20170913104501.php

@ -30,7 +30,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version2001Date20170913104501 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version2001Date20170921145301.php

@ -30,7 +30,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version2001Date20170921145301 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version2001Date20171009132424.php

@ -30,7 +30,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version2001Date20171009132424 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version2001Date20171026141336.php

@ -29,7 +29,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version2001Date20171026141336 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version2001Date20171031102049.php

@ -30,7 +30,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version2001Date20171031102049 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version2001Date20180103150836.php

@ -29,7 +29,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version2001Date20180103150836 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version3002Date20180319104030.php

@ -29,7 +29,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version3002Date20180319104030 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version3003Date20180707222130.php

@ -30,7 +30,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version3003Date20180707222130 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version3003Date20180720162342.php

@ -30,7 +30,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version3003Date20180720162342 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version3003Date20180722152733.php

@ -29,7 +29,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version3003Date20180722152733 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version3003Date20180722152849.php

@ -30,7 +30,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version3003Date20180722152849 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version3003Date20180730080327.php

@ -30,7 +30,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version3003Date20180730080327 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version4099Date20181001123058.php

@ -30,7 +30,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version4099Date20181001123058 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version5099Date20190319134820.php

@ -30,7 +30,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version5099Date20190319134820 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version6099Date20190627172429.php

@ -30,7 +30,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version6099Date20190627172429 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Migration/Version7000Date20190717141457.php

@ -29,7 +29,6 @@ use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;
class Version7000Date20190717141457 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

1
lib/Model/AttendeeMapper.php

@ -36,7 +36,6 @@ use OCP\IDBConnection;
* @method Attendee[] findEntities(IQueryBuilder $query)
*/
class AttendeeMapper extends QBMapper {
/**
* @param IDBConnection $db
*/

1
lib/Model/CommandMapper.php

@ -27,7 +27,6 @@ use OCP\AppFramework\Db\QBMapper;
use OCP\IDBConnection;
class CommandMapper extends QBMapper {
/**
* @param IDBConnection $db
*/

1
lib/Model/Message.php

@ -30,7 +30,6 @@ use OCP\Comments\IComment;
use OCP\IL10N;
class Message {
/** @var Room */
protected $room;

1
lib/Model/PollMapper.php

@ -34,7 +34,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
class PollMapper extends QBMapper {
/**
* @param IDBConnection $db
*/

1
lib/Model/SessionMapper.php

@ -32,7 +32,6 @@ use OCP\IDBConnection;
* @method Session mapRowToEntity(array $row)
*/
class SessionMapper extends QBMapper {
/**
* @param IDBConnection $db
*/

1
lib/Model/VoteMapper.php

@ -31,7 +31,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
class VoteMapper extends QBMapper {
/**
* @param IDBConnection $db
*/

1
lib/Room.php

@ -46,7 +46,6 @@ use OCP\Security\IHasher;
use OCP\Server;
class Room {
/**
* Regex that matches SIP incompatible rooms:
* 1. duplicate digit: …11…

1
lib/Search/CurrentMessageSearch.php

@ -32,7 +32,6 @@ use OCP\Search\ISearchQuery;
use OCP\Search\SearchResult;
class CurrentMessageSearch extends MessageSearch {
/**
* @inheritDoc
*/

8
lib/Service/HostedSignalingServerService.php

@ -366,10 +366,10 @@ class HostedSignalingServerService {
if (!isset($data['status'])
|| !isset($data['created'])
|| ($data['status'] === 'active' && (
!isset($data['signaling'])
|| !isset($data['signaling']['url'])
|| !isset($data['signaling']['secret'])
)
!isset($data['signaling'])
|| !isset($data['signaling']['url'])
|| !isset($data['signaling']['secret'])
)
)
|| !isset($data['owner'])
|| !isset($data['owner']['url'])

8
lib/Service/PollService.php

@ -255,12 +255,12 @@ class PollService {
$resultQuery->selectAlias(
$resultQuery->func()->concat(
$resultQuery->expr()->literal('"'),
'option_id',
'option_id',
$resultQuery->expr()->literal('":'),
$resultQuery->func()->count('id')
),
'colonseparatedvalue'
)
),
'colonseparatedvalue'
)
->from('talk_poll_votes')
->where($resultQuery->expr()->eq('poll_id', $resultQuery->createNamedParameter($pollId)))
->groupBy('option_id')

1
lib/Share/RoomShareProvider.php

@ -65,7 +65,6 @@ use OCP\Share\IShareProvider;
* modifying the share for the other users in the room.
*/
class RoomShareProvider implements IShareProvider {
// Special share type for user modified room shares
public const SHARE_TYPE_USERROOM = 11;

1
lib/TInitialState.php

@ -36,7 +36,6 @@ use OCP\IUser;
use OCP\Util;
trait TInitialState {
/** @var Config */
protected $talkConfig;
/** @var IConfig */

2
psalm.xml

@ -54,6 +54,7 @@
<referencedClass name="OCA\Circles\Model\Member" />
<referencedClass name="OCA\DAV\CardDAV\PhotoCache" />
<referencedClass name="OCA\FederatedFileSharing\AddressHandler" />
<referencedClass name="Symfony\Component\EventDispatcher\EventDispatcherInterface" />
</errorLevel>
</UndefinedDocblockClass>
<UndefinedInterfaceMethod>
@ -74,5 +75,6 @@
</issueHandlers>
<stubs>
<file name="tests/stubs/oc_comments_manager.php" />
<file name="tests/stubs/Symfony_Component_EventDispatcher_GenericEvent.php" />
</stubs>
</psalm>

1
tests/acceptance/features/bootstrap/ChatAncestorSetter.php

@ -36,7 +36,6 @@ use Behat\Behat\Hook\Scope\BeforeScenarioScope;
* when needed.
*/
trait ChatAncestorSetter {
/**
* @var ChatContext
*/

31
tests/acceptance/features/bootstrap/ChatContext.php

@ -24,7 +24,6 @@
use Behat\Behat\Context\Context;
class ChatContext implements Context, ActorAwareInterface {
/**
* @var Actor
*/
@ -329,9 +328,9 @@ class ChatContext implements Context, ActorAwareInterface {
// Instead of waiting for the input to be enabled before sending a new
// message it is easier to wait for the working icon to not be shown.
if (!WaitFor::elementToBeEventuallyNotShown(
$this->actor,
self::newChatMessageWorkingIcon($this->chatAncestor),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::newChatMessageWorkingIcon($this->chatAncestor),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The working icon for the new message was still being shown after $timeout seconds");
}
@ -359,9 +358,9 @@ class ChatContext implements Context, ActorAwareInterface {
// Instead of waiting for the input to be enabled before sending a new
// message it is easier to wait for the working icon to not be shown.
if (!WaitFor::elementToBeEventuallyNotShown(
$this->actor,
self::newChatMessageWorkingIcon($this->chatAncestor),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::newChatMessageWorkingIcon($this->chatAncestor),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The working icon for the new message was still being shown after $timeout seconds");
}
@ -394,17 +393,17 @@ class ChatContext implements Context, ActorAwareInterface {
*/
public function iSeeThatTheMessageWasSentByWithTheText($number, $author, $message) {
if (!WaitFor::elementToBeEventuallyShown(
$this->actor,
self::authorOfChatMessage($this->chatAncestor, $number),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::authorOfChatMessage($this->chatAncestor, $number),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The author of the message $number was not shown yet after $timeout seconds");
}
PHPUnit_Framework_Assert::assertEquals($author, $this->actor->find(self::authorOfChatMessage($this->chatAncestor, $number))->getText());
if (!WaitFor::elementToBeEventuallyShown(
$this->actor,
self::textOfChatMessage($this->chatAncestor, $number),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::textOfChatMessage($this->chatAncestor, $number),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The text of the message $number was not shown yet after $timeout seconds");
}
PHPUnit_Framework_Assert::assertEquals($message, $this->actor->find(self::textOfChatMessage($this->chatAncestor, $number))->getText());
@ -415,9 +414,9 @@ class ChatContext implements Context, ActorAwareInterface {
*/
public function iSeeThatTheMessageWasSentWithTheTextAndGroupedWithThePreviousOne($number, $message) {
if (!WaitFor::elementToBeEventuallyShown(
$this->actor,
self::textOfGroupedChatMessage($this->chatAncestor, $number),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::textOfGroupedChatMessage($this->chatAncestor, $number),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The text of the message $number was not shown yet after $timeout seconds");
}
PHPUnit_Framework_Assert::assertEquals($message, $this->actor->find(self::textOfGroupedChatMessage($this->chatAncestor, $number))->getText());

6
tests/acceptance/features/bootstrap/ConversationInfoContext.php

@ -251,9 +251,9 @@ class ConversationInfoContext implements Context, ActorAwareInterface {
// menu. Therefore, if the menu is visible, wait a little just in case
// it is in the process of being hidden due to a previous action.
if (!WaitFor::elementToBeEventuallyNotShown(
$this->actor,
self::roomModerationMenu(),
$timeout = 5 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::roomModerationMenu(),
$timeout = 5 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The room moderation menu is still shown after $timeout seconds");
}

24
tests/acceptance/features/bootstrap/ConversationListContext.php

@ -227,9 +227,9 @@ class ConversationListContext implements Context, ActorAwareInterface {
*/
public function iSeeThatTheConversationIsShownInTheList($conversation) {
if (!WaitFor::elementToBeEventuallyShown(
$this->actor,
self::conversationListItemFor($conversation),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::conversationListItemFor($conversation),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The $conversation conversation is not shown yet in the list after $timeout seconds");
}
}
@ -239,9 +239,9 @@ class ConversationListContext implements Context, ActorAwareInterface {
*/
public function iSeeThatTheConversationIsNotShownInTheList($conversation) {
if (!WaitFor::elementToBeEventuallyNotShown(
$this->actor,
self::conversationListItemFor($conversation),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::conversationListItemFor($conversation),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The $conversation conversation is still shown in the list after $timeout seconds");
}
}
@ -256,9 +256,9 @@ class ConversationListContext 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::activeConversationListItemFor($conversation),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::activeConversationListItemFor($conversation),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The $conversation conversation is not active yet after $timeout seconds");
}
}
@ -268,9 +268,9 @@ class ConversationListContext implements Context, ActorAwareInterface {
*/
public function iSeeThatTheConversationIsNotActive($conversation) {
if (!WaitFor::elementToBeEventuallyNotShown(
$this->actor,
self::activeConversationListItemFor($conversation),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::activeConversationListItemFor($conversation),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The $conversation conversation is still active after $timeout seconds");
}
}

12
tests/acceptance/features/bootstrap/FilesAppChatTabContext.php

@ -67,9 +67,9 @@ class FilesAppChatTabContext implements Context, ActorAwareInterface {
*/
public function iSeeThatTheChatTabHeaderIsNotShownInTheDetailsView() {
if (!WaitFor::elementToBeEventuallyNotShown(
$this->actor,
FilesAppContext::tabHeaderInDetailsViewNamed("Chat"),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
FilesAppContext::tabHeaderInDetailsViewNamed("Chat"),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The tab header named Chat is still shown in the details view after $timeout seconds");
}
}
@ -90,9 +90,9 @@ class FilesAppChatTabContext 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,
ChatContext::chatView(FilesAppContext::tabInDetailsViewNamed("Chat")),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
ChatContext::chatView(FilesAppContext::tabInDetailsViewNamed("Chat")),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The chat was not shown yet in the chat tab after $timeout seconds");
}
}

2
tests/acceptance/features/bootstrap/FilesAppRoomSharingContext.php

@ -31,6 +31,6 @@ class FilesAppRoomSharingContext implements Context, ActorAwareInterface {
*/
public function iSeeThatTheFileIsSharedWithMeInTheConversationBy($conversationName, $sharedByName) {
PHPUnit_Framework_Assert::assertEquals(
$this->actor->find(FilesAppSharingContext::sharedByLabel(), 10)->getText(), "Shared with you and the conversation $conversationName by $sharedByName");
$this->actor->find(FilesAppSharingContext::sharedByLabel(), 10)->getText(), "Shared with you and the conversation $conversationName by $sharedByName");
}
}

12
tests/acceptance/features/bootstrap/ParticipantListContext.php

@ -99,9 +99,9 @@ class ParticipantListContext implements Context, ActorAwareInterface {
};
if (!Utils::waitFor(
$numberOfParticipantsMatchCallback,
$timeout = 10 * $this->actor->getFindTimeoutMultiplier(),
$timeoutStep = 1)) {
$numberOfParticipantsMatchCallback,
$timeout = 10 * $this->actor->getFindTimeoutMultiplier(),
$timeoutStep = 1)) {
PHPUnit_Framework_Assert::fail("The number of participants is still not $numberOfParticipants after $timeout seconds");
}
}
@ -121,9 +121,9 @@ class ParticipantListContext implements Context, ActorAwareInterface {
PHPUnit_Framework_Assert::assertNotNull($this->actor->find(self::itemInParticipantsListFor($participantName), 10));
if (!WaitFor::elementToBeEventuallyNotShown(
$this->actor,
self::moderatorIndicatorFor($participantName),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::moderatorIndicatorFor($participantName),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("Participant $participantName is still marked as a moderator after $timeout seconds but it should be a normal participant instead");
}
}

16
tests/acceptance/features/bootstrap/PublicConversationContext.php

@ -97,9 +97,9 @@ class PublicConversationContext implements Context, ActorAwareInterface {
// URL, but the authenticate page for public conversations does not, so
// it needs to be checked that the warning is shown instead.
if (!WaitFor::elementToBeEventuallyShown(
$this->actor,
self::passwordProtectedConversationWarning(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::passwordProtectedConversationWarning(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The password protected conversation warning was not shown yet after $timeout seconds");
}
}
@ -112,9 +112,9 @@ class PublicConversationContext implements Context, ActorAwareInterface {
// URL, but the authenticate page for public conversations does not, so
// it needs to be checked that the warning is shown instead.
if (!WaitFor::elementToBeEventuallyShown(
$this->actor,
self::wrongPasswordMessage(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::wrongPasswordMessage(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The wrong password warning was not shown yet after $timeout seconds");
}
}
@ -124,8 +124,8 @@ class PublicConversationContext implements Context, ActorAwareInterface {
*/
public function iSeeThatTheCurrentPageIsThePublicConversationLinkIWroteDown() {
PHPUnit_Framework_Assert::assertEquals(
$this->actor->getSharedNotebook()["public conversation link"],
$this->actor->getSession()->getCurrentUrl());
$this->actor->getSharedNotebook()["public conversation link"],
$this->actor->getSession()->getCurrentUrl());
$this->setChatAncestorForActor(TalkAppContext::mainView(), $this->actor);

8
tests/acceptance/features/bootstrap/PublicSharePasswordRequestContext.php

@ -57,9 +57,9 @@ class PublicSharePasswordRequestContext implements Context, ActorAwareInterface
*/
public function iSeeThatTheRequestPasswordButtonIsShown() {
if (!WaitFor::elementToBeEventuallyShown(
$this->actor,
self::requestPasswordButton(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::requestPasswordButton(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The request password button is not shown yet after $timeout seconds");
}
}
@ -72,7 +72,7 @@ class PublicSharePasswordRequestContext implements Context, ActorAwareInterface
// Wait a little before deciding that the button is not shown, as
// the button would be loaded after the page has loaded.
PHPUnit_Framework_Assert::assertFalse(
$this->actor->find(self::requestPasswordButton(), 5)->isVisible());
$this->actor->find(self::requestPasswordButton(), 5)->isVisible());
} catch (NoSuchElementException $exception) {
}
}

22
tests/acceptance/features/bootstrap/TalkAppContext.php

@ -106,8 +106,8 @@ class TalkAppContext implements Context, ActorAwareInterface {
*/
public function iSeeThatTheCurrentPageIsTheTalkApp() {
PHPUnit_Framework_Assert::assertStringStartsWith(
$this->actor->locatePath("/apps/spreed/"),
$this->actor->getSession()->getCurrentUrl());
$this->actor->locatePath("/apps/spreed/"),
$this->actor->getSession()->getCurrentUrl());
}
/**
@ -118,9 +118,9 @@ class TalkAppContext 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::emptyContent(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::emptyContent(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The empty content was not shown yet after $timeout seconds");
}
@ -135,9 +135,9 @@ class TalkAppContext 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::sidebar(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::sidebar(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The sidebar was not shown yet after $timeout seconds");
}
}
@ -147,9 +147,9 @@ class TalkAppContext implements Context, ActorAwareInterface {
*/
public function iSeeThatTheSidebarIsClosed() {
if (!WaitFor::elementToBeEventuallyNotShown(
$this->actor,
self::sidebar(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::sidebar(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The sidebar is still shown after $timeout seconds");
}
}

8
tests/acceptance/features/bootstrap/TalkPublicShareContext.php

@ -46,9 +46,9 @@ class TalkPublicShareContext extends PublicShareContext {
*/
public function iSeeThatTheTalkSidebarIsShownInThePublicSharePage() {
if (!WaitFor::elementToBeEventuallyShown(
$this->actor,
self::talkSidebar(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
$this->actor,
self::talkSidebar(),
$timeout = 10 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The Talk sidebar is not shown yet after $timeout seconds");
}
}
@ -68,7 +68,7 @@ class TalkPublicShareContext extends PublicShareContext {
sleep(2 * $this->actor->getFindTimeoutMultiplier());
PHPUnit_Framework_Assert::assertFalse(
$this->actor->find(self::talkSidebar())->isVisible());
$this->actor->find(self::talkSidebar())->isVisible());
} catch (NoSuchElementException $exception) {
}
}

1
tests/integration/features/bootstrap/CommandLineTrait.php

@ -28,7 +28,6 @@ use PHPUnit\Framework\Assert;
require __DIR__ . '/../../vendor/autoload.php';
trait CommandLineTrait {
/** @var int return code of last command */
private $lastCode;
/** @var string stdout of last command */

1
tests/integration/features/bootstrap/FederationContext.php

@ -35,7 +35,6 @@ require __DIR__ . '/../../vendor/autoload.php';
* Federation context.
*/
class FederationContext implements Context, SnippetAcceptingContext {
/** @var string */
private $baseUrl = '';
/** @var string */

1
tests/integration/features/bootstrap/SharingContext.php

@ -28,7 +28,6 @@ use GuzzleHttp\Cookie\CookieJar;
use Psr\Http\Message\ResponseInterface;
class SharingContext implements Context {
/** @var string */
private $baseUrl = '';

1
tests/integration/spreedcheats/lib/Controller/ApiController.php

@ -34,7 +34,6 @@ use OCP\IRequest;
use OCP\Share\IShare;
class ApiController extends OCSController {
/** @var IDBConnection */
private $db;

1
tests/php/Activity/Provider/BaseTest.php

@ -40,7 +40,6 @@ use Test\TestCase;
* @package OCA\Talk\Tests\php\Activity
*/
class BaseTest extends TestCase {
/** @var IFactory|MockObject */
protected $l10nFactory;
/** @var IURLGenerator|MockObject */

1
tests/php/Activity/Provider/InvitationTest.php

@ -42,7 +42,6 @@ use Test\TestCase;
* @package OCA\Talk\Tests\php\Activity
*/
class InvitationTest extends TestCase {
/** @var IFactory|MockObject */
protected $l10nFactory;
/** @var IURLGenerator|MockObject */

1
tests/php/BackgroundJob/CheckHostedSignalingServerTest.php

@ -38,7 +38,6 @@ use Psr\Log\LoggerInterface;
use Test\TestCase;
class CheckHostedSignalingServerTest extends TestCase {
/** @var ITimeFactory|MockObject */
protected $timeFactory;
/** @var HostedSignalingServerService|MockObject */

1
tests/php/BackgroundJob/RemoveEmptyRoomsTest.php

@ -35,7 +35,6 @@ use Psr\Log\LoggerInterface;
use Test\TestCase;
class RemoveEmptyRoomsTest extends TestCase {
/** @var ITimeFactory|MockObject */
protected $timeFactory;
/** @var Manager|MockObject */

1
tests/php/CapabilitiesTest.php

@ -39,7 +39,6 @@ use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class CapabilitiesTest extends TestCase {
/** @var IConfig|MockObject */
protected $serverConfig;
/** @var Config|MockObject */

1
tests/php/Chat/AutoComplete/SearchPluginTest.php

@ -38,7 +38,6 @@ use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class SearchPluginTest extends TestCase {
/** @var IUserManager|MockObject */
protected $userManager;
/** @var GuestManager|MockObject */

1
tests/php/Chat/AutoComplete/SorterTest.php

@ -29,7 +29,6 @@ use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class SorterTest extends TestCase {
/** @var CommentsManager|MockObject */
protected $commentsManager;

1
tests/php/Chat/ChatManagerTest.php

@ -53,7 +53,6 @@ use Test\TestCase;
* @group DB
*/
class ChatManagerTest extends TestCase {
/** @var CommentsManager|ICommentsManager|MockObject */
protected $commentsManager;
/** @var IEventDispatcher|MockObject */

1
tests/php/Chat/Command/ExecutorTest.php

@ -37,7 +37,6 @@ use Psr\Log\LoggerInterface;
use Test\TestCase;
class ExecutorTest extends TestCase {
/** @var IEventDispatcher|MockObject */
protected $dispatcher;

1
tests/php/Chat/NotifierTest.php

@ -43,7 +43,6 @@ use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class NotifierTest extends TestCase {
/** @var INotificationManager|MockObject */
protected $notificationManager;
/** @var IUserManager|MockObject */

2
tests/php/Chat/Parser/SystemMessageTest.php

@ -54,7 +54,6 @@ use Test\TestCase;
* @group DB
*/
class SystemMessageTest extends TestCase {
/** @var IUserManager|MockObject */
protected $userManager;
/** @var IGroupManager|MockObject */
@ -1094,7 +1093,6 @@ class SystemMessageTest extends TestCase {
* @param string $expected
*/
public function testGetGuestName(string $actorType, string $actorId, string $attendeeName, string $expected): void {
/** @var Room|MockObject $room */
$room = $this->createMock(Room::class);

1
tests/php/Chat/Parser/UserMentionTest.php

@ -39,7 +39,6 @@ use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class UserMentionTest extends TestCase {
/** @var ICommentsManager|MockObject */
protected $commentsManager;
/** @var IUserManager|MockObject */

2
tests/php/Chat/SystemMessage/ListenerTest.php

@ -97,7 +97,7 @@ class ListenerTest extends TestCase {
$this->session,
$this->userSession,
$this->timeFactory
);
);
$this->overwriteService(Listener::class, $this->listener);
$this->listener->register($this->eventDispatcher);

1
tests/php/Collaboration/Resources/ConversationProviderTest.php

@ -39,7 +39,6 @@ use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class ConversationProviderTest extends TestCase {
/** @var Manager|MockObject */
protected $manager;
/** @var IUserSession|MockObject */

1
tests/php/Command/Signaling/AddTest.php

@ -29,7 +29,6 @@ use Symfony\Component\Console\Output\OutputInterface;
use Test\TestCase;
class AddTest extends TestCase {
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
private $config;

1
tests/php/Command/Signaling/DeleteTest.php

@ -29,7 +29,6 @@ use Symfony\Component\Console\Output\OutputInterface;
use Test\TestCase;
class DeleteTest extends TestCase {
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
private $config;

1
tests/php/Command/Signaling/ListCommandTest.php

@ -29,7 +29,6 @@ use Symfony\Component\Console\Output\OutputInterface;
use Test\TestCase;
class ListCommandTest extends TestCase {
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
private $config;

1
tests/php/Command/Stun/AddTest.php

@ -29,7 +29,6 @@ use Symfony\Component\Console\Output\OutputInterface;
use Test\TestCase;
class AddTest extends TestCase {
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
private $config;

1
tests/php/Command/Stun/DeleteTest.php

@ -29,7 +29,6 @@ use Symfony\Component\Console\Output\OutputInterface;
use Test\TestCase;
class DeleteTest extends TestCase {
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
private $config;

1
tests/php/Command/Stun/ListCommandTest.php

@ -29,7 +29,6 @@ use Symfony\Component\Console\Output\OutputInterface;
use Test\TestCase;
class ListCommandTest extends TestCase {
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
private $config;

1
tests/php/Command/Turn/AddTest.php

@ -29,7 +29,6 @@ use Symfony\Component\Console\Output\OutputInterface;
use Test\TestCase;
class AddTest extends TestCase {
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
private $config;

1
tests/php/Command/Turn/DeleteTest.php

@ -29,7 +29,6 @@ use Symfony\Component\Console\Output\OutputInterface;
use Test\TestCase;
class DeleteTest extends TestCase {
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
private $config;

1
tests/php/Command/Turn/ListCommandTest.php

@ -29,7 +29,6 @@ use Symfony\Component\Console\Output\OutputInterface;
use Test\TestCase;
class ListCommandTest extends TestCase {
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
private $config;

1
tests/php/ConfigTest.php

@ -115,7 +115,6 @@ class ConfigTest extends TestCase {
}
public function testGenerateTurnSettings() {
/** @var MockObject|IConfig $config */
$config = $this->createMock(IConfig::class);
$config

1
tests/php/Listener/RestrictStartingCallsTest.php

@ -36,7 +36,6 @@ use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class RestrictStartingCallsTest extends TestCase {
/** @var IConfig|MockObject */
protected $serverConfig;
/** @var ParticipantService|MockObject */

1
tests/php/Notification/NotifierTest.php

@ -50,7 +50,6 @@ use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class NotifierTest extends TestCase {
/** @var IFactory|MockObject */
protected $lFactory;
/** @var IURLGenerator|MockObject */

1
tests/php/Service/ParticipantServiceTest.php

@ -49,7 +49,6 @@ use Test\TestCase;
* @group DB
*/
class ParticipantServiceTest extends TestCase {
/** @var IConfig|MockObject */
protected $serverConfig;
/** @var Config|MockObject */

1
tests/php/Service/RoomServiceTest.php

@ -50,7 +50,6 @@ use Test\TestCase;
* @group DB
*/
class RoomServiceTest extends TestCase {
/** @var Manager|MockObject */
protected $manager;
/** @var ParticipantService|MockObject */

1
tests/php/Settings/Admin/AdminSettingsTest.php

@ -38,7 +38,6 @@ use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class AdminSettingsTest extends TestCase {
/** @var Config|MockObject */
protected $talkConfig;
/** @var IConfig|MockObject */

1
tests/php/Settings/Admin/SectionTest.php

@ -30,7 +30,6 @@ use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class SectionTest extends TestCase {
/** @var IURLGenerator|MockObject */
protected $url;
/** @var IL10N|MockObject */

4
tests/php/Signaling/BackendNotifierTest.php

@ -246,7 +246,7 @@ class BackendNotifierTest extends TestCase {
[$a['userId'] ?? '', $a['participantType'], $a['sessionId'], $a['lastPing']]
<=>
[$b['userId'] ?? '', $b['participantType'], $b['sessionId'], $b['lastPing']]
;
;
});
}
if ($message['type'] === 'incall') {
@ -255,7 +255,7 @@ class BackendNotifierTest extends TestCase {
[$a['userId'] ?? '', $a['participantType'], $a['sessionId'], $a['lastPing']]
<=>
[$b['userId'] ?? '', $b['participantType'], $b['sessionId'], $b['lastPing']]
;
;
});
}
return $message;

1
tests/php/TalkSessionTest.php

@ -31,7 +31,6 @@ use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class TalkSessionTest extends TestCase {
/** @var ISession|MockObject */
protected $session;

8
tests/stubs/Symfony_Component_EventDispatcher_GenericEvent.php

@ -0,0 +1,8 @@
<?php
namespace Symfony\Component\EventDispatcher;
class GenericEvent {
public function getSubject() {
}
}
Loading…
Cancel
Save