summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2016-05-17 10:31:50 +0200
committerJoas Schilling <nickvergessen@owncloud.com>2016-05-25 14:59:59 +0200
commit5001036fd49cecdf1dcda1b4aed0be1b24d18c24 (patch)
tree47fd3d8ad8a60361603fd2f00dc2e26ce843ca7c /apps
parentc5ade48c042fc8d5a2a5e3a3c62854e78711eee1 (diff)
downloadnextcloud-server-5001036fd49cecdf1dcda1b4aed0be1b24d18c24.tar.gz
nextcloud-server-5001036fd49cecdf1dcda1b4aed0be1b24d18c24.zip
Move classes from outside lib/ to PSR-4
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/appinfo/app.php4
-rw-r--r--apps/files_sharing/appinfo/info.xml2
-rw-r--r--apps/files_sharing/appinfo/routes.php3
-rw-r--r--apps/files_sharing/lib/API/OCSShareWrapper.php (renamed from apps/files_sharing/api/ocssharewrapper.php)0
-rw-r--r--apps/files_sharing/lib/API/Remote.php (renamed from apps/files_sharing/api/remote.php)0
-rw-r--r--apps/files_sharing/lib/API/Share20OCS.php (renamed from apps/files_sharing/api/share20ocs.php)0
-rw-r--r--apps/files_sharing/lib/API/Sharees.php (renamed from apps/files_sharing/api/sharees.php)0
-rw-r--r--apps/files_sharing/lib/AppInfo/Application.php (renamed from apps/files_sharing/appinfo/application.php)0
-rw-r--r--apps/files_sharing/tests/testcase.php2
9 files changed, 5 insertions, 6 deletions
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
index 8ce9271a709..8ce9271a709 100644
--- a/apps/files_sharing/api/ocssharewrapper.php
+++ b/apps/files_sharing/lib/API/OCSShareWrapper.php
diff --git a/apps/files_sharing/api/remote.php b/apps/files_sharing/lib/API/Remote.php
index 1b5eb28aa86..1b5eb28aa86 100644
--- a/apps/files_sharing/api/remote.php
+++ b/apps/files_sharing/lib/API/Remote.php
diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/lib/API/Share20OCS.php
index 28166b943b8..28166b943b8 100644
--- a/apps/files_sharing/api/share20ocs.php
+++ b/apps/files_sharing/lib/API/Share20OCS.php
diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/lib/API/Sharees.php
index 4e005c5e26c..4e005c5e26c 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/lib/API/Sharees.php
diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/lib/AppInfo/Application.php
index b17e213e2e2..b17e213e2e2 100644
--- a/apps/files_sharing/appinfo/application.php
+++ b/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