Safe default behaviour when no users are specified on trashbin:cleanup

[liamdennehy]

• Add option --all-users to explicitly clean all trashbins
• Reject no users on commandline and no --all-users
• Warn when --all-users and userids are specified
  Make trashbin:cleanup clean all users an explicit option not the default #10001

Signed-off-by: Liam Dennehy [email protected]

[MorrisJobke]

Could you add following else block to inform about the needed parameters:

} else {
	throw new InvalidOptionException('Either specify a user_id or --all-users');
}

And don't forget to import the exception then as well:

use Symfony\Component\Console\Exception\InvalidOptionException;

[liamdennehy]

Done

[MorrisJobke]

Looks good beside my little nitpick 👍

[codecov]

Codecov Report

Merging #10041 into master will decrease coverage by 20.27%.
The diff coverage is 0%.

@@              Coverage Diff              @@
##             master   #10041       +/-   ##
=============================================
- Coverage     51.99%   31.71%   -20.28%     
- Complexity    26007    26010        +3     
=============================================
  Files          1661     1661               
  Lines         96132    96142       +10     
  Branches       1290     1290               
=============================================
- Hits          49984    30494    -19490     
- Misses        46148    65648    +19500

Impacted Files	Coverage Δ	Complexity Δ
apps/files_trashbin/lib/Command/CleanUp.php	0% <0%> (-89.59%)	15 <0> (+3)
lib/private/SystemTag/ManagerFactory.php	0% <0%> (-100%)	3% <0%> (ø)
lib/private/DB/SQLiteSessionInit.php	0% <0%> (-100%)	4% <0%> (ø)
apps/files_sharing/lib/External/MountProvider.php	0% <0%> (-100%)	4% <0%> (ø)
...rivate/Authentication/Token/DefaultTokenMapper.php	0% <0%> (-100%)	11% <0%> (ø)
lib/private/Share20/Hooks.php	0% <0%> (-100%)	3% <0%> (ø)
lib/private/Route/CachingRouter.php	0% <0%> (-100%)	3% <0%> (ø)
apps/dav/lib/Connector/Sabre/Server.php	0% <0%> (-100%)	1% <0%> (ø)
apps/user_ldap/lib/BackendUtility.php	0% <0%> (-100%)	1% <0%> (ø)
lib/public/Files/ForbiddenException.php	0% <0%> (-100%)	2% <0%> (ø)
... and 381 more

[blizzz]

unit tests need to be adjusted

[MorrisJobke]

unit tests need to be adjusted

Ref:

2) OCA\Files_Trashbin\Tests\Command\CleanUpTest::testExecuteAllUsers
Symfony\Component\Console\Exception\InvalidOptionException: Either specify a user_id or --all-users

/drone/src/github.com/nextcloud/server/apps/files_trashbin/lib/Command/CleanUp.php:110
/drone/src/github.com/nextcloud/server/tests/lib/TestCase.php:210
/drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/Command/CleanUpTest.php:206

@liamdennehy If you need help, then reach out to us. Would be good to get this in today, as we have feature freeze today.

[rullzer]

I took the liberty of fixing the tests so we can merge it :)

[rullzer]

Failing tests are unrelated.

[rullzer]

Cool stuff @liamdennehy

Feel free to keep joining IRC.
And also feel free to tackle other issues 🚀 🎸

[liamdennehy]

Thanks @rullzer, I would have taken ages to figure out how to create those tests!