Skip to content

Cleanup not used legacy classes #3689

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
nickvergessen merged 2 commits into from
Mar 3, 2017
Merged

Cleanup not used legacy classes #3689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d85a351
Cleanup not used legacy classes
MorrisJobke Mar 3, 2017
6174a51
Get rid of static OCS::notFound()
MorrisJobke Mar 3, 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
3 changes: 2 additions & 1 deletion apps/federatedfilesharing/tests/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
namespace OCA\FederatedFileSharing\Tests;

use OC\Files\Filesystem;
use OC\Group\Database;

/**
* Class Test_Files_Sharing_Base
Expand Down Expand Up @@ -76,7 +77,7 @@ public static function tearDownAfterClass() {
\OC_User::clearBackends();
\OC_User::useBackend('database');
\OC_Group::clearBackends();
\OC_Group::useBackend(new \OC_Group_Database());
\OC_Group::useBackend(new Database());

parent::tearDownAfterClass();
}
Expand Down
30 changes: 0 additions & 30 deletions lib/private/legacy/group/database.php
View file
Open in desktop

This file was deleted.

118 changes: 0 additions & 118 deletions lib/private/legacy/group/example.php
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions lib/private/legacy/group/interface.php
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions lib/private/legacy/ocs.php
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions lib/private/legacy/ocs/person.php
View file
Open in desktop

This file was deleted.

12 changes: 10 additions & 2 deletions ocs/v1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@
OC::$server->getRouter()->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo());
} catch (ResourceNotFoundException $e) {
OC_API::setContentType();
OC_OCS::notFound();

$format = \OC::$server->getRequest()->getParam('format', 'xml');
$txt='Invalid query, please check the syntax. API specifications are here:'
.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
OC_API::respond(new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
} catch (MethodNotAllowedException $e) {
OC_API::setContentType();
OC_Response::setStatus(405);
Expand All @@ -91,6 +95,10 @@
} catch (\Exception $e) {
\OC::$server->getLogger()->logException($e);
OC_API::setContentType();
OC_OCS::notFound();

$format = \OC::$server->getRequest()->getParam('format', 'xml');
$txt='Invalid query, please check the syntax. API specifications are here:'
.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
OC_API::respond(new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
}