Merge pull request #3664 from nextcloud/backport/stable23/2496

[stable23] Transfer ownership
nextcloud · Apr 11, 2022 · 541eeb0 · 541eeb0
2 parents 1bd62d7 + 39784dc
commit 541eeb0
Show file tree

Hide file tree

Showing 27 changed files with 1,867 additions and 1,078 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.2', '7.3', '7.4']
+        php-versions: ['7.3', '7.4']
 
     name: php${{ matrix.php-versions }} lint
     steps:

diff --git a/Makefile b/Makefile
@@ -50,8 +50,7 @@ ifeq (, $(shell which phpunit 2> /dev/null))
 	php $(build_tools_directory)/phpunit.phar -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
 	php $(build_tools_directory)/phpunit.phar -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
 else
-	phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
-	phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
+	phpunit -c tests/phpunit.integration.xml --testsuite=integration-database --coverage-clover build/php-integration.coverage.xml
 endif
 
 test-integration:

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -44,6 +44,7 @@
     </background-jobs>
     <commands>
         <command>OCA\Deck\Command\UserExport</command>
+        <command>OCA\Deck\Command\TransferOwnership</command>
     </commands>
     <activity>
         <settings>

diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -39,6 +39,7 @@
 		['name' => 'board#updateAcl', 'url' => '/boards/{boardId}/acl/{aclId}', 'verb' => 'PUT'],
 		['name' => 'board#deleteAcl', 'url' => '/boards/{boardId}/acl/{aclId}', 'verb' => 'DELETE'],
 		['name' => 'board#clone', 'url' => '/boards/{boardId}/clone', 'verb' => 'POST'],
+		['name' => 'board#transferOwner', 'url' => '/boards/{boardId}/transferOwner', 'verb' => 'PUT'],
 
 		// stacks
 		['name' => 'stack#index', 'url' => '/stacks/{boardId}', 'verb' => 'GET'],

diff --git a/composer.json b/composer.json
@@ -13,14 +13,17 @@
 	},
 	"require-dev": {
 		"roave/security-advisories": "dev-master",
-		"christophwurst/nextcloud": "^21@dev",
-		"phpunit/phpunit": "^9",
+		"christophwurst/nextcloud": "^22@dev",
+		"phpunit/phpunit": "^8",
 		"nextcloud/coding-standard": "^0.5.0",
 		"symfony/event-dispatcher": "^4.0",
 		"vimeo/psalm": "^4.3",
 		"php-parallel-lint/php-parallel-lint": "^1.2"
 	},
 	"config": {
+		"platform": {
+			"php": "7.3"
+		},
 		"optimize-autoloader": true,
 		"classmap-authoritative": true
 	},