upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-29 18:11:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 34
77659 commits 891 branches 1201 tags 6.6 GiB
Commit graph

179 commits

Author SHA1 Message Date
Morris Jobke
234b510652
Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to \PHPUnit\Framework\MockObject\MockObject 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-12 13:55:19 +02:00
Morris Jobke
e84504c4d6
Use IBootstrap for the files_trashbin app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-23 22:03:14 +02:00
Joas Schilling
89ed2c37bf
Update share type constant usage 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-06-24 16:49:16 +02:00
Robin Appelman
614acc9419
add locking to resolve concurent move to trashbin conflicts 
uses a lock to prevent two requests from moving a file to the trashbin concurrently
(causing sql duplicate key errors)

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-05-06 20:36:55 +02:00
Christoph Wurst
cb057829f7
Update license headers for 19 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-29 11:57:22 +02:00
Christoph Wurst
28f8eb5dba
Add visibility to all constants 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 16:54:27 +02:00
Christoph Wurst
caff1023ea
Format control structures, classes, methods and function 
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 14:19:56 +02:00
Christoph Wurst
afbd9c4e6e
Unify function spacing to PSR2 recommendation 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 13:54:22 +02:00
Christoph Wurst
41b5e5923a
Use exactly one empty line after the namespace declaration 
For PSR2

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 11:48:10 +02:00
Christoph Wurst
1a9330cd69
Update the license headers for Nextcloud 19 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-31 14:52:54 +02:00
Christoph Wurst
463b388589
Merge pull request #20170 from nextcloud/techdebt/remove-unused-imports 
Remove unused imports
 2020-03-27 17:14:08 +01:00
Christoph Wurst
b80ebc9674
Use the short array syntax, everywhere 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-26 16:34:56 +01:00
Christoph Wurst
2ee65f177e
Use the shorter phpunit syntax for mocked return values 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-25 22:21:27 +01:00
Christoph Wurst
74936c49ea
Remove unused imports 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-25 22:08:08 +01:00
Roeland Jago Douma
c1152af523
Move deprecated aliases over to new registration 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-03-15 15:13:12 +01:00
Christoph Wurst
5bf3d1bb38
Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-05 15:38:45 +01:00
John Molakvoæ (skjnldsv)
5cb11ca642
Fix tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-12-02 13:08:43 +01:00
Roeland Jago Douma
3a7cf40aaa
Mode to modern phpunit 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 15:27:18 +01:00
Roeland Jago Douma
c007ca624f
Make phpunit8 compatible 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:41 +01:00
Roeland Jago Douma
68748d4f85
Some php-cs fixes 
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-22 20:52:10 +01:00
Roeland Jago Douma
e9c972f708
Fix share tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-20 08:08:02 +01:00
Robin Appelman
964dc0a955
set retention obligation on existing expiration in tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-04 16:54:22 +01:00
Roeland Jago Douma
e225a7bfd3
fixup! fix tests? 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-31 21:27:31 +01:00
Roeland Jago Douma
78d00ff085
fix tests? 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-31 19:36:34 +01:00
Julius Härtl
b1832c8bef
Emit moveToTrash event only for the deleting user 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-08-06 17:45:50 +02:00
Christoph Wurst
3174012adf Add event dispatcher to OCP 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-06-25 10:02:27 +02:00
Morris Jobke
000a92bcde
Do not run fragile TrashbinTest 
Fails with:

There was 1 failure:

1) TrashbinTest::testExpireOldFiles
Failed asserting that null is identical to 'file2.txt'.

/drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:186

OR

1) TrashbinTest::testExpireOldFiles
Failed asserting that null is identical to 'file2.txt'.

/drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:193

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-13 18:01:24 +01:00
Unknown
0ad76cc81a Add test OCA\Files_Trashbin\Capabilities 2018-11-01 17:20:34 +05:00
Morris Jobke
37782b1084
Merge pull request #11573 from nextcloud/gridview-table 
Files grid view
 2018-10-24 15:31:23 +02:00
Jan-Christoph Borchardt
39ff82f707
Use grid view in other file views too 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-10-18 13:44:05 +02:00
Robin Appelman
a369adb4cd
fix trash storage wrapper tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-10-17 14:57:43 +02:00
Robin Appelman
b94fbcebeb
fix preview controller tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-10-17 14:57:40 +02:00
Joas Schilling
78cc4171ee
Fix mock of ITimeFactory 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-10 12:42:20 +02:00
Christoph Wurst
9af69ca2a5
Fix usage of deprecated OC.webroot 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-09 13:53:59 +02:00
Robin Appelman
c5f77de3e2
fix trashbin js tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-09-26 19:20:53 +02:00
Roeland Jago Douma
68f403cea2
Fix and extend tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-29 20:48:09 +02:00
Abijeet
419d72e0ee
Adds a test case for the loading symbol in deleted files. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-18 07:39:44 +02:00
Abijeet
e89f6590e2
Fixed failing test cases for the new actions menu. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-18 07:39:44 +02:00
Roeland Jago Douma
608456d2a9
Previews on for all trashbin files 
* Previews possible for all files in the trashbin
* Set caching
* Use the fileid to find the file

* Fix test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-05 10:17:22 +02:00
Tobia De Koninck
55b9a5d886
Remove OC_App::disable method 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2018-03-06 10:45:20 +01:00
Joas Schilling
bf2be08c9f
Fix risky tests without assertions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-25 11:33:25 +01:00
John Molakvoæ (skjnldsv)
b001060556
Fixed remaining tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-11-08 18:11:33 +01:00
Morris Jobke
0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Morris Jobke
43e498844e
Use ::class in test mocks 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 17:45:32 +02:00
Joas Schilling
281f042093
Don't use deprecated $this->getMock() method 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-09 13:00:24 +02:00
Bjoern Schiessle
6e69881512
allow apps to control the trash bin 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-09-15 11:32:45 +02:00
Roeland Jago Douma
b930f32e89
Remove legacy OC_User_Backend and OC_User_Interface 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 20:42:55 +02:00
Bjoern Schiessle
79d362f4a6
delete files right away in case of a encryption exception 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-14 12:11:28 +01:00
Roeland Jago Douma
55af6b45f7
More tests 
* PreviewController test
* PublicPreview test
* Versions Preview test
* Trash Preview test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
327352e73a
Fix getMock files_trashbin 2016-09-06 09:29:27 +02:00
Joas Schilling
0215b004da
Update with robin 2016-07-21 18:13:58 +02:00
Joas Schilling
813f0a0f40
Fix apps/ 2016-07-21 18:13:57 +02:00
Vincent Petry
508c580e67
Fix trashed file name corruption when rerendering trashbin list 
The trashbin code does some gymnastics with the file data at render
time. This fix makes sure that the modifications done on the file data
are only local to the rendering code and doesn't affect the actual file
data from the file list.
 2016-06-23 11:51:23 +02:00
Lukas Reschke
aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Joas Schilling
d5dee80580 Move files_trashbin to PSR-4 (#24570) 2016-05-12 09:48:53 +02:00
Björn Schießle
80959ad95a Merge pull request #24111 from owncloud/chunk-users-in-background-jobs 
Chunk the users correctly in the trashbin and versions background job
 2016-04-21 14:26:41 +02:00
Joas Schilling
9ebae0bdeb
Chunk the users correctly in the trashbin and versions background job 2016-04-20 10:36:15 +02:00
Roeland Jago Douma
92abb5f23d
Fix tests 2016-04-19 14:04:00 +02:00
Stefan Weil
217d9e8e95 apps/files_trashbin: Fix typos in comments (found and fixed by codespell) 
Fix also a wrong word.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-03-30 10:14:26 +02:00
Robin Appelman
d0dd76bb8a set watch policy in test 2016-03-21 13:53:33 +01:00
Lukas Reschke
c353d51810 Remove Scrutinizer Auto Fixer 2016-03-01 17:48:23 +01:00
Thomas Müller
682821c71e Happy new year! 2016-01-12 15:02:18 +01:00
Roeland Jago Douma
1f715289bf Removed deprecated function OC_User::deleteUser 
Replaced with proper OCP calls
 2015-12-17 16:18:40 +01:00
Roeland Jago Douma
835911bce5 Removed deprecated private OC_User::createUser 
All function calls are replaced with the recommended (which was already
the body of the function).
 2015-12-17 16:18:40 +01:00
Robin Appelman
5b2957bad1 skip test if we cant use the filesystem when not logged in 2015-12-11 14:29:38 +01:00
Robin Appelman
415cf92784 Fix thrashbin wrapper when no user is loggedin 2015-12-11 14:27:37 +01:00
Scrutinizer Auto-Fixer
0f1be1b601 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-12-07 20:08:20 +00:00
Morris Jobke
37ecde065b Replace old config code with usage of proper APIs 2015-12-02 15:56:59 +01:00
Thomas Müller
f9fc254672 Add DB group to some files_external tests 
Adding group Db to federation tests and ldap tests

Add group DB to Test_UrlGenerator

Adding group DB to trashbin and versions tests

Adding group DB to Test_Util_CheckServer for pg
 2015-11-30 10:55:10 +01:00
Thomas Müller
757aa45db7 Adding more DB groups to test suits 
Adding more DB groups to test suits
 2015-11-30 10:55:06 +01:00
Morris Jobke
7aa07bcf1c Deduplicate queued trashbin expire jobs 
* fixes #20425
* this removes the argument trashbin size from the expire job - it is now
  calculated in the expire job
* the queue now detects properly that the job is already queue and doesn't
  add it again
 2015-11-27 14:40:31 +01:00
Robin Appelman
a95d4c2b22 update tests 2015-11-19 13:32:04 +01:00
Robin Appelman
e4364426e2 Fix listing of trash files in test 2015-10-16 21:41:51 +02:00
Robin Appelman
a87b34a059 dont assume home storage is local in trash test 2015-10-16 21:41:51 +02:00
Morris Jobke
b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Joas Schilling
1694f21387 Add the method to the mock 2015-09-25 11:16:26 +02:00
Victor Dubiniuk
764726ce01 Updates according to review 2015-09-16 17:37:21 +03:00
Victor Dubiniuk
867ed67aa5 Fix tests 2015-09-16 17:37:21 +03:00
Victor Dubiniuk
8ac3d5e36c Add expiration cronjob 2015-09-16 17:37:21 +03:00
Vincent Petry
5e6fa3c938 Fix trashbin sidebar 
Do not display size as it is not available.
Use display name instead of name to remove the ".d123456" suffix.
 2015-08-25 11:29:35 +02:00
Thomas Müller
326de6f9b4 Merge pull request #18065 from owncloud/new-trashbin-retention 
New trashbin retention
 2015-08-12 13:13:45 +02:00
Victor Dubiniuk
b9f655d8ad Fix tests 2015-08-10 23:55:10 +03:00
Victor Dubiniuk
33c29d3da7 Migrate settings 2015-08-10 23:54:44 +03:00
Victor Dubiniuk
4ef2615788 Enhance trashbin expiration settings 2015-08-10 20:40:43 +02:00
Joas Schilling
e6eb74958f Remove unnecessary DB prefixes from existing query builder usages 2015-08-10 16:21:41 +02:00
Joas Schilling
f77e5f411d Fix existing usages by removing the quotes 2015-07-21 15:25:47 +02:00
Joas Schilling
de348180ae Use the public interface and our method instead of the doctrine thing 2015-07-21 15:25:47 +02:00
Bjoern Schiessle
db65eeb580 only move real files to the trash bin 2015-07-08 11:32:06 +02:00
Björn Schießle
525745caf5 Merge pull request #17140 from owncloud/trashbin_occ 
add occ command to remove deleted files
 2015-07-03 15:10:50 +02:00
Morris Jobke
f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Bjoern Schiessle
407db913de add occ command to trashbin to remove deleted files 2015-06-24 19:09:20 +02:00
Thomas Müller
9899e10a04 Merge pull request #16753 from owncloud/issue-16752-check-for-existing-user-in-expire-tasks 
Check whether the user exists before trying to set up his file system
 2015-06-05 16:22:03 +02:00
Joas Schilling
bd0b9a0fe0 Add unit tests for non existing users 2015-06-05 13:23:50 +02:00
Vincent Petry
61356b5560 Keep versions when deleting as recipient 
The original owner could not be resolved because the original file was
already deleted, so no versions were retained.

This fix passes the owner and path to retainVersions() since it was
already resolved before the file deletion. This reactivates the versions
logic and creates a copy of the versions in each trashbin.
 2015-06-02 17:13:00 +02:00
Björn Schießle
9366dde875 Merge pull request #15985 from owncloud/hotfix/fix-encryption-references 
[enc2] fix references to legacy encryption app name
 2015-05-26 17:28:27 +02:00
Morris Jobke
39d1e99228 Merge pull request #16322 from owncloud/trash-view 
dont go trough the view when moving to trash
 2015-05-20 14:44:01 +02:00
Vincent Petry
7386257676 Merge pull request #16075 from owncloud/skeleton-copy-delay 
wait with copying the skeleton untill login and setupfs are done
 2015-05-20 13:52:08 +02:00
Scrutinizer Auto-Fixer
fdbc21fc6c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-05-19 11:23:06 +00:00
Robin Appelman
8f1a609512 adjust test 2015-05-18 17:16:13 +02:00
Clark Tomlinson
a0c6c01137 fix references to legacy encryption app name 2015-05-18 09:45:41 -04:00