summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.drone.yml88
-rw-r--r--tests/php/Activity/Provider/BaseTest.php2
-rw-r--r--tests/php/Activity/Provider/InvitationTest.php2
-rw-r--r--tests/php/CapabilitiesTest.php2
-rw-r--r--tests/php/Chat/AutoComplete/SearchPluginTest.php2
-rw-r--r--tests/php/Chat/AutoComplete/SorterTest.php2
-rw-r--r--tests/php/Chat/ChatManagerTest.php2
-rw-r--r--tests/php/Chat/Command/ExecutorTest.php2
-rw-r--r--tests/php/Chat/NotifierTest.php2
-rw-r--r--tests/php/Chat/Parser/SystemMessageTest.php2
-rw-r--r--tests/php/Chat/Parser/UserMentionTest.php2
-rw-r--r--tests/php/Collaboration/Collaborators/RoomPluginTest.php2
-rw-r--r--tests/php/Collaboration/Resources/ConversationProviderTest.php2
-rw-r--r--tests/php/Command/Signaling/AddTest.php2
-rw-r--r--tests/php/Command/Signaling/DeleteTest.php2
-rw-r--r--tests/php/Command/Signaling/ListCommandTest.php2
-rw-r--r--tests/php/Command/Stun/AddTest.php2
-rw-r--r--tests/php/Command/Stun/DeleteTest.php2
-rw-r--r--tests/php/Command/Stun/ListCommandTest.php2
-rw-r--r--tests/php/Command/Turn/AddTest.php2
-rw-r--r--tests/php/Command/Turn/DeleteTest.php2
-rw-r--r--tests/php/Command/Turn/ListCommandTest.php2
-rw-r--r--tests/php/Controller/ChatControllerTest.php2
-rw-r--r--tests/php/Controller/RoomControllerTest.php2
-rw-r--r--tests/php/Controller/SignalingControllerTest.php2
-rw-r--r--tests/php/Notification/NotifierTest.php2
-rw-r--r--tests/php/Settings/Admin/SectionTest.php2
-rw-r--r--tests/php/Settings/Admin/StunServerTest.php2
-rw-r--r--tests/php/Settings/Admin/TurnServerTest.php2
-rw-r--r--tests/php/Signaling/BackendNotifierTest.php4
-rw-r--r--tests/php/TalkSessionTest.php2
31 files changed, 75 insertions, 75 deletions
diff --git a/.drone.yml b/.drone.yml
index 5224e0d3a..f1891e372 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -63,8 +63,8 @@ kind: pipeline
name: compatibility
steps:
- - name: syntax-php7.1
- image: nextcloudci/php7.1:php7.1-16
+ - name: syntax-php7.2
+ image: nextcloudci/php7.2:php7.2-13
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -75,8 +75,8 @@ steps:
- cd ../server
- composer install
- ./lib/composer/bin/parallel-lint apps/$APP_NAME/
- - name: syntax-php7.3
- image: nextcloudci/php7.3:php7.3-1
+ - name: syntax-php7.4
+ image: nextcloudci/php7.4:php7.4-2
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -88,7 +88,7 @@ steps:
- composer install
- ./lib/composer/bin/parallel-lint apps/$APP_NAME/
- name: app-code-check
- image: nextcloudci/php7.3:php7.3-1
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -110,11 +110,11 @@ trigger:
---
kind: pipeline
-name: unit-sqlite-php7.1
+name: unit-sqlite-php7.2
steps:
- - name: sqlite-php7.1
- image: nextcloudci/php7.1:php7.1-16
+ - name: sqlite-php7.2
+ image: nextcloudci/php7.2:php7.2-13
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -141,11 +141,11 @@ trigger:
---
kind: pipeline
-name: unit-sqlite-php7.2
+name: unit-sqlite-php7.3
steps:
- - name: sqlite-php7.2
- image: nextcloudci/php7.2:php7.2-12
+ - name: sqlite-php7.3
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -172,11 +172,11 @@ trigger:
---
kind: pipeline
-name: unit-sqlite-php7.3
+name: unit-sqlite-php7.4
steps:
- - name: sqlite-php7.3
- image: nextcloudci/php7.3:php7.3-1
+ - name: sqlite-php7.4
+ image: nextcloudci/php7.4:php7.4-2
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -203,11 +203,11 @@ trigger:
---
kind: pipeline
-name: unit-mysql-php7.1
+name: unit-mysql-php7.2
steps:
- - name: mysql-php7.1
- image: nextcloudci/php7.1:php7.1-16
+ - name: mysql-php7.2
+ image: nextcloudci/php7.2:php7.2-13
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -248,11 +248,11 @@ trigger:
---
kind: pipeline
-name: unit-mysql-php7.2
+name: unit-mysql-php7.3
steps:
- - name: mysql-php7.2
- image: nextcloudci/php7.2:php7.2-12
+ - name: mysql-php7.3
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -293,11 +293,11 @@ trigger:
---
kind: pipeline
-name: unit-mysql-php7.3
+name: unit-mysql-php7.4
steps:
- - name: mysql-php7.3
- image: nextcloudci/php7.3:php7.3-1
+ - name: mysql-php7.4
+ image: nextcloudci/php7.4:php7.4-2
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -338,11 +338,11 @@ trigger:
---
kind: pipeline
-name: unit-pgsql-php7.1
+name: unit-pgsql-php7.2
steps:
- - name: pgsql-php7.1
- image: nextcloudci/php7.1:php7.1-16
+ - name: pgsql-php7.2
+ image: nextcloudci/php7.2:php7.2-13
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -381,11 +381,11 @@ trigger:
---
kind: pipeline
-name: unit-pgsql-php7.2
+name: unit-pgsql-php7.3
steps:
- - name: pgsql-php7.2
- image: nextcloudci/php7.2:php7.2-12
+ - name: pgsql-php7.3
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -424,11 +424,11 @@ trigger:
---
kind: pipeline
-name: unit-pgsql-php7.3
+name: unit-pgsql-php7.4
steps:
- - name: pgsql-php7.3
- image: nextcloudci/php7.3:php7.3-1
+ - name: pgsql-php7.4
+ image: nextcloudci/php7.4:php7.4-2
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -471,7 +471,7 @@ name: int-sqlite-callapi
steps:
- name: integration-callapi
- image: nextcloudci/php7.1:php7.1-16
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -506,7 +506,7 @@ name: int-sqlite-chat
steps:
- name: integration-chat
- image: nextcloudci/php7.1:php7.1-16
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -541,7 +541,7 @@ name: int-sqlite-conversation
steps:
- name: integration-conversation
- image: nextcloudci/php7.1:php7.1-16
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -576,7 +576,7 @@ name: int-sqlite-sharing
steps:
- name: integration-sharing
- image: nextcloudci/php7.1:php7.1-16
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -611,7 +611,7 @@ name: int-mysql-callapi
steps:
- name: integration-callapi
- image: nextcloudci/php7.1:php7.1-16
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -656,7 +656,7 @@ name: int-mysql-chat
steps:
- name: integration-chat
- image: nextcloudci/php7.1:php7.1-16
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -701,7 +701,7 @@ name: int-mysql-conversation
steps:
- name: integration-conversation
- image: nextcloudci/php7.1:php7.1-16
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -746,7 +746,7 @@ name: int-mysql-sharing
steps:
- name: integration-sharing
- image: nextcloudci/php7.1:php7.1-16
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -791,7 +791,7 @@ name: int-pgsql-callapi
steps:
- name: integration-callapi
- image: nextcloudci/php7.1:php7.1-16
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -834,7 +834,7 @@ name: int-pgsql-chat
steps:
- name: integration-chat
- image: nextcloudci/php7.1:php7.1-16
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -877,7 +877,7 @@ name: int-pgsql-conversation
steps:
- name: integration-conversation
- image: nextcloudci/php7.1:php7.1-16
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
@@ -920,7 +920,7 @@ name: int-pgsql-sharing
steps:
- name: integration-sharing
- image: nextcloudci/php7.1:php7.1-16
+ image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: master
diff --git a/tests/php/Activity/Provider/BaseTest.php b/tests/php/Activity/Provider/BaseTest.php
index 35a9c3bca..22d1521fe 100644
--- a/tests/php/Activity/Provider/BaseTest.php
+++ b/tests/php/Activity/Provider/BaseTest.php
@@ -56,7 +56,7 @@ class BaseTest extends TestCase {
/** @var Manager|MockObject */
protected $manager;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->l10nFactory = $this->createMock(IFactory::class);
diff --git a/tests/php/Activity/Provider/InvitationTest.php b/tests/php/Activity/Provider/InvitationTest.php
index 15055f390..25d097402 100644
--- a/tests/php/Activity/Provider/InvitationTest.php
+++ b/tests/php/Activity/Provider/InvitationTest.php
@@ -57,7 +57,7 @@ class InvitationTest extends TestCase {
/** @var Manager|MockObject */
protected $manager;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->l10nFactory = $this->createMock(IFactory::class);
diff --git a/tests/php/CapabilitiesTest.php b/tests/php/CapabilitiesTest.php
index c1eedac7d..a0e29b76a 100644
--- a/tests/php/CapabilitiesTest.php
+++ b/tests/php/CapabilitiesTest.php
@@ -42,7 +42,7 @@ class CapabilitiesTest extends TestCase {
/** @var IUserSession|MockObject */
protected $userSession;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->serverConfig = $this->createMock(IConfig::class);
$this->talkConfig = $this->createMock(Config::class);
diff --git a/tests/php/Chat/AutoComplete/SearchPluginTest.php b/tests/php/Chat/AutoComplete/SearchPluginTest.php
index bae101153..bc05f217f 100644
--- a/tests/php/Chat/AutoComplete/SearchPluginTest.php
+++ b/tests/php/Chat/AutoComplete/SearchPluginTest.php
@@ -50,7 +50,7 @@ class SearchPluginTest extends \Test\TestCase {
/** @var SearchPlugin */
protected $plugin;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->userManager = $this->createMock(IUserManager::class);
diff --git a/tests/php/Chat/AutoComplete/SorterTest.php b/tests/php/Chat/AutoComplete/SorterTest.php
index a04c325be..84abcb6dd 100644
--- a/tests/php/Chat/AutoComplete/SorterTest.php
+++ b/tests/php/Chat/AutoComplete/SorterTest.php
@@ -61,7 +61,7 @@ class SorterTest extends \Test\TestCase {
],
];
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->commentsManager = $this->createMock(CommentsManager::class);
diff --git a/tests/php/Chat/ChatManagerTest.php b/tests/php/Chat/ChatManagerTest.php
index e9f56f164..647f5a317 100644
--- a/tests/php/Chat/ChatManagerTest.php
+++ b/tests/php/Chat/ChatManagerTest.php
@@ -49,7 +49,7 @@ class ChatManagerTest extends TestCase {
/** @var ChatManager */
protected $chatManager;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->commentsManager = $this->createMock(CommentsManager::class);
diff --git a/tests/php/Chat/Command/ExecutorTest.php b/tests/php/Chat/Command/ExecutorTest.php
index f21f1cf02..9b449123a 100644
--- a/tests/php/Chat/Command/ExecutorTest.php
+++ b/tests/php/Chat/Command/ExecutorTest.php
@@ -56,7 +56,7 @@ class ExecutorTest extends TestCase {
/** @var Executor */
protected $executor;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->dispatcher = $this->createMock(EventDispatcherInterface::class);
diff --git a/tests/php/Chat/NotifierTest.php b/tests/php/Chat/NotifierTest.php
index b88244c59..375587af7 100644
--- a/tests/php/Chat/NotifierTest.php
+++ b/tests/php/Chat/NotifierTest.php
@@ -51,7 +51,7 @@ class NotifierTest extends \Test\TestCase {
/** @var \OCA\Talk\Chat\Notifier */
protected $notifier;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->notificationManager = $this->createMock(INotificationManager::class);
diff --git a/tests/php/Chat/Parser/SystemMessageTest.php b/tests/php/Chat/Parser/SystemMessageTest.php
index bc045789f..8544e7d7d 100644
--- a/tests/php/Chat/Parser/SystemMessageTest.php
+++ b/tests/php/Chat/Parser/SystemMessageTest.php
@@ -61,7 +61,7 @@ class SystemMessageTest extends TestCase {
/** @var IL10N|MockObject */
protected $l;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->userManager = $this->createMock(IUserManager::class);
diff --git a/tests/php/Chat/Parser/UserMentionTest.php b/tests/php/Chat/Parser/UserMentionTest.php
index 7cdb2cbec..2e9f7a8a3 100644
--- a/tests/php/Chat/Parser/UserMentionTest.php
+++ b/tests/php/Chat/Parser/UserMentionTest.php
@@ -50,7 +50,7 @@ class UserMentionTest extends \Test\TestCase {
/** @var UserMention */
protected $parser;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->commentsManager = $this->createMock(ICommentsManager::class);
diff --git a/tests/php/Collaboration/Collaborators/RoomPluginTest.php b/tests/php/Collaboration/Collaborators/RoomPluginTest.php
index 0be7971b1..897859fb8 100644
--- a/tests/php/Collaboration/Collaborators/RoomPluginTest.php
+++ b/tests/php/Collaboration/Collaborators/RoomPluginTest.php
@@ -50,7 +50,7 @@ class RoomPluginTest extends \Test\TestCase {
/** @var RoomPlugin */
protected $plugin;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->manager = $this->createMock(Manager::class);
diff --git a/tests/php/Collaboration/Resources/ConversationProviderTest.php b/tests/php/Collaboration/Resources/ConversationProviderTest.php
index b8423eb58..a8c7c4211 100644
--- a/tests/php/Collaboration/Resources/ConversationProviderTest.php
+++ b/tests/php/Collaboration/Resources/ConversationProviderTest.php
@@ -49,7 +49,7 @@ class ConversationProviderTest extends TestCase {
/** @var ConversationProvider */
protected $provider;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->manager = $this->createMock(Manager::class);
diff --git a/tests/php/Command/Signaling/AddTest.php b/tests/php/Command/Signaling/AddTest.php
index 75c60ad46..c1abd4d24 100644
--- a/tests/php/Command/Signaling/AddTest.php
+++ b/tests/php/Command/Signaling/AddTest.php
@@ -42,7 +42,7 @@ class AddTest extends TestCase {
/** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */
private $output;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->config = $this->createMock(IConfig::class);
diff --git a/tests/php/Command/Signaling/DeleteTest.php b/tests/php/Command/Signaling/DeleteTest.php
index 06efcf047..cd962ec9f 100644
--- a/tests/php/Command/Signaling/DeleteTest.php
+++ b/tests/php/Command/Signaling/DeleteTest.php
@@ -42,7 +42,7 @@ class DeleteTest extends TestCase {
/** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */
private $output;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->config = $this->createMock(IConfig::class);
diff --git a/tests/php/Command/Signaling/ListCommandTest.php b/tests/php/Command/Signaling/ListCommandTest.php
index bb426d9bb..a96ff3e26 100644
--- a/tests/php/Command/Signaling/ListCommandTest.php
+++ b/tests/php/Command/Signaling/ListCommandTest.php
@@ -42,7 +42,7 @@ class ListCommandTest extends TestCase {
/** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */
private $output;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->