Merge pull request #61140 from nextcloud/fix/fix-deprecations-in-tests

Fix deprecations in tests

Author: artonge

.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'];
 	}