From 2d3a3b96bfb1c09e4a8718c2742deec8b94fcdc8 Mon Sep 17 00:00:00 2001 From: grnd-alt Date: Mon, 15 Jun 2026 12:23:18 +0200 Subject: [PATCH 1/3] chore(php): bump php to 8.3 Signed-off-by: grnd-alt --- psalm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/psalm.xml b/psalm.xml index bd7ead736e..2963f3fefe 100644 --- a/psalm.xml +++ b/psalm.xml @@ -8,7 +8,7 @@ errorBaseline="tests/psalm-baseline.xml" findUnusedBaselineEntry="true" findUnusedCode="false" - phpVersion="8.2" + phpVersion="8.3" > From d6bb4af108f760c8e13ab3f2fdf7e64ae44fe138 Mon Sep 17 00:00:00 2001 From: grnd-alt Date: Mon, 15 Jun 2026 12:53:15 +0200 Subject: [PATCH 2/3] chore(ci): fix wrong type annotations Signed-off-by: grnd-alt --- lib/Service/FileService.php | 2 +- lib/Service/FilesAppService.php | 2 +- lib/Service/PermissionService.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Service/FileService.php b/lib/Service/FileService.php index 77c4953b05..df7bdbed84 100644 --- a/lib/Service/FileService.php +++ b/lib/Service/FileService.php @@ -83,7 +83,7 @@ public function extendData(Attachment $attachment) { } /** - * @return array + * @return array|null * @throws StatusException */ private function getUploadedFile() { diff --git a/lib/Service/FilesAppService.php b/lib/Service/FilesAppService.php index f11054dc30..75788ecf1c 100644 --- a/lib/Service/FilesAppService.php +++ b/lib/Service/FilesAppService.php @@ -332,7 +332,7 @@ public function createFromImport(Attachment $attachment, string $content): Attac } /** - * @return array + * @return array|null * @throws StatusException */ private function getUploadedFile() { diff --git a/lib/Service/PermissionService.php b/lib/Service/PermissionService.php index 628e610e7e..2f370fa457 100644 --- a/lib/Service/PermissionService.php +++ b/lib/Service/PermissionService.php @@ -303,7 +303,7 @@ public function findUsers($boardId, $refresh = false) { continue; } foreach ($group->getUsers() as $user) { - $users[(string)$user->getUID()] = new User($user->getUID(), $this->userManager); + $users[$user->getUID()] = new User($user->getUID(), $this->userManager); } } From 55d63497893c38ab5abe6bc3262032b8f4ff1803 Mon Sep 17 00:00:00 2001 From: grnd-alt Date: Mon, 15 Jun 2026 15:44:26 +0200 Subject: [PATCH 3/3] chore(ci): bump php version to 8.3 Signed-off-by: grnd-alt --- .github/workflows/cypress-e2e.yml | 2 +- .github/workflows/integration-federation.yml | 2 +- .github/workflows/integration.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cypress-e2e.yml b/.github/workflows/cypress-e2e.yml index 1986e6da21..d086bc8853 100644 --- a/.github/workflows/cypress-e2e.yml +++ b/.github/workflows/cypress-e2e.yml @@ -24,7 +24,7 @@ jobs: matrix: node-version: [20.x] containers: [1, 2, 3] - php-versions: [ '8.2' ] + php-versions: [ '8.3' ] server-versions: [ 'master' ] name: runner ${{ matrix.containers }} diff --git a/.github/workflows/integration-federation.yml b/.github/workflows/integration-federation.yml index daf6bcc744..7ccd7ec52f 100644 --- a/.github/workflows/integration-federation.yml +++ b/.github/workflows/integration-federation.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2'] + php-versions: ['8.3'] server-versions: ['master'] name: php${{ matrix.php-versions }}-${{ matrix.server-versions }} diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 0cca474bad..c31f2006d9 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2'] + php-versions: ['8.3'] databases: ['sqlite', 'mysql', 'pgsql'] server-versions: ['master']