summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2023-02-03 15:12:27 +0100
committerGitHub <noreply@github.com>2023-02-03 15:12:27 +0100
commit10bdff60fd692d5e509f6fe701b9c2b610930b0d (patch)
tree76de810b2696439208fde83dc167001f4cc92547
parent8df23d48862fd556b5b01b03db13c41b001b4037 (diff)
parent58668bd54d6177437d0bd1ec6d273a2e96313dfd (diff)
Merge pull request #8672 from nextcloud/techdebt/noid/php8.2-support
Add PHP 8.2 support
-rw-r--r--.github/workflows/phpunit-mysql.yml3
-rw-r--r--.github/workflows/phpunit-oci.yml1
-rw-r--r--.github/workflows/phpunit-pgsql.yml1
-rw-r--r--.github/workflows/phpunit-sqlite.yml1
-rw-r--r--.github/workflows/psalm.yml1
-rw-r--r--tests/php/Chat/ChatManagerTest.php7
-rw-r--r--tests/php/Federation/FederationTest.php2
-rw-r--r--tests/php/Service/BreakoutRoomServiceTest.php2
-rw-r--r--tests/php/Service/RoomServiceTest.php2
9 files changed, 12 insertions, 8 deletions
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index bf3aaa5c5..6508c8b78 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -38,7 +38,7 @@ jobs:
strategy:
matrix:
- php-versions: ['8.0', '8.1']
+ php-versions: ['8.0', '8.1', '8.2']
server-versions: ['master']
services:
@@ -79,6 +79,7 @@ jobs:
php-version: ${{ matrix.php-versions }}
extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql
coverage: none
+ ini-file: development
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
index 930d2c243..9424f7d26 100644
--- a/.github/workflows/phpunit-oci.yml
+++ b/.github/workflows/phpunit-oci.yml
@@ -71,6 +71,7 @@ jobs:
php-version: ${{ matrix.php-versions }}
extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, oci8
coverage: none
+ ini-file: development
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
index 8ec26389d..16a470ad8 100644
--- a/.github/workflows/phpunit-pgsql.yml
+++ b/.github/workflows/phpunit-pgsql.yml
@@ -76,6 +76,7 @@ jobs:
php-version: ${{ matrix.php-versions }}
extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql
coverage: none
+ ini-file: development
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
index f1e432afb..5a17f4ea9 100644
--- a/.github/workflows/phpunit-sqlite.yml
+++ b/.github/workflows/phpunit-sqlite.yml
@@ -65,6 +65,7 @@ jobs:
php-version: ${{ matrix.php-versions }}
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
coverage: none
+ ini-file: development
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index 15cab7e30..8080640ff 100644
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -31,6 +31,7 @@ jobs:
with:
php-version: 8.1
coverage: none
+ ini-file: development
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/tests/php/Chat/ChatManagerTest.php b/tests/php/Chat/ChatManagerTest.php
index 0586011a8..5ae6955e5 100644
--- a/tests/php/Chat/ChatManagerTest.php
+++ b/tests/php/Chat/ChatManagerTest.php
@@ -173,13 +173,6 @@ class ChatManagerTest extends TestCase {
$comment->method('getCreationDateTime')->willReturn($creationDateTime);
$comment->method('getMessage')->willReturn($message);
- // Used for equals comparison
- $comment->id = $id;
- $comment->actorType = $actorType;
- $comment->actorId = $actorId;
- $comment->creationDateTime = $creationDateTime;
- $comment->message = $message;
-
return $comment;
}
diff --git a/tests/php/Federation/FederationTest.php b/tests/php/Federation/FederationTest.php
index 0b6b6d147..adfde6edb 100644
--- a/tests/php/Federation/FederationTest.php
+++ b/tests/php/Federation/FederationTest.php
@@ -62,6 +62,8 @@ class FederationTest extends TestCase {
/** @var Config|MockObject */
protected $config;
+ /** @var LoggerInterface|MockObject */
+ protected $logger;
/** @var AddressHandler|MockObject */
protected $addressHandler;
diff --git a/tests/php/Service/BreakoutRoomServiceTest.php b/tests/php/Service/BreakoutRoomServiceTest.php
index 4292a0547..9c4ca88bd 100644
--- a/tests/php/Service/BreakoutRoomServiceTest.php
+++ b/tests/php/Service/BreakoutRoomServiceTest.php
@@ -51,6 +51,8 @@ class BreakoutRoomServiceTest extends TestCase {
private $participantService;
/** @var ChatManager|MockObject */
private $chatManager;
+ /** @var INotificationManager|MockObject */
+ private $notificationManager;
/** @var IEventDispatcher|MockObject */
private $dispatcher;
/** @var IL10N|MockObject */
diff --git a/tests/php/Service/RoomServiceTest.php b/tests/php/Service/RoomServiceTest.php
index a8b1fcf64..9334f2d71 100644
--- a/tests/php/Service/RoomServiceTest.php
+++ b/tests/php/Service/RoomServiceTest.php
@@ -54,6 +54,8 @@ class RoomServiceTest extends TestCase {
protected $manager;
/** @var ParticipantService|MockObject */
protected $participantService;
+ /** @var ITimeFactory|MockObject */
+ protected $timeFactory;
/** @var IShareManager|MockObject */
protected $shareManager;
/** @var Config|MockObject */