Merge pull request #1514 from nextcloud/chore/stable27-fix-tests

[stable27] Fix unit tests for PHP 8.2
nextcloud · Jan 16, 2024 · c944522 · c944522
2 parents 3aaf5fe + 6647312
commit c944522
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 5 deletions.
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
@@ -38,7 +38,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ["8.0", "8.1"]
+        php-versions: ["8.0", "8.1", "8.2"]
         server-versions: ["stable27"]
 
     services:

diff --git a/tests/CurrentUserTest.php b/tests/CurrentUserTest.php
@@ -22,13 +22,14 @@
 namespace OCA\Activity\Tests;
 
 use OCA\Activity\CurrentUser;
+use OCA\Activity\Tests\Mock\Request;
 use OCP\IRequest;
 use OCP\IUser;
+use OCP\IUserSession;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IShare;
-use PHPUnit\Framework\MockObject\MockObject;
-use OCP\IUserSession;
 use OCP\Share\IManager;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class CurrentUserTest
@@ -48,7 +49,7 @@ class CurrentUserTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->request = $this->createMock(IRequest::class);
+		$this->request = $this->createMock(Request::class);
 		$this->userSession = $this->createMock(IUserSession::class);
 		$this->shareManager = $this->createMock(IManager::class);
 	}
@@ -183,7 +184,10 @@ public function dataGetCloudIDFromToken(): array {
 	public function testGetCloudIDFromToken(array $server, $share, ?string $expected): void {
 		$instance = $this->getInstance();
 
-		$this->request->server = $server;
+		$this->request->method('__get')->willReturnCallback(fn (string $prop) => match ($prop) {
+			'server' => $server,
+			default => null,
+		});
 
 		if ($share === null) {
 			$this->shareManager->expects($this->never())

diff --git a/tests/Listener/SetUserDefaultsTest.php b/tests/Listener/SetUserDefaultsTest.php
@@ -42,6 +42,16 @@ class SetUserDefaultsTest extends TestCase {
 	 */
 	private $listener;
 
+	/**
+	 * @var IUser|MockObject
+	 */
+	private $user;
+
+	/**
+	 * @var PostLoginEvent
+	 */
+	private $event;
+
 	public const UID = 'myuser';
 
 	public function setUp(): void {

diff --git a/tests/Listener/UserDeletedTest.php b/tests/Listener/UserDeletedTest.php
@@ -53,6 +53,11 @@ class UserDeletedTest extends TestCase {
 	 */
 	private $listener;
 
+	/**
+	 * @var IUser|MockObject
+	 */
+	private $user;
+
 	public const UID = 'myuser';
 
 	public function setUp(): void {

diff --git a/tests/Mock/Request.php b/tests/Mock/Request.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\Activity\Tests\Mock;
+
+use OCP\IRequest;
+
+// We need this as we need to mock ::$server
+// which can not be accessed on PHP 8.2 due to deprecation of dynamic properties.
+interface Request extends IRequest {
+	public function __get(string $prop): mixed;
+}