diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/files-checker.php | 2 | ||||
| -rw-r--r-- | build/integration/features/provisioning-v1.feature | 19 | ||||
| -rw-r--r-- | build/psalm-baseline.xml | 40 |
3 files changed, 57 insertions, 4 deletions
diff --git a/build/files-checker.php b/build/files-checker.php index 4dfc7267e23..08d9acf2fd8 100644 --- a/build/files-checker.php +++ b/build/files-checker.php @@ -27,7 +27,6 @@ $expectedFiles = [ '.npmignore', '.php-cs-fixer.dist.php', '.pre-commit-config.yaml', - '.reuse', '.tag', '.tx', '.user.ini', @@ -42,6 +41,7 @@ $expectedFiles = [ 'DESIGN.md', 'Makefile', 'README.md', + 'REUSE.toml', 'SECURITY.md', 'apps', 'autotest-checkers.sh', diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature index 6c35e5a68f1..8fcfb076497 100644 --- a/build/integration/features/provisioning-v1.feature +++ b/build/integration/features/provisioning-v1.feature @@ -72,7 +72,8 @@ Feature: provisioning | phone | | address | | website | - | twitter | + | twitter | + | bluesky | | fediverse | | organisation | | role | @@ -89,6 +90,7 @@ Feature: provisioning | address | | website | | twitter | + | bluesky | | fediverse | | organisation | | role | @@ -104,6 +106,7 @@ Feature: provisioning | address | | website | | twitter | + | bluesky | | fediverse | | organisation | | role | @@ -158,6 +161,9 @@ Feature: provisioning And sending "PUT" to "/cloud/users/brand-new-user" with | key | twitter | | value | Nextcloud | + And sending "PUT" to "/cloud/users/brand-new-user" with + | key | bluesky | + | value | nextcloud.bsky.social | And the OCS status code should be "100" And the HTTP status code should be "200" Then user "brand-new-user" has @@ -168,7 +174,8 @@ Feature: provisioning | phone | +4971125242890 | | address | Foo Bar Town | | website | https://nextcloud.com | - | twitter | Nextcloud | + | twitter | Nextcloud | + | bluesky | nextcloud.bsky.social | And sending "PUT" to "/cloud/users/brand-new-user" with | key | organisation | | value | Nextcloud GmbH | @@ -212,6 +219,11 @@ Feature: provisioning | value | v2-local | Then the OCS status code should be "100" And the HTTP status code should be "200" + When sending "PUT" to "/cloud/users/brand-new-user" with + | key | blueskyScope | + | value | v2-local | + Then the OCS status code should be "100" + And the HTTP status code should be "200" When sending "PUT" to "/cloud/users/brand-new-user" with | key | addressScope | | value | v2-federated | @@ -247,7 +259,8 @@ Feature: provisioning Then user "brand-new-user" has | id | brand-new-user | | phoneScope | v2-private | - | twitterScope | v2-local | + | twitterScope | v2-local | + | blueskyScope | v2-local | | addressScope | v2-federated | | emailScope | v2-published | diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index fc36c3c7b4b..7ec5c22632c 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -556,6 +556,11 @@ <code><![CDATA[$addressBooks[$row['id']][$readOnlyPropertyName] === 0]]></code> </TypeDoesNotContainType> </file> + <file src="apps/dav/lib/CardDAV/Converter.php"> + <DeprecatedConstant> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + </DeprecatedConstant> + </file> <file src="apps/dav/lib/CardDAV/MultiGetExportPlugin.php"> <InvalidNullableReturnType> <code><![CDATA[bool]]></code> @@ -1934,6 +1939,14 @@ <code><![CDATA[dispatch]]></code> </DeprecatedMethod> </file> + <file src="apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php"> + <DeprecatedConstant> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + </DeprecatedConstant> + </file> <file src="apps/oauth2/lib/Controller/OauthApiController.php"> <NoInterfaceProperties> <code><![CDATA[$this->request->server]]></code> @@ -1946,6 +1959,7 @@ </DeprecatedClass> <DeprecatedConstant> <code><![CDATA[IAccountManager::PROPERTY_DISPLAYNAME_LEGACY]]></code> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> </DeprecatedConstant> <DeprecatedMethod> <code><![CDATA[\OC_Util::tearDownFS()]]></code> @@ -1954,6 +1968,14 @@ </DeprecatedMethod> </file> <file src="apps/provisioning_api/lib/Controller/UsersController.php"> + <DeprecatedConstant> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + </DeprecatedConstant> <DeprecatedMethod> <code><![CDATA[getAppValue]]></code> <code><![CDATA[getAppValue]]></code> @@ -2018,6 +2040,11 @@ <code><![CDATA[getSettingsManager]]></code> </UndefinedInterfaceMethod> </file> + <file src="apps/settings/lib/BackgroundJobs/VerifyUserData.php"> + <DeprecatedConstant> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + </DeprecatedConstant> + </file> <file src="apps/settings/lib/Controller/AppSettingsController.php"> <DeprecatedMethod> <code><![CDATA[getAppValue]]></code> @@ -2035,6 +2062,12 @@ </DeprecatedMethod> </file> <file src="apps/settings/lib/Controller/UsersController.php"> + <DeprecatedConstant> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + </DeprecatedConstant> <DeprecatedMethod> <code><![CDATA[dispatch]]></code> <code><![CDATA[getAppValue]]></code> @@ -2109,6 +2142,10 @@ <DeprecatedClass> <code><![CDATA[\OC_Util::setupFS($user->getUID())]]></code> </DeprecatedClass> + <DeprecatedConstant> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + </DeprecatedConstant> </file> <file src="apps/settings/lib/Settings/Personal/Security/Authtokens.php"> <DeprecatedClass> @@ -2629,6 +2666,9 @@ </InvalidDocblock> </file> <file src="apps/user_ldap/lib/User/User.php"> + <DeprecatedConstant> + <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code> + </DeprecatedConstant> <DeprecatedMethod> <code><![CDATA[Util::connectHook('OC_User', 'post_login', $this, 'handlePasswordExpiry')]]></code> <code><![CDATA[getAppValue]]></code> |