Merge pull request #55870 from nextcloud/chore/phpunit-11

chore: migrate to PHPUnit 11

Author: susnux

.github/workflows/phpunit-32bits.yml

@@ -68,4 +68,4 @@ jobs:
           php -f tests/enable_all.php
 
       - name: PHPUnit
-        run: composer run test -- --exclude-group PRIMARY-azure,PRIMARY-s3,PRIMARY-swift,Memcached,Redis,RoutingWeirdness
+        run: composer run test -- --exclude-group PRIMARY-azure --exclude-group PRIMARY-s3 --exclude-group PRIMARY-swift --exclude-group Memcached --exclude-group Redis --exclude-group RoutingWeirdness

.github/workflows/phpunit-memcached.yml

@@ -99,7 +99,7 @@ jobs:
           php -f tests/enable_all.php
 
       - name: PHPUnit memcached tests
-        run: composer run test -- --group Memcache,Memcached --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
+        run: composer run test -- --group Memcache --group Memcached --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}

.github/workflows/phpunit-nodb.yml

@@ -105,7 +105,7 @@ jobs:
           php -f tests/enable_all.php
 
       - name: PHPUnit nodb testsuite
-        run: composer run test -- --exclude-group DB,SLOWDB --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.nodb.xml' || '' }}
+        run: composer run test -- --exclude-group DB --exclude-group SLOWDB --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.nodb.xml' || '' }}
 
       - name: Upload nodb code coverage
         if: ${{ !cancelled() && matrix.coverage }}

apps/dav/tests/unit/CalDAV/Schedule/IMipPluginCharsetTest.php

@@ -175,7 +175,7 @@ public function testCharsetMailProvider(): void {
 			->with('core', 'mail_providers_enabled', true)
 			->willReturn(true);
 		$mailMessage = new MailProviderMessage();
-		$mailService = $this->createStubForIntersectionOfInterfaces([IService::class, IMessageSend::class]);
+		$mailService = $this->createMockForIntersectionOfInterfaces([IService::class, IMessageSend::class]);
 		$mailService->method('initiateMessage')
 			->willReturn($mailMessage);
 		$mailService->expects(self::once())

apps/dav/tests/unit/Listener/OutOfOfficeListenerTest.php

@@ -36,9 +36,7 @@
 use Sabre\VObject\Reader;
 use Test\TestCase;
 
-/**
- * @covers \OCA\DAV\Listener\OutOfOfficeListener
- */
+#[\PHPUnit\Framework\Attributes\CoversClass(OutOfOfficeListener::class)]
 class OutOfOfficeListenerTest extends TestCase {
 
 	private ServerFactory&MockObject $serverFactory;

apps/settings/tests/SetupChecks/AppDirsWithDifferentOwnerTest.php

@@ -10,12 +10,14 @@
 
 use OCA\Settings\SetupChecks\AppDirsWithDifferentOwner;
 use OCP\IL10N;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class AppDirsWithDifferentOwnerTest extends TestCase {
-	private IL10N $l10n;
 	private AppDirsWithDifferentOwner $check;
 
+	private IL10N&MockObject $l10n;
+
 	/**
 	 * Holds a list of directories created during tests.
 	 *
@@ -42,8 +44,6 @@ protected function setUp(): void {
 	 * Then calls the 'getAppDirsWithDifferentOwner' method.
 	 * The result is expected to be empty since
 	 * there are no directories with different owners than the current user.
-	 *
-	 * @return void
 	 */
 	public function testAppDirectoryOwnersOk(): void {
 		$tempDir = tempnam(sys_get_temp_dir(), 'apps') . 'dir';
@@ -69,8 +69,6 @@ public function testAppDirectoryOwnersOk(): void {
 	/**
 	 * Calls the check for a none existing app root that is marked as not writable.
 	 * It's expected that no error happens since the check shouldn't apply.
-	 *
-	 * @return void
 	 */
 	public function testAppDirectoryOwnersNotWritable(): void {
 		$tempDir = tempnam(sys_get_temp_dir(), 'apps') . 'dir';
@@ -89,11 +87,9 @@ public function testAppDirectoryOwnersNotWritable(): void {
 
 	/**
 	 * Removes directories created during tests.
-	 *
-	 * @after
-	 * @return void
 	 */
-	public function removeTestDirectories() {
+	#[\PHPUnit\Framework\Attributes\After()]
+	public function removeTestDirectories(): void {
 		foreach ($this->dirsToRemove as $dirToRemove) {
 			rmdir($dirToRemove);
 		}

autotest.sh

@@ -53,7 +53,7 @@ else
 fi
 
 if ! [ -x "$PHPUNIT" ]; then
-	echo "phpunit executable not found, please install phpunit version >= 10.5 manually or via:" >&2
+	echo "phpunit executable not found, please install phpunit version >= 11.5 manually or via:" >&2
 	echo "  composer install" >&2
 	exit 3
 fi
@@ -69,8 +69,8 @@ PHPUNIT_VERSION=$($PHPUNIT --version | cut -d" " -f2)
 PHPUNIT_MAJOR_VERSION=$(echo "$PHPUNIT_VERSION" | cut -d"." -f1)
 PHPUNIT_MINOR_VERSION=$(echo "$PHPUNIT_VERSION" | cut -d"." -f2)
 
-if ! [ "$PHPUNIT_MAJOR_VERSION" -gt 10 -o \( "$PHPUNIT_MAJOR_VERSION" -eq 10 -a "$PHPUNIT_MINOR_VERSION" -ge 5 \) ]; then
-	echo "phpunit version >= 10.5 required. Version found: $PHPUNIT_VERSION" >&2
+if ! [ "$PHPUNIT_MAJOR_VERSION" -gt 11 -o \( "$PHPUNIT_MAJOR_VERSION" -eq 11 -a "$PHPUNIT_MINOR_VERSION" -ge 5 \) ]; then
+	echo "phpunit version >= 11.5 required. Version found: $PHPUNIT_VERSION" >&2
 	exit 4
 fi
 

build/integration/composer.json

@@ -1,15 +1,14 @@
 {
 	"config": {
 		"platform": {
-			"php": "8.1"
+			"php": "8.2"
 		},
 		"sort-packages": true
 	},
 	"require-dev": {
 		"behat/behat": "^3.15",
-		"dms/phpunit-arraysubset-asserts": "^0.5",
 		"guzzlehttp/guzzle": "^7.9",
-		"phpunit/phpunit": "^9.6",
+		"phpunit/phpunit": "^11.5",
 		"sabre/dav": "^4.7",
 		"symfony/event-dispatcher": "^6.4"
 	}