Fix deprecations in tests

.github/workflows/phpunit-mariadb.yml

@@ -104,6 +104,7 @@ jobs:
           ini-file: development
           ini-values: disable_functions=""
         env:
+          fail-fast: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up dependencies

.github/workflows/phpunit-memcached.yml

@@ -88,6 +88,7 @@ jobs:
           ini-file: development
           ini-values: disable_functions=""
         env:
+          fail-fast: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up dependencies

.github/workflows/phpunit-mysql-sharding.yml

@@ -56,8 +56,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2']
-        mysql-versions: ['8.4']
+        php-versions: ["8.2"]
+        mysql-versions: ["8.4"]
 
     name: Sharding - MySQL ${{ matrix.mysql-versions }} (PHP ${{ matrix.php-versions }}) - database tests
 
@@ -137,6 +137,7 @@ jobs:
           ini-file: development
           ini-values: disable_functions=""
         env:
+          fail-fast: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up dependencies

.github/workflows/phpunit-mysql.yml

@@ -104,6 +104,7 @@ jobs:
           ini-file: development
           ini-values: disable_functions=""
         env:
+          fail-fast: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up dependencies

.github/workflows/phpunit-nodb.yml

@@ -59,9 +59,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4', '8.5']
+        php-versions: ["8.3", "8.4", "8.5"]
         include:
-          - php-versions: '8.2'
+          - php-versions: "8.2"
             coverage: ${{ github.event_name != 'pull_request' }}
 
     name: No DB unit tests (PHP ${{ matrix.php-versions }})
@@ -86,12 +86,13 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
-          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, imagick, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
+          extensions: apcu, bz2, ctype, curl, dom, fileinfo, gd, iconv, imagick, intl, json, libxml, mbstring, openssl, pcntl, pdo_sqlite, posix, redis, session, simplexml, sqlite, xmlreader, xmlwriter, zip, zlib
           coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
           ini-file: development
           # Required for tests that use pcntl
           ini-values: disable_functions=""
         env:
+          fail-fast: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up dependencies
@@ -106,7 +107,7 @@ jobs:
           php -f tests/enable_all.php
 
       - name: PHPUnit nodb testsuite
-        run: composer run test -- --exclude-group DB --exclude-group SLOWDB --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.nodb.xml' || '' }}
+        run: composer run test -- --exclude-group DB --exclude-group SLOWDB --exclude-group Memcached --exclude-group PRIMARY-swift --exclude-group PRIMARY-s3 --exclude-group PRIMARY-azure --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.nodb.xml' || '' }}
 
       - name: Upload nodb code coverage
         if: ${{ !cancelled() && matrix.coverage }}

.github/workflows/phpunit-object-store-primary.yml

@@ -49,8 +49,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.2']
-        key: ['s3', 's3-multibucket']
+        php-versions: ["8.2"]
+        key: ["s3", "s3-multibucket"]
 
     name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio
 
@@ -84,6 +84,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
         env:
+          fail-fast: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Nextcloud
@@ -113,10 +114,9 @@ jobs:
           docker ps -a
           docker ps -aq | while read container ; do IMAGE=$(docker inspect --format='{{.Config.Image}}' $container); echo $IMAGE; docker logs $container; echo "\n\n" ; done
 
-
   object-store-primary-summary:
     runs-on: ubuntu-latest-low
-    needs: [changes,object-store-primary-tests-minio]
+    needs: [changes, object-store-primary-tests-minio]
 
     if: always()
 

.github/workflows/phpunit-oci.yml

@@ -111,6 +111,7 @@ jobs:
           ini-file: development
           ini-values: disable_functions=""
         env:
+          fail-fast: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up dependencies

.github/workflows/phpunit-pgsql.yml

@@ -107,6 +107,7 @@ jobs:
           ini-file: development
           ini-values: disable_functions=""
         env:
+          fail-fast: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up dependencies

.github/workflows/phpunit-sqlite.yml

@@ -90,6 +90,7 @@ jobs:
           ini-file: development
           ini-values: disable_functions=""
         env:
+          fail-fast: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up dependencies
@@ -110,7 +111,7 @@ jobs:
         run: ./occ app:list && echo "======= System config =======" && ./occ config:list system
 
       - name: PHPUnit database tests
-        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }} tests/lib/Preview/PostscriptTest.php
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}

apps/dav/lib/CardDAV/AddressBookImpl.php

@@ -41,9 +41,10 @@ public function __construct(
 	/**
 	 * @return string defining the technical unique key
 	 * @since 5.0.0
+	 * @since 35.0.0 Typed return type
 	 */
 	#[\Override]
-	public function getKey() {
+	public function getKey(): string {
 		return (string)$this->addressBookInfo['id'];
 	}
 

apps/dav/lib/Connector/Sabre/Principal.php

@@ -496,10 +496,9 @@ protected function userToPrincipal($user, ?array $propertyFilter = null) {
 		};
 
 		$userId = $user->getUID();
-		$displayName = $user->getDisplayName();
 		$principal = [
 			'uri' => $this->principalPrefix . '/' . $userId,
-			'{DAV:}displayname' => is_null($displayName) ? $userId : $displayName,
+			'{DAV:}displayname' => $user->getDisplayName(),
 			'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => 'INDIVIDUAL',
 		];
 

apps/dav/tests/unit/Connector/Sabre/AddExtraHeadersPluginTest.php

@@ -81,9 +81,13 @@ function ($method, $callback) use (&$afterPut): void {
 		$this->tree->expects($this->once())->method('getNodeForPath')
 			->willReturn($node);
 
-		$user = $this->createMock(IUser::class);
-		$node->expects($this->once())->method('getOwner')->willReturn($user);
-		$user->expects($this->once())->method('getUID')->willReturn($ownerId);
+		if ($ownerId !== null) {
+			$user = $this->createMock(IUser::class);
+			$node->expects($this->once())->method('getOwner')->willReturn($user);
+			$user->expects($this->once())->method('getUID')->willReturn($ownerId);
+		} else {
+			$node->expects($this->once())->method('getOwner')->willReturn(null);
+		}
 		$node->expects($this->once())->method('getDavPermissions')->willReturn($permissions);
 
 		$matcher = $this->exactly($expectedInvocations);

apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php

@@ -101,6 +101,10 @@ public function testGetPrincipalsByPrefixWithUsers(): void {
 			->expects($this->once())
 			->method('getSystemEMailAddress')
 			->willReturn('bar@nextcloud.com');
+		$barUser
+			->expects($this->once())
+			->method('getDisplayName')
+			->willReturn('bar');
 		$this->userManager
 			->expects($this->once())
 			->method('search')
@@ -189,6 +193,10 @@ public function testGetPrincipalsByPathWithoutMail(): void {
 			->expects($this->once())
 			->method('getUID')
 			->willReturn('foo');
+		$fooUser
+			->expects($this->once())
+			->method('getDisplayName')
+			->willReturn('foo');
 		$this->userManager
 			->expects($this->once())
 			->method('get')
@@ -221,6 +229,10 @@ public function testGetPrincipalsByPathWithMail(): void {
 			->expects($this->once())
 			->method('getUID')
 			->willReturn('foo');
+		$fooUser
+			->expects($this->once())
+			->method('getDisplayName')
+			->willReturn('foo');
 		$this->userManager
 			->expects($this->once())
 			->method('get')

apps/files_sharing/tests/ShareTest.php

@@ -148,8 +148,6 @@ public function testShareWithDifferentShareFolder(): void {
 	}
 
 	public function testShareWithGroupUniqueName(): void {
-		$this->markTestSkipped('TODO: Disable because fails on drone');
-
 		$this->loginHelper(self::TEST_FILES_SHARING_API_USER1);
 		Filesystem::file_put_contents('test.txt', 'test');
 

apps/files_trashbin/lib/Trashbin.php

@@ -850,7 +850,7 @@ private static function calculateFreeSpace(Folder $userFolder, int|float $trashb
 
 		$softQuota = true;
 		$quota = $user->getQuota();
-		if ($quota === null || $quota === 'none') {
+		if ($quota === 'none') {
 			$quota = Filesystem::free_space('/');
 			$softQuota = false;
 			// inf or unknown free space

apps/files_versions/lib/Storage.php

@@ -879,7 +879,7 @@ public static function expire($filename, $uid) {
 
 			$softQuota = true;
 			$quota = $user->getQuota();
-			if ($quota === null || $quota === 'none') {
+			if ($quota === 'none') {
 				$quota = Filesystem::free_space('/');
 				$softQuota = false;
 			} else {

apps/provisioning_api/lib/Controller/GroupsController.php

@@ -216,7 +216,7 @@ public function getGroupUsersDetails(string $groupId, string $search = '', ?int
 			foreach ($users as $user) {
 				try {
 					/** @var IUser $user */
-					$userId = (string)$user->getUID();
+					$userId = $user->getUID();
 					$userData = $this->getUserData($userId);
 					// Do not insert empty entry
 					if ($userData !== null) {

apps/settings/tests/Controller/UsersControllerTest.php

@@ -675,7 +675,7 @@ public static function dataTestSetUserSettingsSubset(): array {
 	}
 
 	#[\PHPUnit\Framework\Attributes\DataProvider(methodName: 'dataTestSaveUserSettings')]
-	public function testSaveUserSettings(array $data, ?string $oldEmailAddress, ?string $oldDisplayName): void {
+	public function testSaveUserSettings(array $data, ?string $oldEmailAddress, string $oldDisplayName): void {
 		$controller = $this->getController();
 		$user = $this->createMock(IUser::class);
 
@@ -690,7 +690,7 @@ public function testSaveUserSettings(array $data, ?string $oldEmailAddress, ?str
 				->with($data[IAccountManager::PROPERTY_EMAIL]['value']);
 		}
 
-		if ($data[IAccountManager::PROPERTY_DISPLAYNAME]['value'] === $oldDisplayName ?? '') {
+		if ($data[IAccountManager::PROPERTY_DISPLAYNAME]['value'] === $oldDisplayName) {
 			$user->expects($this->never())->method('setDisplayName');
 		} else {
 			$user->expects($this->once())->method('setDisplayName')
@@ -775,15 +775,15 @@ public static function dataTestSaveUserSettings(): array {
 					IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
 				],
 				'john@example.com',
-				null
+				''
 			],
 			[
 				[
 					IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
 					IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
 				],
 				'JOHN@example.com',
-				null
+				''
 			],
 		];
 	}

apps/theming/lib/ImageManager.php

@@ -265,12 +265,7 @@ public function updateImage(string $key, string $tmpFile): string {
 						}
 					}
 					$tmpFile = $newTmpFile;
-					imagedestroy($outputImage);
 				} catch (\Exception $e) {
-					if (isset($outputImage) && is_resource($outputImage) || $outputImage instanceof \GdImage) {
-						imagedestroy($outputImage);
-					}
-
 					$this->logger->debug($e->getMessage());
 				}
 			}

apps/user_ldap/lib/Connection.php

@@ -313,7 +313,7 @@ public function writeToCache($key, $value, ?int $ttlOverride = null): void {
 		$key = $this->getCacheKey($key);
 		$value = base64_encode(json_encode($value));
 		$ttl = $ttlOverride ?? $this->configuration->ldapCacheTTL;
-		$this->cache->set($key, $value, $ttl);
+		$this->cache->set($key, $value, (int)$ttl);
 	}
 
 	public function clearCache() {

apps/user_ldap/tests/AccessTest.php

@@ -712,7 +712,7 @@ public function testUserStateUpdate(): void {
 			->method('__get')
 			->willReturnMap([
 				[ 'ldapUserDisplayName', 'displayName' ],
-				[ 'ldapUserDisplayName2', null],
+				[ 'ldapUserDisplayName2', ''],
 			]);
 
 		$offlineUserMock = $this->createMock(OfflineUser::class);

build/integration/features/bootstrap/Avatar.php

@@ -183,15 +183,11 @@ private function getColorFromLastAvatar() {
 				// on solid color images the resizing can cause some small
 				// artifacts that slightly modify the color of certain pixels.
 				if (!$this->isSameColor($firstPixelColor, $currentPixelColor)) {
-					imagedestroy($image);
-
 					return null;
 				}
 			}
 		}
 
-		imagedestroy($image);
-
 		return $firstPixelColor;
 	}
 

build/psalm-baseline.xml

@@ -3417,6 +3417,7 @@
       <code><![CDATA[getPassword]]></code>
       <code><![CDATA[getRemember]]></code>
       <code><![CDATA[getScope]]></code>
+      <code><![CDATA[getToken]]></code>
       <code><![CDATA[setExpires]]></code>
       <code><![CDATA[setLastCheck]]></code>
       <code><![CDATA[setName]]></code>

composer.json

@@ -84,9 +84,9 @@
 		],
 		"test": [
 			"Composer\\Config::disableProcessTimeout",
-			"phpunit --fail-on-warning --fail-on-risky --display-warnings --display-deprecations --display-phpunit-deprecations --colors=always --configuration tests/phpunit-autotest.xml"
+			"phpunit --fail-on-warning --fail-on-risky --display-warnings --display-deprecations --display-phpunit-deprecations --display-skipped --colors=always --configuration tests/phpunit-autotest.xml"
 		],
-		"test:db": "@composer run test -- --group DB --group SLOWDB",
+		"test:db": "@composer run test -- --group DB --group SLOWDB --exclude-group S3 --exclude-group PRIMARY-swift --exclude-group PRIMARY-s3 --exclude-group PRIMARY-azure",
 		"test:files_external": "phpunit --fail-on-warning --fail-on-risky --display-warnings --display-deprecations --display-phpunit-deprecations --colors=always --configuration tests/phpunit-autotest-external.xml",
 		"rector": "rector --config=build/rector.php && composer cs:fix",
 		"rector:strict": "rector --config=build/rector-strict.php && composer cs:fix",

core/Command/Background/Job.php

@@ -124,7 +124,6 @@ protected function printJobInfo(string $jobId, IJob $job, OutputInterface $outpu
 		if ($isTimedJob) {
 			$reflection = new \ReflectionClass($job);
 			$intervalProperty = $reflection->getProperty('interval');
-			$intervalProperty->setAccessible(true);
 			$interval = $intervalProperty->getValue($job);
 
 			$nextRun = new \DateTime();

core/Command/Background/JobBase.php

@@ -65,7 +65,6 @@ protected function printJobInfo(string $jobId, IJob $job, OutputInterface $outpu
 		if ($isTimedJob) {
 			$reflection = new \ReflectionClass($job);
 			$intervalProperty = $reflection->getProperty('interval');
-			$intervalProperty->setAccessible(true);
 			$interval = $intervalProperty->getValue($job);
 
 			$nextRun = new \DateTime();

lib/private/Authentication/Token/PublicKeyToken.php

@@ -205,6 +205,10 @@ public function getRemember(): int {
 		return parent::getRemember();
 	}
 
+	public function getToken(): string {
+		return parent::getToken();
+	}
+
 	#[\Override]
 	public function setToken(string $token): void {
 		parent::setToken($token);