Commit Graph

58252 Commits

Author SHA1 Message Date
Daniel Calviño Sánchez ac0c18327e Fix TypeError when "email" is not given in the controller request
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 11:44:41 +02:00
Daniel Calviño Sánchez a7431817b9 Respect additional user settings not covered by the controller
"AccountManager::updateUser()" wipes previous user data with whichever
user data is given (except for some adjustments, like resetting the
verified status when needed). As the controller overrode the properties
those properties would lose some of their attributes even if they are
not affected by the changes made by the controller. Now the controller
only modifies the attributes set ("value" and "scope") to prevent that.

Note that with this change the controller no longer removes the
"verified" status, but this is not a problem because, as mentioned,
"AccountManager::updateUser()" resets them when needed (for example,
when the value of the website property changes).

This change is a previous step to fix overwritting properties with null
values, and it will prevent the controller from making unexpected
changes if more attributes are added in the future.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 11:44:41 +02:00
Daniel Calviño Sánchez c5e3d2e5c2 Add more unit tests for setting user settings
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 11:44:41 +02:00
Daniel Calviño Sánchez 190ffd75b7 Change default test data to values less similar to empty values
Right now it makes no difference, but this should make future tests
clearer, specially in case of failure.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 11:44:40 +02:00
Daniel Calviño Sánchez ef5d538448 Extract default test data to a helper getter
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 11:44:40 +02:00
Daniel Calviño Sánchez 8cae515daa Use constants from interface rather than class
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2021-04-23 11:44:40 +02:00
Roeland Jago Douma 513aba623e
Merge pull request #26715 from nextcloud-pr-bot/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
2021-04-23 08:03:54 +02:00
Nextcloud-PR-Bot 797448d2b3 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2021-04-23 04:11:54 +00:00
Nextcloud bot 539c065e8e
[tx-robot] updated from transifex 2021-04-23 02:26:10 +00:00
Morris Jobke 012f791c8f
Merge pull request #26375 from nextcloud/techdebt/noid/symfony-component-translation-pluralization-rules-is-deprecated
"Symfony\Component\Translation\PluralizationRules" is deprecated
2021-04-22 21:20:16 +02:00
blizzz 6d25c3c7fe
Merge pull request #26627 from nextcloud/smb-341
update icewind/smb to 3.4.1
2021-04-22 19:58:02 +02:00
blizzz 47c9c00b8e
Merge pull request #26700 from nextcloud/bugfix/noid/fix-oci-ci
FIx Oracle by testing on Ubuntu 20.04 until oci8.so is available for …
2021-04-22 19:49:59 +02:00
blizzz 88ef393d7b
Merge pull request #26699 from nextcloud/fix/noid/iresult-php-doc
remove undefined parameter, add description
2021-04-22 19:11:37 +02:00
Joas Schilling 6a43948a6e
FIx Oracle by testing on Ubuntu 20.04 until oci8.so is available for 21.04
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-04-22 16:57:00 +02:00
Arthur Schiwon e7691ef6ab
remove undefined parameter, add description
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-04-22 16:23:01 +02:00
Joas Schilling da043e52c8
Merge pull request #26586 from nextcloud/bugfix/noid/handle-device-login-like-an-alternative-login
Handle device login like an alternative login
2021-04-22 15:27:58 +02:00
Morris Jobke a011b7021e
Merge pull request #26692 from nextcloud/redirect-forum
Redirect users to forum for questions
2021-04-22 14:05:19 +02:00
Morris Jobke 393309b98f
Merge pull request #25714 from nextcloud/fix/23197/explicitly_check_hex2bin_input
Explicitly check hex2bin input
2021-04-22 13:23:39 +02:00
acsfer 2e41939ece
Typo 2021-04-22 13:15:10 +02:00
acsfer 9f56646694
Redirect users to forum for questions
Be more specific so more users will go directly to the forum instead using Github for non-bug reports.
2021-04-22 13:13:06 +02:00
Nextcloud bot 634b6b8b57
[tx-robot] updated from transifex 2021-04-22 02:26:21 +00:00
Roeland Jago Douma 4e39d1ce93
Merge pull request #26609 from nextcloud/Valdnet-patch-6
l10n: Improve styling
2021-04-21 19:56:41 +02:00
John Molakvoæ 3da956bcdc
Merge pull request #23529 from Simounet/feat/23397-settings-new-user-modal
Settings: new user row replaced by a modal
2021-04-21 16:38:46 +02:00
Morris Jobke 3e7f7e5f9b
Merge pull request #26474 from nextcloud/caugner-patch-mariadb-in-mysql-support-warning
Mention MariaDB in MySQL support warning
2021-04-21 16:26:37 +02:00
kesselb d1db7ab59e
Merge pull request #26575 from nextcloud/s3-set-mimetype
set mimetype for objects uploaded to object storages
2021-04-21 16:16:10 +02:00
Robin Appelman effb7dc8ba
set mimetype for objects uploaded to object storages
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-04-21 15:25:58 +02:00
Simounet 45c3b2a478
Settings: new user row replaced by a modal
Signed-off-by: Simounet <contact@simounet.net>
2021-04-21 14:42:46 +02:00
Morris Jobke d2ea068552
Merge pull request #26669 from nextcloud/nickvergessen-patch-1
Fix PHP CS
2021-04-21 14:07:17 +02:00
Roeland Jago Douma a384cb4e5a
Merge pull request #26648 from nextcloud/Valdnet-patch-7
l10n: Spelling unification
2021-04-21 11:15:54 +02:00
John Molakvoæ 31d88209f7
Merge pull request #25991 from nextcloud/update-acceptance-tests-to-selenium3 2021-04-21 09:31:29 +02:00
Joas Schilling 2a11713337 Update CredentialsManagerTest.php
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-21 08:33:10 +02:00
Roeland Jago Douma db2aea2f04
Merge pull request #26673 from nextcloud-pr-bot/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
2021-04-21 08:24:28 +02:00
Nextcloud-PR-Bot 1ac183fb05 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2021-04-21 04:11:37 +00:00
Nextcloud bot e58344fb2a
[tx-robot] updated from transifex 2021-04-21 02:25:58 +00:00
Morris Jobke 9e8690d912
Merge pull request #26654 from nextcloud/bugfix/noid/fix-security-credentials-manager-test
Fix security credentials manager test
2021-04-20 22:03:52 +02:00
Morris Jobke 5448306238
Merge pull request #26658 from nextcloud/bugfix/noid/continue-on-denied-acls
Do not stop directory listing when ACL is blocking access
2021-04-20 21:35:19 +02:00
Morris Jobke ea0f022816
Merge pull request #26661 from nextcloud/bugfix/noid/fix-ldap-unit-test
Fix LDAP unit tests
2021-04-20 21:34:21 +02:00
Morris Jobke 6c0bb2c338
Merge pull request #26594 from nextcloud/enh/2fa/bootstrap
Move 2FA registration to IBootstrap
2021-04-20 21:30:15 +02:00
Morris Jobke 25406ebba2
Merge pull request #26652 from nextcloud/bugfix/noid/fix-broken-test
Fix broken Expiration test
2021-04-20 21:28:36 +02:00
Roeland Jago Douma a34085e1a2 Move 2fa backupscode to new registration
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-20 21:01:16 +02:00
Roeland Jago Douma 5ee9e1f784 Move 2FA registration to IBootstrap
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-04-20 21:01:16 +02:00
Roeland Jago Douma 46872e3921
Merge pull request #26617 from nextcloud/fix/oracle-column-check-unrelated-migrations
Do not check Oracle column constraints in unrelated migrations
2021-04-20 20:49:06 +02:00
Roeland Jago Douma f31d24dd7a
Merge pull request #26647 from nextcloud/bugfix/noid/empty-filename
Fail when creating new files with an empty path
2021-04-20 20:47:16 +02:00
Roeland Jago Douma 85bdf6c0fc
Merge pull request #26660 from nextcloud/bugfix/noid/fix-twofactor-backupcodes-tests
Fix twofactor backup code tests
2021-04-20 20:44:33 +02:00
Roeland Jago Douma d34d3d168d
Merge pull request #26659 from nextcloud/bugfix/noid/fix-updatenotification-test
Fix update notification tests
2021-04-20 20:43:56 +02:00
Roeland Jago Douma 1e767b4f44
Merge pull request #26662 from nextcloud/bugfix/noid/fix-dav-unit-tests
Fix DAV unit tests
2021-04-20 20:43:24 +02:00
Roeland Jago Douma cd5dd31ab0
Merge pull request #26663 from nextcloud/bugfix/noid/fix-support-test
Fix support tests
2021-04-20 20:42:32 +02:00
Joas Schilling 7f70f3e182
Fix support tests
2) Test\Support\Subscription\RegistryTest::testDelegateIsHardUserLimitReachedWithoutSupportAppAndUserCount with data set #0 (35, 15, 2, false)
Cannot stub or mock class or interface "Test\Support\Subscription\UserInterface" which does not exist

3) Test\Support\Subscription\RegistryTest::testDelegateIsHardUserLimitReachedWithoutSupportAppAndUserCount with data set #1 (35, 45, 15, false)
Cannot stub or mock class or interface "Test\Support\Subscription\UserInterface" which does not exist

4) Test\Support\Subscription\RegistryTest::testDelegateIsHardUserLimitReachedWithoutSupportAppAndUserCount with data set #2 (35, 45, 5, true)
Cannot stub or mock class or interface "Test\Support\Subscription\UserInterface" which does not exist

5) Test\Support\Subscription\RegistryTest::testDelegateIsHardUserLimitReachedWithoutSupportAppAndUserCount with data set #3 (35, 45, 55, false)
Cannot stub or mock class or interface "Test\Support\Subscription\UserInterface" which does not exist

Had to use the Database user backend, as using multiple interfaces is deprecated:
https://github.com/sebastianbergmann/phpunit/issues/3955
> This functionality should be deprecated as "having to use it" is almost always a symptom of bad design.
> More importantly, though, the support for the creation of test doubles that implement multiple interfaces
> resulted in code that is hard to maintain.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-04-20 17:36:15 +02:00
Joas Schilling 379664974c
Fix DAV unit tests
6) OCA\DAV\Tests\Unit\DAV\Controller\InvitationResponseControllerTest::testAccept
Trying to configure method "fetch" which cannot be configured because it does not exist, has not been specified, is final, or is static

7) OCA\DAV\Tests\Unit\DAV\Controller\InvitationResponseControllerTest::testAcceptSequence
Trying to configure method "fetch" which cannot be configured because it does not exist, has not been specified, is final, or is static

8) OCA\DAV\Tests\Unit\DAV\Controller\InvitationResponseControllerTest::testAcceptRecurrenceId
Trying to configure method "fetch" which cannot be configured because it does not exist, has not been specified, is final, or is static

9) OCA\DAV\Tests\Unit\DAV\Controller\InvitationResponseControllerTest::testAcceptTokenNotFound
Trying to configure method "fetch" which cannot be configured because it does not exist, has not been specified, is final, or is static

10) OCA\DAV\Tests\Unit\DAV\Controller\InvitationResponseControllerTest::testAcceptExpiredToken
Trying to configure method "fetch" which cannot be configured because it does not exist, has not been specified, is final, or is static

11) OCA\DAV\Tests\Unit\DAV\Controller\InvitationResponseControllerTest::testDecline
Trying to configure method "fetch" which cannot be configured because it does not exist, has not been specified, is final, or is static

12) OCA\DAV\Tests\Unit\DAV\Controller\InvitationResponseControllerTest::testProcessMoreOptionsResult
Trying to configure method "fetch" which cannot be configured because it does not exist, has not been specified, is final, or is static

13) OCA\DAV\Tests\unit\CalDAV\CalendarTest::testConfidentialClassification with data set #0 (3, false)
No method rule is set

14) OCA\DAV\Tests\unit\DAV\Migration\RefreshWebcalJobRegistrarTest::testRun
Trying to configure method "fetch" which cannot be configured because it does not exist, has not been specified, is final, or is static

Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-04-20 17:30:21 +02:00
Joas Schilling 39e248d330
Fix LDAP unit tests
20) OCA\user_ldap\tests\Jobs\UpdateGroupsTest::testHandleKnownGroups
Trying to configure method "fetchAll" which cannot be configured because it does not exist, has not been specified, is final, or is static

Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-04-20 17:22:52 +02:00