From 1123603f6471d129ddc2feed5d2a20960ff8c13a Mon Sep 17 00:00:00 2001 From: Pepijn Over Date: Fri, 27 Feb 2015 15:18:37 +0100 Subject: [PATCH] [refactoring] PSR-4 support through composer, mass-renaming all *.class.php to *.php to adhere to PSR-4 --- composer.json | 10 ++++++++++ composer.lock | 2 +- src/bootstrap.php | 20 ------------------- ...oller.class.php => AbstractController.php} | 0 ...onfigModule.class.php => ConfigModule.php} | 0 ...troller.class.php => ConfigController.php} | 0 ...face.class.php => ControllerInterface.php} | 0 ...ntroller.class.php => ErrorController.php} | 0 ...{ErrorModule.class.php => ErrorModule.php} | 0 ...roller.class.php => InstallController.php} | 0 ...tallModule.class.php => InstallModule.php} | 0 ...nterface.class.php => ModuleInterface.php} | 0 ...class.php => AbstractServerController.php} | 0 ...Controller.class.php => LogController.php} | 0 ...troller.class.php => ServerController.php} | 0 ...troller.class.php => StatusController.php} | 0 ...troller.class.php => UpdateController.php} | 0 ...erverModule.class.php => ServerModule.php} | 0 ...ntroller.class.php => LoginController.php} | 0 ...roller.class.php => ProfileController.php} | 0 ...ontroller.class.php => UserController.php} | 0 .../{UserModule.class.php => UserModule.php} | 0 src/psm/{Router.class.php => Router.php} | 0 .../{Database.class.php => Database.php} | 0 src/psm/Service/{User.class.php => User.php} | 0 .../{Clickatell.class.php => Clickatell.php} | 0 src/psm/Txtmsg/{Core.class.php => Core.php} | 0 ...reeVoipDeal.class.php => FreeVoipDeal.php} | 0 .../{Inetworx.class.php => Inetworx.php} | 0 .../Txtmsg/{Mollie.class.php => Mollie.php} | 0 src/psm/Txtmsg/{Mosms.class.php => Mosms.php} | 0 .../{Smsglobal.class.php => Smsglobal.php} | 0 src/psm/Txtmsg/{Smsit.class.php => Smsit.php} | 0 .../Txtmsg/{Spryng.class.php => Spryng.php} | 0 ...nterface.class.php => TxtmsgInterface.php} | 0 .../{Installer.class.php => Installer.php} | 0 .../Module/{Modal.class.php => Modal.php} | 0 ...Interface.class.php => ModalInterface.php} | 0 .../Module/{Sidebar.class.php => Sidebar.php} | 0 ...terface.class.php => SidebarInterface.php} | 0 ...veManager.class.php => ArchiveManager.php} | 0 ...erface.class.php => ArchiverInterface.php} | 0 ...ogsArchiver.class.php => LogsArchiver.php} | 0 ...eArchiver.class.php => UptimeArchiver.php} | 0 ...istoryGraph.class.php => HistoryGraph.php} | 0 ...alidator.class.php => ServerValidator.php} | 0 ...ateManager.class.php => UpdateManager.php} | 0 ...sNotifier.class.php => StatusNotifier.php} | 0 ...tusUpdater.class.php => StatusUpdater.php} | 0 ...rValidator.class.php => UserValidator.php} | 0 50 files changed, 11 insertions(+), 21 deletions(-) rename src/psm/Module/{AbstractController.class.php => AbstractController.php} (100%) rename src/psm/Module/Config/{ConfigModule.class.php => ConfigModule.php} (100%) rename src/psm/Module/Config/Controller/{ConfigController.class.php => ConfigController.php} (100%) rename src/psm/Module/{ControllerInterface.class.php => ControllerInterface.php} (100%) rename src/psm/Module/Error/Controller/{ErrorController.class.php => ErrorController.php} (100%) rename src/psm/Module/Error/{ErrorModule.class.php => ErrorModule.php} (100%) rename src/psm/Module/Install/Controller/{InstallController.class.php => InstallController.php} (100%) rename src/psm/Module/Install/{InstallModule.class.php => InstallModule.php} (100%) rename src/psm/Module/{ModuleInterface.class.php => ModuleInterface.php} (100%) rename src/psm/Module/Server/Controller/{AbstractServerController.class.php => AbstractServerController.php} (100%) rename src/psm/Module/Server/Controller/{LogController.class.php => LogController.php} (100%) rename src/psm/Module/Server/Controller/{ServerController.class.php => ServerController.php} (100%) rename src/psm/Module/Server/Controller/{StatusController.class.php => StatusController.php} (100%) rename src/psm/Module/Server/Controller/{UpdateController.class.php => UpdateController.php} (100%) rename src/psm/Module/Server/{ServerModule.class.php => ServerModule.php} (100%) rename src/psm/Module/User/Controller/{LoginController.class.php => LoginController.php} (100%) rename src/psm/Module/User/Controller/{ProfileController.class.php => ProfileController.php} (100%) rename src/psm/Module/User/Controller/{UserController.class.php => UserController.php} (100%) rename src/psm/Module/User/{UserModule.class.php => UserModule.php} (100%) rename src/psm/{Router.class.php => Router.php} (100%) rename src/psm/Service/{Database.class.php => Database.php} (100%) rename src/psm/Service/{User.class.php => User.php} (100%) rename src/psm/Txtmsg/{Clickatell.class.php => Clickatell.php} (100%) rename src/psm/Txtmsg/{Core.class.php => Core.php} (100%) rename src/psm/Txtmsg/{FreeVoipDeal.class.php => FreeVoipDeal.php} (100%) rename src/psm/Txtmsg/{Inetworx.class.php => Inetworx.php} (100%) rename src/psm/Txtmsg/{Mollie.class.php => Mollie.php} (100%) rename src/psm/Txtmsg/{Mosms.class.php => Mosms.php} (100%) rename src/psm/Txtmsg/{Smsglobal.class.php => Smsglobal.php} (100%) rename src/psm/Txtmsg/{Smsit.class.php => Smsit.php} (100%) rename src/psm/Txtmsg/{Spryng.class.php => Spryng.php} (100%) rename src/psm/Txtmsg/{TxtmsgInterface.class.php => TxtmsgInterface.php} (100%) rename src/psm/Util/Install/{Installer.class.php => Installer.php} (100%) rename src/psm/Util/Module/{Modal.class.php => Modal.php} (100%) rename src/psm/Util/Module/{ModalInterface.class.php => ModalInterface.php} (100%) rename src/psm/Util/Module/{Sidebar.class.php => Sidebar.php} (100%) rename src/psm/Util/Module/{SidebarInterface.class.php => SidebarInterface.php} (100%) rename src/psm/Util/Server/{ArchiveManager.class.php => ArchiveManager.php} (100%) rename src/psm/Util/Server/Archiver/{ArchiverInterface.class.php => ArchiverInterface.php} (100%) rename src/psm/Util/Server/Archiver/{LogsArchiver.class.php => LogsArchiver.php} (100%) rename src/psm/Util/Server/Archiver/{UptimeArchiver.class.php => UptimeArchiver.php} (100%) rename src/psm/Util/Server/{HistoryGraph.class.php => HistoryGraph.php} (100%) rename src/psm/Util/Server/{ServerValidator.class.php => ServerValidator.php} (100%) rename src/psm/Util/Server/{UpdateManager.class.php => UpdateManager.php} (100%) rename src/psm/Util/Server/Updater/{StatusNotifier.class.php => StatusNotifier.php} (100%) rename src/psm/Util/Server/Updater/{StatusUpdater.class.php => StatusUpdater.php} (100%) rename src/psm/Util/User/{UserValidator.class.php => UserValidator.php} (100%) diff --git a/composer.json b/composer.json index db5a199a..981d9701 100755 --- a/composer.json +++ b/composer.json @@ -16,5 +16,15 @@ "symfony/http-foundation": "2.6.*", "php-pushover/php-pushover": "dev-master", "twig/twig": "1.*" + }, + "autoload": { + "files": [ + "./src/includes/psmconfig.inc.php", + "./src/includes/functions.inc.php", + "./src/includes/password_compatibility_library.inc.php" + ], + "psr-4": { + "psm\\": "src/psm/" + } } } diff --git a/composer.lock b/composer.lock index 451348f4..91d7cf02 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "925f4c971570ca4d3a856019cdd79add", + "hash": "deb9fd4bbeb05c2d3cf1fc7cf51c6f00", "packages": [ { "name": "php-pushover/php-pushover", diff --git a/src/bootstrap.php b/src/bootstrap.php index 80bf6c8a..e93b8a6d 100644 --- a/src/bootstrap.php +++ b/src/bootstrap.php @@ -63,26 +63,6 @@ if(!file_exists($vendor_autoload)) { } require_once $vendor_autoload; -spl_autoload_register(function($class) { - // remove leading \ - $class = ltrim($class, '\\'); - $path_parts = explode('\\', $class); - - $filename = array_pop($path_parts); - $path = PSM_PATH_SRC . implode(DIRECTORY_SEPARATOR, $path_parts) . - DIRECTORY_SEPARATOR . - $filename . '.class.php' - ; - if(file_exists($path)) { - require_once $path; - return; - } -}); - -$includes = glob(PSM_PATH_SRC . 'includes/*.inc.php'); -foreach($includes as $file) { - include_once $file; -} $router = new psm\Router(); // this may seem insignificant, but right now lots of functions depend on the following global var definition: $db = $router->getService('db'); diff --git a/src/psm/Module/AbstractController.class.php b/src/psm/Module/AbstractController.php similarity index 100% rename from src/psm/Module/AbstractController.class.php rename to src/psm/Module/AbstractController.php diff --git a/src/psm/Module/Config/ConfigModule.class.php b/src/psm/Module/Config/ConfigModule.php similarity index 100% rename from src/psm/Module/Config/ConfigModule.class.php rename to src/psm/Module/Config/ConfigModule.php diff --git a/src/psm/Module/Config/Controller/ConfigController.class.php b/src/psm/Module/Config/Controller/ConfigController.php similarity index 100% rename from src/psm/Module/Config/Controller/ConfigController.class.php rename to src/psm/Module/Config/Controller/ConfigController.php diff --git a/src/psm/Module/ControllerInterface.class.php b/src/psm/Module/ControllerInterface.php similarity index 100% rename from src/psm/Module/ControllerInterface.class.php rename to src/psm/Module/ControllerInterface.php diff --git a/src/psm/Module/Error/Controller/ErrorController.class.php b/src/psm/Module/Error/Controller/ErrorController.php similarity index 100% rename from src/psm/Module/Error/Controller/ErrorController.class.php rename to src/psm/Module/Error/Controller/ErrorController.php diff --git a/src/psm/Module/Error/ErrorModule.class.php b/src/psm/Module/Error/ErrorModule.php similarity index 100% rename from src/psm/Module/Error/ErrorModule.class.php rename to src/psm/Module/Error/ErrorModule.php diff --git a/src/psm/Module/Install/Controller/InstallController.class.php b/src/psm/Module/Install/Controller/InstallController.php similarity index 100% rename from src/psm/Module/Install/Controller/InstallController.class.php rename to src/psm/Module/Install/Controller/InstallController.php diff --git a/src/psm/Module/Install/InstallModule.class.php b/src/psm/Module/Install/InstallModule.php similarity index 100% rename from src/psm/Module/Install/InstallModule.class.php rename to src/psm/Module/Install/InstallModule.php diff --git a/src/psm/Module/ModuleInterface.class.php b/src/psm/Module/ModuleInterface.php similarity index 100% rename from src/psm/Module/ModuleInterface.class.php rename to src/psm/Module/ModuleInterface.php diff --git a/src/psm/Module/Server/Controller/AbstractServerController.class.php b/src/psm/Module/Server/Controller/AbstractServerController.php similarity index 100% rename from src/psm/Module/Server/Controller/AbstractServerController.class.php rename to src/psm/Module/Server/Controller/AbstractServerController.php diff --git a/src/psm/Module/Server/Controller/LogController.class.php b/src/psm/Module/Server/Controller/LogController.php similarity index 100% rename from src/psm/Module/Server/Controller/LogController.class.php rename to src/psm/Module/Server/Controller/LogController.php diff --git a/src/psm/Module/Server/Controller/ServerController.class.php b/src/psm/Module/Server/Controller/ServerController.php similarity index 100% rename from src/psm/Module/Server/Controller/ServerController.class.php rename to src/psm/Module/Server/Controller/ServerController.php diff --git a/src/psm/Module/Server/Controller/StatusController.class.php b/src/psm/Module/Server/Controller/StatusController.php similarity index 100% rename from src/psm/Module/Server/Controller/StatusController.class.php rename to src/psm/Module/Server/Controller/StatusController.php diff --git a/src/psm/Module/Server/Controller/UpdateController.class.php b/src/psm/Module/Server/Controller/UpdateController.php similarity index 100% rename from src/psm/Module/Server/Controller/UpdateController.class.php rename to src/psm/Module/Server/Controller/UpdateController.php diff --git a/src/psm/Module/Server/ServerModule.class.php b/src/psm/Module/Server/ServerModule.php similarity index 100% rename from src/psm/Module/Server/ServerModule.class.php rename to src/psm/Module/Server/ServerModule.php diff --git a/src/psm/Module/User/Controller/LoginController.class.php b/src/psm/Module/User/Controller/LoginController.php similarity index 100% rename from src/psm/Module/User/Controller/LoginController.class.php rename to src/psm/Module/User/Controller/LoginController.php diff --git a/src/psm/Module/User/Controller/ProfileController.class.php b/src/psm/Module/User/Controller/ProfileController.php similarity index 100% rename from src/psm/Module/User/Controller/ProfileController.class.php rename to src/psm/Module/User/Controller/ProfileController.php diff --git a/src/psm/Module/User/Controller/UserController.class.php b/src/psm/Module/User/Controller/UserController.php similarity index 100% rename from src/psm/Module/User/Controller/UserController.class.php rename to src/psm/Module/User/Controller/UserController.php diff --git a/src/psm/Module/User/UserModule.class.php b/src/psm/Module/User/UserModule.php similarity index 100% rename from src/psm/Module/User/UserModule.class.php rename to src/psm/Module/User/UserModule.php diff --git a/src/psm/Router.class.php b/src/psm/Router.php similarity index 100% rename from src/psm/Router.class.php rename to src/psm/Router.php diff --git a/src/psm/Service/Database.class.php b/src/psm/Service/Database.php similarity index 100% rename from src/psm/Service/Database.class.php rename to src/psm/Service/Database.php diff --git a/src/psm/Service/User.class.php b/src/psm/Service/User.php similarity index 100% rename from src/psm/Service/User.class.php rename to src/psm/Service/User.php diff --git a/src/psm/Txtmsg/Clickatell.class.php b/src/psm/Txtmsg/Clickatell.php similarity index 100% rename from src/psm/Txtmsg/Clickatell.class.php rename to src/psm/Txtmsg/Clickatell.php diff --git a/src/psm/Txtmsg/Core.class.php b/src/psm/Txtmsg/Core.php similarity index 100% rename from src/psm/Txtmsg/Core.class.php rename to src/psm/Txtmsg/Core.php diff --git a/src/psm/Txtmsg/FreeVoipDeal.class.php b/src/psm/Txtmsg/FreeVoipDeal.php similarity index 100% rename from src/psm/Txtmsg/FreeVoipDeal.class.php rename to src/psm/Txtmsg/FreeVoipDeal.php diff --git a/src/psm/Txtmsg/Inetworx.class.php b/src/psm/Txtmsg/Inetworx.php similarity index 100% rename from src/psm/Txtmsg/Inetworx.class.php rename to src/psm/Txtmsg/Inetworx.php diff --git a/src/psm/Txtmsg/Mollie.class.php b/src/psm/Txtmsg/Mollie.php similarity index 100% rename from src/psm/Txtmsg/Mollie.class.php rename to src/psm/Txtmsg/Mollie.php diff --git a/src/psm/Txtmsg/Mosms.class.php b/src/psm/Txtmsg/Mosms.php similarity index 100% rename from src/psm/Txtmsg/Mosms.class.php rename to src/psm/Txtmsg/Mosms.php diff --git a/src/psm/Txtmsg/Smsglobal.class.php b/src/psm/Txtmsg/Smsglobal.php similarity index 100% rename from src/psm/Txtmsg/Smsglobal.class.php rename to src/psm/Txtmsg/Smsglobal.php diff --git a/src/psm/Txtmsg/Smsit.class.php b/src/psm/Txtmsg/Smsit.php similarity index 100% rename from src/psm/Txtmsg/Smsit.class.php rename to src/psm/Txtmsg/Smsit.php diff --git a/src/psm/Txtmsg/Spryng.class.php b/src/psm/Txtmsg/Spryng.php similarity index 100% rename from src/psm/Txtmsg/Spryng.class.php rename to src/psm/Txtmsg/Spryng.php diff --git a/src/psm/Txtmsg/TxtmsgInterface.class.php b/src/psm/Txtmsg/TxtmsgInterface.php similarity index 100% rename from src/psm/Txtmsg/TxtmsgInterface.class.php rename to src/psm/Txtmsg/TxtmsgInterface.php diff --git a/src/psm/Util/Install/Installer.class.php b/src/psm/Util/Install/Installer.php similarity index 100% rename from src/psm/Util/Install/Installer.class.php rename to src/psm/Util/Install/Installer.php diff --git a/src/psm/Util/Module/Modal.class.php b/src/psm/Util/Module/Modal.php similarity index 100% rename from src/psm/Util/Module/Modal.class.php rename to src/psm/Util/Module/Modal.php diff --git a/src/psm/Util/Module/ModalInterface.class.php b/src/psm/Util/Module/ModalInterface.php similarity index 100% rename from src/psm/Util/Module/ModalInterface.class.php rename to src/psm/Util/Module/ModalInterface.php diff --git a/src/psm/Util/Module/Sidebar.class.php b/src/psm/Util/Module/Sidebar.php similarity index 100% rename from src/psm/Util/Module/Sidebar.class.php rename to src/psm/Util/Module/Sidebar.php diff --git a/src/psm/Util/Module/SidebarInterface.class.php b/src/psm/Util/Module/SidebarInterface.php similarity index 100% rename from src/psm/Util/Module/SidebarInterface.class.php rename to src/psm/Util/Module/SidebarInterface.php diff --git a/src/psm/Util/Server/ArchiveManager.class.php b/src/psm/Util/Server/ArchiveManager.php similarity index 100% rename from src/psm/Util/Server/ArchiveManager.class.php rename to src/psm/Util/Server/ArchiveManager.php diff --git a/src/psm/Util/Server/Archiver/ArchiverInterface.class.php b/src/psm/Util/Server/Archiver/ArchiverInterface.php similarity index 100% rename from src/psm/Util/Server/Archiver/ArchiverInterface.class.php rename to src/psm/Util/Server/Archiver/ArchiverInterface.php diff --git a/src/psm/Util/Server/Archiver/LogsArchiver.class.php b/src/psm/Util/Server/Archiver/LogsArchiver.php similarity index 100% rename from src/psm/Util/Server/Archiver/LogsArchiver.class.php rename to src/psm/Util/Server/Archiver/LogsArchiver.php diff --git a/src/psm/Util/Server/Archiver/UptimeArchiver.class.php b/src/psm/Util/Server/Archiver/UptimeArchiver.php similarity index 100% rename from src/psm/Util/Server/Archiver/UptimeArchiver.class.php rename to src/psm/Util/Server/Archiver/UptimeArchiver.php diff --git a/src/psm/Util/Server/HistoryGraph.class.php b/src/psm/Util/Server/HistoryGraph.php similarity index 100% rename from src/psm/Util/Server/HistoryGraph.class.php rename to src/psm/Util/Server/HistoryGraph.php diff --git a/src/psm/Util/Server/ServerValidator.class.php b/src/psm/Util/Server/ServerValidator.php similarity index 100% rename from src/psm/Util/Server/ServerValidator.class.php rename to src/psm/Util/Server/ServerValidator.php diff --git a/src/psm/Util/Server/UpdateManager.class.php b/src/psm/Util/Server/UpdateManager.php similarity index 100% rename from src/psm/Util/Server/UpdateManager.class.php rename to src/psm/Util/Server/UpdateManager.php diff --git a/src/psm/Util/Server/Updater/StatusNotifier.class.php b/src/psm/Util/Server/Updater/StatusNotifier.php similarity index 100% rename from src/psm/Util/Server/Updater/StatusNotifier.class.php rename to src/psm/Util/Server/Updater/StatusNotifier.php diff --git a/src/psm/Util/Server/Updater/StatusUpdater.class.php b/src/psm/Util/Server/Updater/StatusUpdater.php similarity index 100% rename from src/psm/Util/Server/Updater/StatusUpdater.class.php rename to src/psm/Util/Server/Updater/StatusUpdater.php diff --git a/src/psm/Util/User/UserValidator.class.php b/src/psm/Util/User/UserValidator.php similarity index 100% rename from src/psm/Util/User/UserValidator.class.php rename to src/psm/Util/User/UserValidator.php