Merge pull request #39866 from nextcloud/enh/fix-php-8.3-support-in-t…

…ests
nextcloud · Aug 15, 2023 · 89f66a5 · 89f66a5
2 parents 240e8ab + f57c12b
commit 89f66a5
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 4 deletions.
diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
@@ -656,7 +656,7 @@ public function testGetDenormalizedData($expected, $key, $calData): void {
 		try {
 			$actual = $this->backend->getDenormalizedData($calData);
 			$this->assertEquals($expected, $actual[$key]);
-		} catch (\ValueError $e) {
+		} catch (\Throwable $e) {
 			if (($e->getMessage() === 'Epoch doesn\'t fit in a PHP integer') && (PHP_INT_SIZE < 8)) {
 				$this->markTestSkipped('This fail on 32bits because of PHP limitations in DateTime');
 			}

diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php
@@ -158,6 +158,7 @@ public function testIndexWithRegularBrowser() {
 			->willReturnMap([
 				[$this->user->getUID(), 'files', 'file_sorting', 'name', 'name'],
 				[$this->user->getUID(), 'files', 'file_sorting_direction', 'asc', 'asc'],
+				[$this->user->getUID(), 'files', 'files_sorting_configs', '{}', '{}'],
 				[$this->user->getUID(), 'files', 'show_hidden', false, false],
 				[$this->user->getUID(), 'files', 'crop_image_previews', true, true],
 				[$this->user->getUID(), 'files', 'show_grid', true],

diff --git a/tests/lib/App/AppManagerTest.php b/tests/lib/App/AppManagerTest.php
@@ -642,6 +642,11 @@ public function testGetDefaultAppForUser($defaultApps, $expectedApp) {
 			->with('defaultapp', $this->anything())
 			->willReturn($defaultApps);
 
+		$this->config->expects($this->once())
+			->method('getUserValue')
+			->with('user1', 'core', 'defaultapp')
+			->willReturn('');
+
 		$this->assertEquals($expectedApp, $this->manager->getDefaultAppForUser());
 	}
 }
diff --git a/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php b/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php
@@ -38,6 +38,7 @@
 use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\Security\ICrypto;
+use OCP\Security\IHasher;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Test\TestCase;
@@ -47,6 +48,8 @@ class PublicKeyTokenProviderTest extends TestCase {
 	private $tokenProvider;
 	/** @var PublicKeyTokenMapper|\PHPUnit\Framework\MockObject\MockObject */
 	private $mapper;
+	/** @var IHasher|\PHPUnit\Framework\MockObject\MockObject */
+	private $hasher;
 	/** @var ICrypto */
 	private $crypto;
 	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */

diff --git a/tests/lib/Contacts/ContactsMenu/Providers/LocalTimeProviderTest.php b/tests/lib/Contacts/ContactsMenu/Providers/LocalTimeProviderTest.php
@@ -46,6 +46,8 @@ class LocalTimeProviderTest extends TestCase {
 	private $actionFactory;
 	/** @var IL10N|MockObject */
 	private $l;
+	/** @var IL10NFactory|MockObject */
+	private $l10nFactory;
 	/** @var IURLGenerator|MockObject */
 	private $urlGenerator;
 	/** @var IUserManager|MockObject */

diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php
@@ -1568,10 +1568,10 @@ public function testHookPaths($root, $path, $shouldEmit) {
 		$defaultRootValue->setAccessible(true);
 		$oldRoot = $defaultRootValue->getValue();
 		$defaultView = new View('/foo/files');
-		$defaultRootValue->setValue($defaultView);
+		$defaultRootValue->setValue(null, $defaultView);
 		$view = new View($root);
 		$result = self::invokePrivate($view, 'shouldEmitHooks', [$path]);
-		$defaultRootValue->setValue($oldRoot);
+		$defaultRootValue->setValue(null, $oldRoot);
 		$this->assertEquals($shouldEmit, $result);
 	}
 

diff --git a/tests/lib/Http/Client/ClientTest.php b/tests/lib/Http/Client/ClientTest.php
@@ -36,6 +36,7 @@ class ClientTest extends \Test\TestCase {
 	private $config;
 	/** @var IRemoteHostValidator|MockObject */
 	private IRemoteHostValidator $remoteHostValidator;
+	private LoggerInterface $logger;
 	/** @var array */
 	private $defaultRequestOptions;
 

diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php
@@ -230,7 +230,11 @@ protected static function invokePrivate($object, $methodName, array $parameters
 			$property->setAccessible(true);
 
 			if (!empty($parameters)) {
-				$property->setValue($object, array_pop($parameters));
+				if ($property->isStatic()) {
+					$property->setValue(null, array_pop($parameters));
+				} else {
+					$property->setValue($object, array_pop($parameters));
+				}
 			}
 
 			if (is_object($object)) {

diff --git a/tests/lib/TextProcessing/TextProcessingTest.php b/tests/lib/TextProcessing/TextProcessingTest.php
@@ -19,6 +19,7 @@
 use OC\TextProcessing\TaskBackgroundJob;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\IJobList;
 use OCP\Common\Exception\NotFoundException;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
@@ -90,6 +91,14 @@ public function getTaskType(): string {
 class TextProcessingTest extends \Test\TestCase {
 	private IManager $manager;
 	private Coordinator $coordinator;
+	private array $providers;
+	private IServerContainer $serverContainer;
+	private IEventDispatcher $eventDispatcher;
+	private RegistrationContext $registrationContext;
+	private \DateTimeImmutable $currentTime;
+	private TaskMapper $taskMapper;
+	private array $tasksDb;
+	private IJobList $jobList;
 
 	protected function setUp(): void {
 		parent::setUp();