From 8266184a50dce8bcdebbc4cc488026192408f64e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 7 Jul 2020 09:57:51 +0200 Subject: [PATCH] Move to PSR-4 naming to support upcoming composer update Signed-off-by: Joas Schilling --- appinfo/app.php | 2 -- appinfo/routes.php | 2 -- appinfo/application.php => lib/AppInfo/Application.php | 0 capabilities.php => lib/Capabilities.php | 0 .../apicontroller.php => lib/Controller/ApiController.php | 0 .../Controller/RegisterController.php | 0 .../Controller/SettingsController.php | 0 db/registration.php => lib/Db/Registration.php | 0 db/registrationmapper.php => lib/Db/RegistrationMapper.php | 0 service/mailservice.php => lib/Service/MailService.php | 0 .../Service/RegistrationException.php | 0 .../Service/RegistrationService.php | 0 util/corebridge.php => lib/Util/CoreBridge.php | 0 .../Controller}/RegisterControllerTest.php | 4 ++-- .../Service}/RegistrationServiceTest.php | 2 +- .../controller => Unit/Controller}/ApiControllerTest.php | 2 +- 16 files changed, 4 insertions(+), 8 deletions(-) rename appinfo/application.php => lib/AppInfo/Application.php (100%) rename capabilities.php => lib/Capabilities.php (100%) rename controller/apicontroller.php => lib/Controller/ApiController.php (100%) rename controller/registercontroller.php => lib/Controller/RegisterController.php (100%) rename controller/settingscontroller.php => lib/Controller/SettingsController.php (100%) rename db/registration.php => lib/Db/Registration.php (100%) rename db/registrationmapper.php => lib/Db/RegistrationMapper.php (100%) rename service/mailservice.php => lib/Service/MailService.php (100%) rename service/registrationexception.php => lib/Service/RegistrationException.php (100%) rename service/registrationservice.php => lib/Service/RegistrationService.php (100%) rename util/corebridge.php => lib/Util/CoreBridge.php (100%) rename tests/{integration/controller => Integration/Controller}/RegisterControllerTest.php (97%) rename tests/{integration/service => Integration/Service}/RegistrationServiceTest.php (99%) rename tests/{unit/controller => Unit/Controller}/ApiControllerTest.php (99%) diff --git a/appinfo/app.php b/appinfo/app.php index 9fb614d..bfc9dbe 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -9,8 +9,6 @@ * @copyright Pellaeon Lin 2014 */ -namespace OCA\Registration\AppInfo; - \OC_App::registerLogIn([ 'name' => \OC::$server->getL10N('registration')->t('Register'), 'href' => \OC::$server->getURLGenerator()->linkToRoute('registration.register.askEmail') diff --git a/appinfo/routes.php b/appinfo/routes.php index 146f00b..7db7778 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -10,8 +10,6 @@ * @copyright Pellaeon Lin 2014 */ -$app = new \OCA\Registration\AppInfo\Application(); - return [ 'routes' => [ ['name' => 'settings#admin', 'url' => '/settings', 'verb' => 'POST'], diff --git a/appinfo/application.php b/lib/AppInfo/Application.php similarity index 100% rename from appinfo/application.php rename to lib/AppInfo/Application.php diff --git a/capabilities.php b/lib/Capabilities.php similarity index 100% rename from capabilities.php rename to lib/Capabilities.php diff --git a/controller/apicontroller.php b/lib/Controller/ApiController.php similarity index 100% rename from controller/apicontroller.php rename to lib/Controller/ApiController.php diff --git a/controller/registercontroller.php b/lib/Controller/RegisterController.php similarity index 100% rename from controller/registercontroller.php rename to lib/Controller/RegisterController.php diff --git a/controller/settingscontroller.php b/lib/Controller/SettingsController.php similarity index 100% rename from controller/settingscontroller.php rename to lib/Controller/SettingsController.php diff --git a/db/registration.php b/lib/Db/Registration.php similarity index 100% rename from db/registration.php rename to lib/Db/Registration.php diff --git a/db/registrationmapper.php b/lib/Db/RegistrationMapper.php similarity index 100% rename from db/registrationmapper.php rename to lib/Db/RegistrationMapper.php diff --git a/service/mailservice.php b/lib/Service/MailService.php similarity index 100% rename from service/mailservice.php rename to lib/Service/MailService.php diff --git a/service/registrationexception.php b/lib/Service/RegistrationException.php similarity index 100% rename from service/registrationexception.php rename to lib/Service/RegistrationException.php diff --git a/service/registrationservice.php b/lib/Service/RegistrationService.php similarity index 100% rename from service/registrationservice.php rename to lib/Service/RegistrationService.php diff --git a/util/corebridge.php b/lib/Util/CoreBridge.php similarity index 100% rename from util/corebridge.php rename to lib/Util/CoreBridge.php diff --git a/tests/integration/controller/RegisterControllerTest.php b/tests/Integration/Controller/RegisterControllerTest.php similarity index 97% rename from tests/integration/controller/RegisterControllerTest.php rename to tests/Integration/Controller/RegisterControllerTest.php index b7f69aa..3f68394 100644 --- a/tests/integration/controller/RegisterControllerTest.php +++ b/tests/Integration/Controller/RegisterControllerTest.php @@ -1,6 +1,6 @@