From 368be8894cebd8e730f2ef7994d0b56bdc0f47e2 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Sat, 30 Apr 2016 10:45:19 +0200 Subject: [PATCH] Move non PSR-4 files from lib/private root to legacy As discussed we move all old style classes (OC_FOO_BAR) to legacy. Then from there we can evaluate the need to convert them back or if they can be fully deprecated/deleted. --- ...sort_defaultcollator.php => NaturalSort_DefaultCollator.php} | 0 lib/private/{ => legacy}/api.php | 0 lib/private/{ => legacy}/app.php | 0 lib/private/{ => legacy}/archive.php | 0 lib/private/{ => legacy}/db.php | 0 lib/private/{ => legacy}/defaults.php | 0 lib/private/{ => legacy}/eventsource.php | 0 lib/private/{ => legacy}/filechunking.php | 0 lib/private/{ => legacy}/files.php | 0 lib/private/{ => legacy}/group.php | 0 lib/private/{ => legacy}/helper.php | 0 lib/private/{ => legacy}/hook.php | 0 lib/private/{ => legacy}/image.php | 0 lib/private/{ => legacy}/installer.php | 0 lib/private/{ => legacy}/json.php | 0 lib/private/{ => legacy}/ocs.php | 0 lib/private/{ => legacy}/response.php | 0 lib/private/{ => legacy}/template.php | 2 +- lib/private/{ => legacy}/user.php | 0 lib/private/{ => legacy}/util.php | 0 20 files changed, 1 insertion(+), 1 deletion(-) rename lib/private/{naturalsort_defaultcollator.php => NaturalSort_DefaultCollator.php} (100%) rename lib/private/{ => legacy}/api.php (100%) rename lib/private/{ => legacy}/app.php (100%) rename lib/private/{ => legacy}/archive.php (100%) rename lib/private/{ => legacy}/db.php (100%) rename lib/private/{ => legacy}/defaults.php (100%) rename lib/private/{ => legacy}/eventsource.php (100%) rename lib/private/{ => legacy}/filechunking.php (100%) rename lib/private/{ => legacy}/files.php (100%) rename lib/private/{ => legacy}/group.php (100%) rename lib/private/{ => legacy}/helper.php (100%) rename lib/private/{ => legacy}/hook.php (100%) rename lib/private/{ => legacy}/image.php (100%) rename lib/private/{ => legacy}/installer.php (100%) rename lib/private/{ => legacy}/json.php (100%) rename lib/private/{ => legacy}/ocs.php (100%) rename lib/private/{ => legacy}/response.php (100%) rename lib/private/{ => legacy}/template.php (99%) rename lib/private/{ => legacy}/user.php (100%) rename lib/private/{ => legacy}/util.php (100%) diff --git a/lib/private/naturalsort_defaultcollator.php b/lib/private/NaturalSort_DefaultCollator.php similarity index 100% rename from lib/private/naturalsort_defaultcollator.php rename to lib/private/NaturalSort_DefaultCollator.php diff --git a/lib/private/api.php b/lib/private/legacy/api.php similarity index 100% rename from lib/private/api.php rename to lib/private/legacy/api.php diff --git a/lib/private/app.php b/lib/private/legacy/app.php similarity index 100% rename from lib/private/app.php rename to lib/private/legacy/app.php diff --git a/lib/private/archive.php b/lib/private/legacy/archive.php similarity index 100% rename from lib/private/archive.php rename to lib/private/legacy/archive.php diff --git a/lib/private/db.php b/lib/private/legacy/db.php similarity index 100% rename from lib/private/db.php rename to lib/private/legacy/db.php diff --git a/lib/private/defaults.php b/lib/private/legacy/defaults.php similarity index 100% rename from lib/private/defaults.php rename to lib/private/legacy/defaults.php diff --git a/lib/private/eventsource.php b/lib/private/legacy/eventsource.php similarity index 100% rename from lib/private/eventsource.php rename to lib/private/legacy/eventsource.php diff --git a/lib/private/filechunking.php b/lib/private/legacy/filechunking.php similarity index 100% rename from lib/private/filechunking.php rename to lib/private/legacy/filechunking.php diff --git a/lib/private/files.php b/lib/private/legacy/files.php similarity index 100% rename from lib/private/files.php rename to lib/private/legacy/files.php diff --git a/lib/private/group.php b/lib/private/legacy/group.php similarity index 100% rename from lib/private/group.php rename to lib/private/legacy/group.php diff --git a/lib/private/helper.php b/lib/private/legacy/helper.php similarity index 100% rename from lib/private/helper.php rename to lib/private/legacy/helper.php diff --git a/lib/private/hook.php b/lib/private/legacy/hook.php similarity index 100% rename from lib/private/hook.php rename to lib/private/legacy/hook.php diff --git a/lib/private/image.php b/lib/private/legacy/image.php similarity index 100% rename from lib/private/image.php rename to lib/private/legacy/image.php diff --git a/lib/private/installer.php b/lib/private/legacy/installer.php similarity index 100% rename from lib/private/installer.php rename to lib/private/legacy/installer.php diff --git a/lib/private/json.php b/lib/private/legacy/json.php similarity index 100% rename from lib/private/json.php rename to lib/private/legacy/json.php diff --git a/lib/private/ocs.php b/lib/private/legacy/ocs.php similarity index 100% rename from lib/private/ocs.php rename to lib/private/legacy/ocs.php diff --git a/lib/private/response.php b/lib/private/legacy/response.php similarity index 100% rename from lib/private/response.php rename to lib/private/legacy/response.php diff --git a/lib/private/template.php b/lib/private/legacy/template.php similarity index 99% rename from lib/private/template.php rename to lib/private/legacy/template.php index 7372552970..84b963e4ab 100644 --- a/lib/private/template.php +++ b/lib/private/legacy/template.php @@ -36,7 +36,7 @@ use OC\TemplateLayout; -require_once __DIR__.'/template/functions.php'; +require_once __DIR__.'/../template/functions.php'; /** * This class provides the templates for ownCloud. diff --git a/lib/private/user.php b/lib/private/legacy/user.php similarity index 100% rename from lib/private/user.php rename to lib/private/legacy/user.php diff --git a/lib/private/util.php b/lib/private/legacy/util.php similarity index 100% rename from lib/private/util.php rename to lib/private/legacy/util.php