Skip to content

[stable10] Untangle fed sharing inter-app dependencies #28858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 8 commits into from
Aug 30, 2017
Merged

[stable10] Untangle fed sharing inter-app dependencies #28858

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4a6cea7
get rid of FederatedShareProvider dependency
butonic May 24, 2017
059a0e7
get rid of DiscoveryManager dependency
butonic May 24, 2017
ce27cd6
add @since tag
butonic May 24, 2017
e88c3d5
load federatedfilesharing app when filesystem is initialized
butonic May 24, 2017
4033aab
add missing phpdoc
butonic May 24, 2017
6fcd308
Fix external share manager constructor for tests
tomneedham Jul 4, 2017
058f4a0
Dont need to know about federated in share template
tomneedham Jul 4, 2017
ab67cc2
Fix external share manager tests
tomneedham Jul 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix external share manager constructor for tests
  • Loading branch information
@tomneedham
tomneedham committed Aug 30, 2017
commit 6fcd3089d61455c4b57e569c81b41c0e19b8e979
3 changes: 1 addition & 2 deletions apps/federatedfilesharing/lib/RequestHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,8 @@ public function createShare($params) {
\OC::$server->getDatabaseConnection(),
\OC\Files\Filesystem::getMountManager(),
\OC\Files\Filesystem::getLoader(),
\OC::$server->getHTTPHelper(),
\OC::$server->getNotificationManager(),
$discoveryManager,
\OC::$server->getEventDispatcher(),
$shareWith
);

Expand Down
3 changes: 1 addition & 2 deletions apps/federatedfilesharing/tests/RequestHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,8 @@ function testDeleteUser($toDelete, $expected, $remainingUsers) {
\OC::$server->getDatabaseConnection(),
Filesystem::getMountManager(),
Filesystem::getLoader(),
\OC::$server->getHTTPHelper(),
\OC::$server->getNotificationManager(),
$discoveryManager,
\OC::$server->getEventDispatcher(),
$toDelete
);

Expand Down