From 5001036fd49cecdf1dcda1b4aed0be1b24d18c24 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 17 May 2016 10:31:50 +0200
Subject: [PATCH] Move classes from outside lib/ to PSR-4
---
apps/files_sharing/appinfo/app.php | 4 +---
apps/files_sharing/appinfo/info.xml | 2 ++
apps/files_sharing/appinfo/routes.php | 3 +--
.../{api/ocssharewrapper.php => lib/API/OCSShareWrapper.php} | 0
apps/files_sharing/{api/remote.php => lib/API/Remote.php} | 0
.../{api/share20ocs.php => lib/API/Share20OCS.php} | 0
apps/files_sharing/{api/sharees.php => lib/API/Sharees.php} | 0
.../{appinfo/application.php => lib/AppInfo/Application.php} | 0
apps/files_sharing/tests/testcase.php | 2 +-
9 files changed, 5 insertions(+), 6 deletions(-)
rename apps/files_sharing/{api/ocssharewrapper.php => lib/API/OCSShareWrapper.php} (100%)
rename apps/files_sharing/{api/remote.php => lib/API/Remote.php} (100%)
rename apps/files_sharing/{api/share20ocs.php => lib/API/Share20OCS.php} (100%)
rename apps/files_sharing/{api/sharees.php => lib/API/Sharees.php} (100%)
rename apps/files_sharing/{appinfo/application.php => lib/AppInfo/Application.php} (100%)
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 32eee9b6c9c..e96269d1148 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -26,15 +26,13 @@
*
*/
-namespace OCA\Files_Sharing\Appinfo;
-
$l = \OC::$server->getL10N('files_sharing');
\OC::$CLASSPATH['OC_Share_Backend_File'] = 'files_sharing/lib/share/file.php';
\OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php';
\OC::$CLASSPATH['OC\Files\Storage\Shared'] = 'files_sharing/lib/sharedstorage.php';
-$application = new Application();
+$application = new \OCA\Files_Sharing\AppInfo\Application();
$application->registerMountProviders();
\OCA\Files_Sharing\Helper::registerHooks();
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 7e49e267275..f6e3053961f 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -21,6 +21,8 @@ Turning the feature off removes shared files and folders on the server for all s
<files>public.php</files>
</public>
+ <namespace>Files_Sharing</namespace>
+
<background-jobs>
<job>OCA\Files_sharing\Lib\DeleteOrphanedSharesJob</job>
<job>OCA\Files_sharing\ExpireSharesJob</job>
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 80632f0fedf..2e11e0e62bc 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -24,11 +24,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
-namespace OCA\Files_Sharing\AppInfo;
use OCP\API;
-$application = new Application();
+$application = new \OCA\Files_Sharing\AppInfo\Application();
$application->registerRoutes($this, [
'resources' => [
'ExternalShares' => ['url' => '/api/externalShares'],
diff --git a/apps/files_sharing/api/ocssharewrapper.php b/apps/files_sharing/lib/API/OCSShareWrapper.php
similarity index 100%
rename from apps/files_sharing/api/ocssharewrapper.php
rename to apps/files_sharing/lib/API/OCSShareWrapper.php
diff --git a/apps/files_sharing/api/remote.php b/apps/files_sharing/lib/API/Remote.php
similarity index 100%
rename from apps/files_sharing/api/remote.php
rename to apps/files_sharing/lib/API/Remote.php
diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/lib/API/Share20OCS.php
similarity index 100%
rename from apps/files_sharing/api/share20ocs.php
rename to apps/files_sharing/lib/API/Share20OCS.php
diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/lib/API/Sharees.php
similarity index 100%
rename from apps/files_sharing/api/sharees.php
rename to apps/files_sharing/lib/API/Sharees.php
diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/lib/AppInfo/Application.php
similarity index 100%
rename from apps/files_sharing/appinfo/application.php
rename to apps/files_sharing/lib/AppInfo/Application.php
diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php
index b1d6facafd6..9078a3d4578 100644
--- a/apps/files_sharing/tests/testcase.php
+++ b/apps/files_sharing/tests/testcase.php
@@ -32,7 +32,7 @@ namespace OCA\Files_Sharing\Tests;
use OC\Files\Filesystem;
use OCA\Files\Share;
-use OCA\Files_Sharing\Appinfo\Application;
+use OCA\Files_Sharing\AppInfo\Application;
/**
* Class Test_Files_Sharing_Base
--
GitLab