From 508c25c111a335d9100df9489d1dce1afaabef14 Mon Sep 17 00:00:00 2001 From: Joey Kimsey Date: Fri, 9 Aug 2024 02:05:53 -0400 Subject: [PATCH] more changes to support composer usage --- app/classes/controller.php | 3 +- app/config/constants.php | 230 +++++++++++++------------ app/plugins/calendar/models/events.php | 2 +- bin/autoload.php | 29 ++-- composer.json | 4 +- composer.lock | 18 +- 6 files changed, 141 insertions(+), 145 deletions(-) diff --git a/app/classes/controller.php b/app/classes/controller.php index ac8fed9..63e948b 100644 --- a/app/classes/controller.php +++ b/app/classes/controller.php @@ -13,11 +13,12 @@ namespace TheTempusProject\Classes; use TheTempusProject\Bedrock\Classes\Controller as BedrockController; use TheTempusProject\Houdini\Classes\Template; -use TheTempusProject\Houdini\Classes\Pagination; +use TheTempusProject\Bedrock\Classes\Pagination; use TheTempusProject\TheTempusProject as App; use TheTempusProject\Models\User; use TheTempusProject\Models\Sessions; use TheTempusProject\Bedrock\Functions\Token; +use TheTempusProject\Houdini\Classes\Components; class Controller extends BedrockController { public static $user; diff --git a/app/config/constants.php b/app/config/constants.php index 7cedba2..801882f 100644 --- a/app/config/constants.php +++ b/app/config/constants.php @@ -3,131 +3,133 @@ if ( ! defined( 'APP_ROOT_DIRECTORY' ) ) { define( 'APP_ROOT_DIRECTORY', dirname( __DIR__ ) . DIRECTORY_SEPARATOR ); // need to verify } - define( 'APP_DIRECTORY', APP_ROOT_DIRECTORY . 'app' . DIRECTORY_SEPARATOR ); + define( 'APP_DIRECTORY', APP_ROOT_DIRECTORY . 'app' . DIRECTORY_SEPARATOR ); // Directories - define( 'CSS_DIRECTORY', APP_ROOT_DIRECTORY . 'css' . DIRECTORY_SEPARATOR ); - define( 'IMAGE_DIRECTORY', APP_ROOT_DIRECTORY . 'images' . DIRECTORY_SEPARATOR ); - define( 'JAVASCRIPT_DIRECTORY', APP_ROOT_DIRECTORY . 'js' . DIRECTORY_SEPARATOR ); - define( 'HTACCESS_LOCATION', APP_ROOT_DIRECTORY . '.htaccess' ); + define( 'CSS_DIRECTORY', APP_ROOT_DIRECTORY . 'css' . DIRECTORY_SEPARATOR ); + define( 'IMAGE_DIRECTORY', APP_ROOT_DIRECTORY . 'images' . DIRECTORY_SEPARATOR ); + define( 'JAVASCRIPT_DIRECTORY', APP_ROOT_DIRECTORY . 'js' . DIRECTORY_SEPARATOR ); + define( 'HTACCESS_LOCATION', APP_ROOT_DIRECTORY . '.htaccess' ); +if ( ! defined( 'CONFIG_DIRECTORY' ) ) { define( 'CONFIG_DIRECTORY', APP_DIRECTORY . 'config' . DIRECTORY_SEPARATOR ); - define( 'PLUGIN_DIRECTORY', APP_DIRECTORY . 'plugins' . DIRECTORY_SEPARATOR ); - define( 'MODEL_DIRECTORY', APP_DIRECTORY . 'models' . DIRECTORY_SEPARATOR ); - define( 'CONTROLLER_DIRECTORY', APP_DIRECTORY . 'controllers' . DIRECTORY_SEPARATOR ); - define( 'ADMIN_CONTROLLER_DIRECTORY', CONTROLLER_DIRECTORY. 'admin' . DIRECTORY_SEPARATOR ); - define( 'API_CONTROLLER_DIRECTORY', CONTROLLER_DIRECTORY. 'api' . DIRECTORY_SEPARATOR ); +} + define( 'PLUGIN_DIRECTORY', APP_DIRECTORY . 'plugins' . DIRECTORY_SEPARATOR ); + define( 'MODEL_DIRECTORY', APP_DIRECTORY . 'models' . DIRECTORY_SEPARATOR ); + define( 'CONTROLLER_DIRECTORY', APP_DIRECTORY . 'controllers' . DIRECTORY_SEPARATOR ); + define( 'ADMIN_CONTROLLER_DIRECTORY', CONTROLLER_DIRECTORY. 'admin' . DIRECTORY_SEPARATOR ); + define( 'API_CONTROLLER_DIRECTORY', CONTROLLER_DIRECTORY. 'api' . DIRECTORY_SEPARATOR ); // Files - define( 'PERMISSIONS_JSON', CONFIG_DIRECTORY . 'permissions.json' ); - define( 'PREFERENCES_JSON', CONFIG_DIRECTORY . 'preferences.json' ); - define( 'INSTALL_JSON_LOCATION', CONFIG_DIRECTORY . 'install.json' ); - define( 'INSTALLER_LOCATION', APP_ROOT_DIRECTORY . 'install.php' ); + define( 'PERMISSIONS_JSON', CONFIG_DIRECTORY . 'permissions.json' ); + define( 'PREFERENCES_JSON', CONFIG_DIRECTORY . 'preferences.json' ); + define( 'INSTALL_JSON_LOCATION', CONFIG_DIRECTORY . 'install.json' ); + define( 'INSTALLER_LOCATION', APP_ROOT_DIRECTORY . 'install.php' ); // Other - define( 'PLUGINS_ENABLED', true ); - define( 'INSTALL_STATUS_NOT_REQUIRED', 'Not Required' ); - define( 'INSTALL_STATUS_NOT_FOUND', 'Not Found' ); - define( 'INSTALL_STATUS_PARTIALLY_INSTALLED', 'Partially Installed' ); - define( 'INSTALL_STATUS_NOT_INSTALLED', 'Not Installed' ); - define( 'INSTALL_STATUS_INSTALLED', 'Installed' ); - define( 'INSTALL_STATUS_UNINSTALLED', 'Uninstalled' ); - define( 'INSTALL_STATUS_SUCCESS', 'Success' ); - define( 'INSTALL_STATUS_SKIPPED', 'Skipped' ); - define( 'INSTALL_STATUS_FAIL', 'Failed' ); - define( 'MODEL_INSTALL_FLAGS', [ 'installTable', 'installPermissions', 'installConfigs', 'installResources', 'installPreferences' ] ); - define( 'PLUGIN_INSTALL_FLAGS', [ 'models_installed', 'permissions_installed', 'configs_installed', 'resources_installed', 'preferences_installed' ] ); + define( 'PLUGINS_ENABLED', true ); + define( 'INSTALL_STATUS_NOT_REQUIRED', 'Not Required' ); + define( 'INSTALL_STATUS_NOT_FOUND', 'Not Found' ); + define( 'INSTALL_STATUS_PARTIALLY_INSTALLED', 'Partially Installed' ); + define( 'INSTALL_STATUS_NOT_INSTALLED', 'Not Installed' ); + define( 'INSTALL_STATUS_INSTALLED', 'Installed' ); + define( 'INSTALL_STATUS_UNINSTALLED', 'Uninstalled' ); + define( 'INSTALL_STATUS_SUCCESS', 'Success' ); + define( 'INSTALL_STATUS_SKIPPED', 'Skipped' ); + define( 'INSTALL_STATUS_FAIL', 'Failed' ); + define( 'MODEL_INSTALL_FLAGS', [ 'installTable', 'installPermissions', 'installConfigs', 'installResources', 'installPreferences' ] ); + define( 'PLUGIN_INSTALL_FLAGS', [ 'models_installed', 'permissions_installed', 'configs_installed', 'resources_installed', 'preferences_installed' ] ); # Tempus Debugger define( 'CANARY_SECURE_HASH', 'd73ed7591a30f0ca7d686a0e780f0d05' ); # Tempus Project Core - // Check - define( 'MINIMUM_PHP_VERSION', 8.1); - // Cookies - define( 'DEFAULT_COOKIE_PREFIX', 'TP_'); - // Debug + // Check + define( 'MINIMUM_PHP_VERSION', 8.1); + // Cookies + define( 'DEFAULT_COOKIE_PREFIX', 'TP_'); + // Debug define( 'CANARY_DEBUG_LEVEL_ERROR', 'error' ); define( 'CANARY_DEBUG_LEVEL_WARN', 'warn' ); define( 'CANARY_DEBUG_LEVEL_INFO', 'info' ); define( 'CANARY_DEBUG_LEVEL_LOG', 'log' ); define( 'CANARY_DEBUG_LEVEL_DEBUG', 'debug' ); define( 'CANARY_DEBUG_TO_FILE_LEVEL', CANARY_DEBUG_LEVEL_INFO ); - define( 'CANARY_ENABLED', true ); - define( 'DEBUG_EMAIL', 'webmaster@' . $_SERVER['HTTP_HOST'] ); - define( 'HERMES_REDIRECTS_ENABLED', true ); - define( 'RENDERING_ENABLED', true ); - define( 'CANARY_TRACE_ENABLED', false ); - define( 'CANARY_DEBUG_TO_CONSOLE', false ); - define( 'CANARY_DEBUG_TO_FILE', true ); - // Directories - if ( ! defined( 'VENDOR_DIRECTORY' ) ) { - define( 'VENDOR_DIRECTORY', APP_ROOT_DIRECTORY . 'vendor' . DIRECTORY_SEPARATOR ); - } - if ( is_dir( VENDOR_DIRECTORY . 'thetempusproject' )) { - define( 'TP_VENDOR_DIRECTORY', VENDOR_DIRECTORY . 'thetempusproject' . DIRECTORY_SEPARATOR ); - } elseif ( is_dir( VENDOR_DIRECTORY . 'TheTempusProject' )) { - define( 'TP_VENDOR_DIRECTORY', VENDOR_DIRECTORY . 'TheTempusProject' . DIRECTORY_SEPARATOR ); - } else { - define( 'TP_VENDOR_DIRECTORY', VENDOR_DIRECTORY); - } - # Bedrock - if ( is_dir( TP_VENDOR_DIRECTORY . 'tempusprojectcore' )) { - define( 'BEDROCK_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'tempusprojectcore' . DIRECTORY_SEPARATOR ); - } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'TempusProjectCore' )) { - define( 'BEDROCK_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'TempusProjectCore' . DIRECTORY_SEPARATOR ); - } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'bedrock' )) { - define( 'BEDROCK_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'bedrock' . DIRECTORY_SEPARATOR ); - } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Bedrock' )) { - define( 'BEDROCK_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'Bedrock' . DIRECTORY_SEPARATOR ); - } - if ( is_dir( BEDROCK_ROOT_DIRECTORY . 'config' )) { - define( 'BEDROCK_CONFIG_DIRECTORY', BEDROCK_ROOT_DIRECTORY . 'config' . DIRECTORY_SEPARATOR ); - } - # Canary - if ( is_dir( TP_VENDOR_DIRECTORY . 'tempusdebugger' )) { - define( 'CANARY_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'tempusdebugger' . DIRECTORY_SEPARATOR ); - } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'TempusDebugger' )) { - define( 'CANARY_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'TempusDebugger' . DIRECTORY_SEPARATOR ); - } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'canary' )) { - define( 'CANARY_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'canary' . DIRECTORY_SEPARATOR ); - } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Canary' )) { - define( 'CANARY_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'Canary' . DIRECTORY_SEPARATOR ); - } - if ( is_dir( CANARY_ROOT_DIRECTORY . 'config' )) { - define( 'CANARY_CONFIG_DIRECTORY', CANARY_ROOT_DIRECTORY . 'config' . DIRECTORY_SEPARATOR ); - } - # Hermes - if ( is_dir( TP_VENDOR_DIRECTORY . 'hermes' )) { - define( 'HERMES_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'hermes' . DIRECTORY_SEPARATOR ); - } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Hermes' )) { - define( 'HERMES_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'Hermes' . DIRECTORY_SEPARATOR ); - } - if ( is_dir( HERMES_ROOT_DIRECTORY . 'config' )) { - define( 'HERMES_CONFIG_DIRECTORY', HERMES_ROOT_DIRECTORY . 'config' . DIRECTORY_SEPARATOR ); - } - # Houdini - if ( is_dir( TP_VENDOR_DIRECTORY . 'houdini' )) { - define( 'HOUDINI_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'houdini' . DIRECTORY_SEPARATOR ); - } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Houdini' )) { - define( 'HOUDINI_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'Houdini' . DIRECTORY_SEPARATOR ); - } - if ( is_dir( HOUDINI_ROOT_DIRECTORY . 'config' )) { - define( 'HOUDINI_CONFIG_DIRECTORY', HOUDINI_ROOT_DIRECTORY . 'config' . DIRECTORY_SEPARATOR ); - } - // Shared Directories - define( 'BIN_DIRECTORY', APP_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR ); - define( 'VIEW_DIRECTORY', APP_DIRECTORY . 'views' . DIRECTORY_SEPARATOR ); - define( 'ERRORS_DIRECTORY', VIEW_DIRECTORY . 'errors' . DIRECTORY_SEPARATOR ); - define( 'CLASSES_DIRECTORY', APP_DIRECTORY . 'classes' . DIRECTORY_SEPARATOR ); - define( 'FUNCTIONS_DIRECTORY', APP_DIRECTORY . 'functions' . DIRECTORY_SEPARATOR ); - define( 'RESOURCES_DIRECTORY', APP_DIRECTORY . 'resources' . DIRECTORY_SEPARATOR ); - define( 'TEMPLATE_DIRECTORY', APP_DIRECTORY . 'templates' . DIRECTORY_SEPARATOR ); - define( 'UPLOAD_DIRECTORY', APP_ROOT_DIRECTORY . 'uploads' . DIRECTORY_SEPARATOR ); - define( 'IMAGE_UPLOAD_DIRECTORY', UPLOAD_DIRECTORY . 'images' . DIRECTORY_SEPARATOR ); - // Files - define( 'COMPOSER_JSON_LOCATION', APP_ROOT_DIRECTORY . 'composer.json' ); - define( 'COMPOSER_LOCK_LOCATION', APP_ROOT_DIRECTORY . 'composer.lock' ); - define( 'CONFIG_JSON', CONFIG_DIRECTORY . 'config.json' ); - // Other - define( 'EMAIL_FROM_EMAIL', 'noreply@localohost.com' ); - // Sessions - define( 'DEFAULT_SESSION_PREFIX', 'TP_' ); - // Token - define( 'DEFAULT_TOKEN_NAME', 'TP_SESSION_TOKEN' ); + define( 'CANARY_ENABLED', true ); + define( 'DEBUG_EMAIL', 'webmaster@' . $_SERVER['HTTP_HOST'] ); + define( 'HERMES_REDIRECTS_ENABLED', true ); + define( 'RENDERING_ENABLED', true ); + define( 'CANARY_TRACE_ENABLED', false ); + define( 'CANARY_DEBUG_TO_CONSOLE', false ); + define( 'CANARY_DEBUG_TO_FILE', true ); + // Directories + if ( ! defined( 'VENDOR_DIRECTORY' ) ) { + define( 'VENDOR_DIRECTORY', APP_ROOT_DIRECTORY . 'vendor' . DIRECTORY_SEPARATOR ); + } + if ( is_dir( VENDOR_DIRECTORY . 'thetempusproject' )) { + define( 'TP_VENDOR_DIRECTORY', VENDOR_DIRECTORY . 'thetempusproject' . DIRECTORY_SEPARATOR ); + } elseif ( is_dir( VENDOR_DIRECTORY . 'TheTempusProject' )) { + define( 'TP_VENDOR_DIRECTORY', VENDOR_DIRECTORY . 'TheTempusProject' . DIRECTORY_SEPARATOR ); + } else { + define( 'TP_VENDOR_DIRECTORY', VENDOR_DIRECTORY); + } + # Bedrock + if ( is_dir( TP_VENDOR_DIRECTORY . 'tempusprojectcore' )) { + define( 'BEDROCK_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'tempusprojectcore' . DIRECTORY_SEPARATOR ); + } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'TempusProjectCore' )) { + define( 'BEDROCK_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'TempusProjectCore' . DIRECTORY_SEPARATOR ); + } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'bedrock' )) { + define( 'BEDROCK_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'bedrock' . DIRECTORY_SEPARATOR ); + } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Bedrock' )) { + define( 'BEDROCK_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'Bedrock' . DIRECTORY_SEPARATOR ); + } + if ( is_dir( BEDROCK_ROOT_DIRECTORY . 'config' )) { + define( 'BEDROCK_CONFIG_DIRECTORY', BEDROCK_ROOT_DIRECTORY . 'config' . DIRECTORY_SEPARATOR ); + } + # Canary + if ( is_dir( TP_VENDOR_DIRECTORY . 'tempusdebugger' )) { + define( 'CANARY_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'tempusdebugger' . DIRECTORY_SEPARATOR ); + } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'TempusDebugger' )) { + define( 'CANARY_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'TempusDebugger' . DIRECTORY_SEPARATOR ); + } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'canary' )) { + define( 'CANARY_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'canary' . DIRECTORY_SEPARATOR ); + } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Canary' )) { + define( 'CANARY_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'Canary' . DIRECTORY_SEPARATOR ); + } + if ( is_dir( CANARY_ROOT_DIRECTORY . 'config' )) { + define( 'CANARY_CONFIG_DIRECTORY', CANARY_ROOT_DIRECTORY . 'config' . DIRECTORY_SEPARATOR ); + } + # Hermes + if ( is_dir( TP_VENDOR_DIRECTORY . 'hermes' )) { + define( 'HERMES_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'hermes' . DIRECTORY_SEPARATOR ); + } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Hermes' )) { + define( 'HERMES_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'Hermes' . DIRECTORY_SEPARATOR ); + } + if ( is_dir( HERMES_ROOT_DIRECTORY . 'config' )) { + define( 'HERMES_CONFIG_DIRECTORY', HERMES_ROOT_DIRECTORY . 'config' . DIRECTORY_SEPARATOR ); + } + # Houdini + if ( is_dir( TP_VENDOR_DIRECTORY . 'houdini' )) { + define( 'HOUDINI_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'houdini' . DIRECTORY_SEPARATOR ); + } elseif ( is_dir( TP_VENDOR_DIRECTORY . 'Houdini' )) { + define( 'HOUDINI_ROOT_DIRECTORY', TP_VENDOR_DIRECTORY . 'Houdini' . DIRECTORY_SEPARATOR ); + } + if ( is_dir( HOUDINI_ROOT_DIRECTORY . 'config' )) { + define( 'HOUDINI_CONFIG_DIRECTORY', HOUDINI_ROOT_DIRECTORY . 'config' . DIRECTORY_SEPARATOR ); + } + // Shared Directories + define( 'BIN_DIRECTORY', APP_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR ); + define( 'VIEW_DIRECTORY', APP_DIRECTORY . 'views' . DIRECTORY_SEPARATOR ); + define( 'ERRORS_DIRECTORY', VIEW_DIRECTORY . 'errors' . DIRECTORY_SEPARATOR ); + define( 'CLASSES_DIRECTORY', APP_DIRECTORY . 'classes' . DIRECTORY_SEPARATOR ); + define( 'FUNCTIONS_DIRECTORY', APP_DIRECTORY . 'functions' . DIRECTORY_SEPARATOR ); + define( 'RESOURCES_DIRECTORY', APP_DIRECTORY . 'resources' . DIRECTORY_SEPARATOR ); + define( 'TEMPLATE_DIRECTORY', APP_DIRECTORY . 'templates' . DIRECTORY_SEPARATOR ); + define( 'UPLOAD_DIRECTORY', APP_ROOT_DIRECTORY . 'uploads' . DIRECTORY_SEPARATOR ); + define( 'IMAGE_UPLOAD_DIRECTORY', UPLOAD_DIRECTORY . 'images' . DIRECTORY_SEPARATOR ); + // Files + define( 'COMPOSER_JSON_LOCATION', APP_ROOT_DIRECTORY . 'composer.json' ); + define( 'COMPOSER_LOCK_LOCATION', APP_ROOT_DIRECTORY . 'composer.lock' ); + define( 'CONFIG_JSON', CONFIG_DIRECTORY . 'config.json' ); + // Other + define( 'EMAIL_FROM_EMAIL', 'noreply@localohost.com' ); + // Sessions + define( 'DEFAULT_SESSION_PREFIX', 'TP_' ); + // Token + define( 'DEFAULT_TOKEN_NAME', 'TP_SESSION_TOKEN' ); # Tell the app; all constants have been loaded - define( 'TEMPUS_PROJECT_CONSTANTS_LOADED', true ); + define( 'TEMPUS_PROJECT_CONSTANTS_LOADED', true ); diff --git a/app/plugins/calendar/models/events.php b/app/plugins/calendar/models/events.php index f87f760..c56c3d4 100644 --- a/app/plugins/calendar/models/events.php +++ b/app/plugins/calendar/models/events.php @@ -21,7 +21,7 @@ use TheTempusProject\Houdini\Classes\Filters; use TheTempusProject\Models\Calendars; use TheTempusProject\Bedrock\Classes\CustomException; use TheTempusProject\Bedrock\Functions\Date; -use TheTempusProject\Houdini\Classes\Pagination; +use TheTempusProject\Bedrock\Classes\Pagination; class Events extends DatabaseModel { public $tableName = 'events'; diff --git a/bin/autoload.php b/bin/autoload.php index ba1beec..5774a9a 100644 --- a/bin/autoload.php +++ b/bin/autoload.php @@ -16,8 +16,14 @@ use TheTempusProject\Hermes\Classes\Autoloader; use TheTempusProject\Houdini\Classes\Template; use TheTempusProject\Houdini\Classes\Views; +// Basic constants needed for loading files define( 'APP_ROOT_DIRECTORY', dirname( __DIR__ ) . DIRECTORY_SEPARATOR ); -define( 'VENDOR_DIRECTORY', APP_ROOT_DIRECTORY . 'vendor' . DIRECTORY_SEPARATOR ); +define( 'CONFIG_DIRECTORY', APP_ROOT_DIRECTORY . 'app' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR ); + +// App Constants +if ( ! defined( 'TEMPUS_PROJECT_CONSTANTS_LOADED' ) ) { + require_once CONFIG_DIRECTORY . 'constants.php'; +} // Determine which autoloader to sue if ( file_exists( VENDOR_DIRECTORY . 'autoload.php' ) ) { @@ -99,7 +105,7 @@ function ttp_autoload() { require_once( $currentFolder ); break; case 'config': - if (file_exists($currentFolder . 'constants.php')) { + if ( file_exists( $currentFolder . 'constants.php' ) ) { require_once( $currentFolder . 'constants.php' ); } break; @@ -110,22 +116,7 @@ function ttp_autoload() { define('TEMPUS_PROJECT_AUTOLOADED', true); } -require_once 'bin/tempus_project.php'; - function sideLoad() { - // Basic constants needed for loading files - if ( ! defined( 'APP_ROOT_DIRECTORY' ) ) { - define( 'APP_ROOT_DIRECTORY', dirname( __DIR__ ) . DIRECTORY_SEPARATOR ); - } - if ( ! defined( 'CONFIG_DIRECTORY' ) ) { - define( 'CONFIG_DIRECTORY', APP_ROOT_DIRECTORY . 'app' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR ); - } - - // App Constants - if ( ! defined( 'TEMPUS_PROJECT_CONSTANTS_LOADED' ) ) { - require_once CONFIG_DIRECTORY . 'constants.php'; - } - // Hermes Constants if ( ! defined( 'HERMES_CONSTANTS_LOADED' ) ) { if ( defined( 'HERMES_CONFIG_DIRECTORY' ) ) { @@ -179,4 +170,6 @@ function sideLoad() { } define( 'VENDOR_AUTOLOADED', false ); -} \ No newline at end of file +} + +require_once 'bin/tempus_project.php'; diff --git a/composer.json b/composer.json index ee41d93..56d1155 100644 --- a/composer.json +++ b/composer.json @@ -30,12 +30,12 @@ { "files": [ - "app/config/constants.php" + "app/functions/forms.php", + "app/functions/common.php" ], "classmap": [ "app/classes", - "app/functions", "app/models" ], "psr-4": diff --git a/composer.lock b/composer.lock index 68b5436..a4fa043 100644 --- a/composer.lock +++ b/composer.lock @@ -60,11 +60,11 @@ }, { "name": "thetempusproject/bedrock", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://git.thetempusproject.com/the-tempus-project/bedrock", - "reference": "e3cf6beebb810e810b626678c391524bf6b3ddc5" + "reference": "f80f7bed6bb6c399ce8ea2426ebe1e118cc30a9c" }, "require": { "php": ">=8.1.0", @@ -101,15 +101,15 @@ "framework", "mvc" ], - "time": "2024-08-09T04:55:48+00:00" + "time": "2024-08-09T05:35:47+00:00" }, { "name": "thetempusproject/canary", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://git.thetempusproject.com/the-tempus-project/canary", - "reference": "7746eb4af73f3eaba040d547904a251bbdab6977" + "reference": "8dff31b4eefa3efeb9f81d2e6b6ef3e9f8c9f27b" }, "require": { "php": ">=8.1.0" @@ -144,7 +144,7 @@ "thetempusproject", "tools" ], - "time": "2024-08-09T04:35:45+00:00" + "time": "2024-08-09T06:18:45+00:00" }, { "name": "thetempusproject/hermes", @@ -191,11 +191,11 @@ }, { "name": "thetempusproject/houdini", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://git.thetempusproject.com/the-tempus-project/houdini", - "reference": "3de98733ac32c0a6e1a3230cbccfa33263e399be" + "reference": "34babdb2dc508450d14a0764bf81b032a6861a58" }, "require": { "php": ">=8.1.0", @@ -231,7 +231,7 @@ "thetempusproject", "tools" ], - "time": "2024-08-09T04:56:06+00:00" + "time": "2024-08-09T06:20:26+00:00" }, { "name": "twbs/bootstrap",