From c745240543a8e60c3255aca2c22b0ebdb2387217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Thu, 5 Jun 2014 18:13:50 +0200 Subject: [PATCH 1/3] Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependencies --- {apps/files_external/lib => lib/private/files/storage}/webdav.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {apps/files_external/lib => lib/private/files/storage}/webdav.php (100%) diff --git a/apps/files_external/lib/webdav.php b/lib/private/files/storage/webdav.php similarity index 100% rename from apps/files_external/lib/webdav.php rename to lib/private/files/storage/webdav.php From 171475b95ac83f0c5cab42b53a8cae2b90bb3571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Thu, 5 Jun 2014 18:18:16 +0200 Subject: [PATCH 2/3] fix autoloader --- apps/files_external/appinfo/app.php | 1 - lib/private/files/storage/{webdav.php => dav.php} | 0 2 files changed, 1 deletion(-) rename lib/private/files/storage/{webdav.php => dav.php} (100%) diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php index e88880fe51..3b8793a075 100644 --- a/apps/files_external/appinfo/app.php +++ b/apps/files_external/appinfo/app.php @@ -10,7 +10,6 @@ $l = \OC_L10N::get('files_external'); OC::$CLASSPATH['OC\Files\Storage\StreamWrapper'] = 'files_external/lib/streamwrapper.php'; OC::$CLASSPATH['OC\Files\Storage\FTP'] = 'files_external/lib/ftp.php'; -OC::$CLASSPATH['OC\Files\Storage\DAV'] = 'files_external/lib/webdav.php'; OC::$CLASSPATH['OC\Files\Storage\OwnCloud'] = 'files_external/lib/owncloud.php'; OC::$CLASSPATH['OC\Files\Storage\Google'] = 'files_external/lib/google.php'; OC::$CLASSPATH['OC\Files\Storage\Swift'] = 'files_external/lib/swift.php'; diff --git a/lib/private/files/storage/webdav.php b/lib/private/files/storage/dav.php similarity index 100% rename from lib/private/files/storage/webdav.php rename to lib/private/files/storage/dav.php From ef4057d3820020c40e2a1a31c5a0cae49700e110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 27 Jun 2014 09:30:42 +0200 Subject: [PATCH 3/3] remove pointless require - we should kill all require_once like that in our tests --- apps/files_sharing/tests/externalstorage.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/files_sharing/tests/externalstorage.php b/apps/files_sharing/tests/externalstorage.php index b7797333c1..60c5787f29 100644 --- a/apps/files_sharing/tests/externalstorage.php +++ b/apps/files_sharing/tests/externalstorage.php @@ -22,8 +22,6 @@ require_once __DIR__ . '/base.php'; -require_once __DIR__ . '/../../files_external/lib/webdav.php'; - /** * Tests for the external Storage class for remote shares. */