diff options
| author | Daniel <mail@danielkesselberg.de> | 2023-08-15 15:08:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-15 15:08:28 +0200 |
| commit | 89f66a5a4b7e384de3610afba8beea05a16e4f8f (patch) | |
| tree | 6218ebfa733be39026dd45c333ebbe0647e85078 /apps | |
| parent | 240e8ab0997d93c63dcbe792bc06fdf29bc60b57 (diff) | |
| parent | f57c12b14e360f1694a699fce5a7e8ae4c50b91c (diff) | |
| download | nextcloud-server-89f66a5a4b7e384de3610afba8beea05a16e4f8f.tar.gz nextcloud-server-89f66a5a4b7e384de3610afba8beea05a16e4f8f.zip | |
Merge pull request #39866 from nextcloud/enh/fix-php-8.3-support-in-tests
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/tests/unit/CalDAV/CalDavBackendTest.php | 2 | ||||
| -rw-r--r-- | apps/files/tests/Controller/ViewControllerTest.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php index acf5504eb66..3da6ca61b7e 100644 --- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php @@ -656,7 +656,7 @@ EOS; 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 index 783c9c8bbbb..d9ccaf47eed 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -158,6 +158,7 @@ class ViewControllerTest extends TestCase { ->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], |