Merge pull request #8067 from nextcloud/chore/bump-php-to-8.3

grnd-alt · web-flow · commit e3a2761c01bb · 2026-06-15T15:59:33.000+02:00
chore(php): bump php to 8.3
diff --git 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
@@ -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
@@ -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']
 
diff --git 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
@@ -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
@@ -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);
 				}
 			}
 
diff --git 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"
 >
 	<stubs>
 		<file name="tests/stub.phpstub" preloadClasses="true"/>

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function extendData(Attachment $attachment) {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`/**`
`86`		`- * @return array`
	`86`	`+ * @return array\|null`
`87`	`87`	`* @throws StatusException`
`88`	`88`	`*/`
`89`	`89`	`private function getUploadedFile() {`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ public function createFromImport(Attachment $attachment, string $content): Attac`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`/**`
`335`		`- * @return array`
	`335`	`+ * @return array\|null`
`336`	`336`	`* @throws StatusException`
`337`	`337`	`*/`
`338`	`338`	`private function getUploadedFile() {`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ public function findUsers($boardId, $refresh = false) {`
`303`	`303`	`continue;`
`304`	`304`	`}`
`305`	`305`	`foreach ($group->getUsers() as $user) {`
`306`		`- $users[(string)$user->getUID()] = new User($user->getUID(), $this->userManager);`
	`306`	`+ $users[$user->getUID()] = new User($user->getUID(), $this->userManager);`
`307`	`307`	`}`
`308`	`308`	`}`
`309`	`309`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`errorBaseline="tests/psalm-baseline.xml"`
`9`	`9`	`findUnusedBaselineEntry="true"`
`10`	`10`	`findUnusedCode="false"`
`11`		`- phpVersion="8.2"`
	`11`	`+ phpVersion="8.3"`
`12`	`12`	`>`
`13`	`13`	`<stubs>`
`14`	`14`	`<file name="tests/stub.phpstub" preloadClasses="true"/>`