fixes to support composer / packagist

README.md

@@ -1,39 +1,41 @@
 # The Tempus Project
 
+
+need to make a vs battle for dnd. someone makes a truly broken character, we take the base character and hand it to two people and give them some time to figure out how they would break it
+
+need to track points once a week
+
+a huge table tracks points day to day then we add and erase the old data, or move it to historical...
+
 ## Rapid Prototyping Framework
 
-## Developer(s): Joey Kimsey
+### Developer(s): Joey Kimsey
 
 The aim of this project is to provide a simple and stable platform from which to easily add functionality. The goal being the ability to quickly build and test new projects with a lightweight ecosystem to help.
 
 **Notice: This code is in _still_ not production ready. This framework is provided as is, use at your own risk.**
 I am working very hard to ensure the system is safe and reliable enough for me to endorse its widespread use. Unfortunately, it still needs a lot of QA and improvements.
 
+Currently I am in the process of testing all the systems in preparation for the first production ready release. The beta is still on-going. If you would like to participate or stay up to date with the latest, you can find more information at: https://TheTempusProject.com/beta
+
 ## Features
 
-- A Plugin system that allows plug-and-play functionality
+A User management system with groups, permissions, preferences, registration, and recovery. (All Controlled dynamically via our plugin interface)
-- A User management system
+A Plugin system that allows plug-and-play functionality for a huge number of features.
-    - groups
+Compatibility with both Apache and NGINX.
-    - permissions
+Built with Bootstrap with a focus on mobile compatibility.
-    - preferences
+Incredibly easy to set-up, deploy, and develop with.
-    - registration and recovery
-    (All Controlled dynamically via our plugin interface)
-- Compatibility with both Apache and NGINX
-- Built with Bootstrap with a focus on mobile compatibility
-- Incredibly easy to set-up, deploy, and develop
 
 ## Installation
 
-Preferred method for installation is using composer. Special attention has been given to use without composer and more information is included below.
+Preferred method for installation is using composer.
+
+### Manually
+
+### Docker
 
 ### Composer
 
-The simplest method to start a new project is to use composer to create a new project and automatically clone all the necessary files:
-
-```
-composer create-project thetempusproject/thetempusproject test-app
-```
-
 1. Clone the directory to wherever you want to install the framework.
 2. Open your terminal to the directory you previously cloned the repository.
 3. Install using composer:
@@ -41,12 +43,6 @@ composer create-project thetempusproject/thetempusproject test-app
 4. Open your browser and navigate to install.php (it will be in the root directory of your installation)
 5. When prompted, complete the forms and complete the process.
 
-
-### Manually
-
-### Docker
-
-
 #### Apache
 
 #### NGINX

app/classes/config.php

@@ -12,7 +12,7 @@
 namespace TheTempusProject\Classes;
 
 use TheTempusProject\Houdini\Classes\Forms;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Input;
 use TheTempusProject\Bedrock\Classes\Config as BedrockConfig;

app/classes/controller.php

@@ -13,12 +13,11 @@ namespace TheTempusProject\Classes;
 
 use TheTempusProject\Bedrock\Classes\Controller as BedrockController;
 use TheTempusProject\Houdini\Classes\Template;
-use TheTempusProject\Bedrock\Classes\Pagination;
+use TheTempusProject\Houdini\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;

app/classes/database_model.php

@@ -13,7 +13,7 @@ namespace TheTempusProject\Classes;
 
 use TheTempusProject\Bedrock\Classes\DatabaseModel as BedrockDatabaseModel;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Models\Log;
 
 class DatabaseModel extends BedrockDatabaseModel {

app/classes/email.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Classes;
 use TheTempusProject\Houdini\Classes\Template;
 use TheTempusProject\Houdini\Classes\Views;
 use TheTempusProject\Hermes\Functions\Route as Routes;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 
 class Email {
     private static $header = null;

app/classes/forms.php

@@ -15,7 +15,7 @@
 namespace TheTempusProject\Classes;
 
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 
 class Forms extends Check {
     private static $formHandlers = [];

app/classes/installer.php

@@ -16,7 +16,7 @@ namespace TheTempusProject\Classes;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Code;
 use TheTempusProject\Bedrock\Functions\Cookie;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Hermes\Functions\Redirect;
 use TheTempusProject\Hermes\Functions\Route as Routes;
 use TheTempusProject\Bedrock\Functions\Session;

app/classes/permissions.php

@@ -11,7 +11,7 @@
  */
 namespace TheTempusProject\Classes;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Houdini\Classes\Forms;
 use TheTempusProject\Bedrock\Functions\Input;

app/classes/plugin.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Classes;
 use TheTempusProject\Houdini\Classes\Navigation;
 use TheTempusProject\Houdini\Classes\Filters;
 use TheTempusProject\TheTempusProject as App;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Classes\Database;
 
 class Plugin {

app/classes/preferences.php

@@ -13,7 +13,7 @@ namespace TheTempusProject\Classes;
 
 use TheTempusProject\Houdini\Classes\Issues;
 use TheTempusProject\Houdini\Classes\Forms;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Upload;
 use TheTempusProject\Bedrock\Functions\Input;

app/config/constants.php

@@ -1,17 +1,19 @@
 <?php
+if ( ! defined( 'APP_SPACE' ) ) {
     define( 'APP_SPACE',                          'TheTempusProject' );
+}
 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 );
+if ( ! defined( 'CONFIG_DIRECTORY' ) ) {
+    define( 'CONFIG_DIRECTORY',                   APP_ROOT_DIRECTORY  . 'app'               . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR );
+}
 // Directories
+	define( 'APP_DIRECTORY',                      APP_ROOT_DIRECTORY  . 'app'               . DIRECTORY_SEPARATOR );
 	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 );
@@ -57,9 +59,7 @@ if ( ! defined( 'CONFIG_DIRECTORY' ) ) {
 		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' )) {

app/models/group.php

@@ -12,7 +12,7 @@
 namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\Permissions;
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Input;

app/models/log.php

@@ -16,7 +16,7 @@ use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Classes\DatabaseModel;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 
 class Log extends DatabaseModel {
     public $tableName = 'logs';

app/models/routes.php

@@ -12,7 +12,7 @@
 namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 
 class Routes extends DatabaseModel {

app/models/sessions.php

@@ -16,7 +16,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Code;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Session;
 use TheTempusProject\Bedrock\Functions\Cookie;
 use TheTempusProject\Classes\DatabaseModel;

app/models/user.php

@@ -16,7 +16,7 @@
 namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Hash;
 use TheTempusProject\Bedrock\Functions\Session;
 use TheTempusProject\Bedrock\Functions\Code;

app/plugins/blog/controllers/blog.php

@@ -13,7 +13,7 @@
 namespace TheTempusProject\Controllers;
 
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Input;
 use TheTempusProject\Houdini\Classes\Components;
 use TheTempusProject\Houdini\Classes\Issues;

app/plugins/blog/models/posts.php

@@ -12,7 +12,7 @@
  */
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Sanitize;
 use TheTempusProject\Classes\DatabaseModel;

app/plugins/bookmarks/models/bookmarkViews.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;

app/plugins/bookmarks/models/bookmarks.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;

app/plugins/bookmarks/models/folders.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;

app/plugins/bugreport/models/bugreport.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Bugreport as Plugin;

app/plugins/bugtracker/models/bugtracker.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;

app/plugins/calendar/models/calendars.php

@@ -15,7 +15,7 @@ namespace TheTempusProject\Models;
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Date;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;

app/plugins/calendar/models/events.php

@@ -14,14 +14,14 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;
 use TheTempusProject\Models\Calendars;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\Bedrock\Functions\Date;
-use TheTempusProject\Bedrock\Classes\Pagination;
+use TheTempusProject\Houdini\Classes\Pagination;
 
 class Events extends DatabaseModel {
     public $tableName = 'events';

app/plugins/chat/controllers/chat.php

@@ -26,7 +26,7 @@ use TheTempusProject\Models\Upload as UploadModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Components;
 use TheTempusProject\Houdini\Classes\Template;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 
 class Chat extends Controller {
     protected static $chat;

app/plugins/chat/models/chat.php

@@ -16,7 +16,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;

app/plugins/comments/models/comments.php

@@ -14,7 +14,7 @@
 namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Houdini\Classes\Views;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;

app/plugins/contacts/models/contact.php

@@ -12,7 +12,7 @@
  */
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 

app/plugins/contacts/models/phonebook.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;

app/plugins/dashboards/models/dashboards.php

@@ -16,7 +16,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Dashboards as Plugin;
 

app/plugins/dice/models/dicehistory.php

@@ -16,7 +16,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Feedback as Plugin;
 use TheTempusProject\TheTempusProject as App;

app/plugins/dnd/models/characters.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Date;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;

app/plugins/dnd/models/classes.php

@@ -11,7 +11,7 @@
  */
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;

app/plugins/dnd/models/feats.php

@@ -11,7 +11,7 @@
  */
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;

app/plugins/dnd/models/gods.php

@@ -11,7 +11,7 @@
  */
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;

app/plugins/dnd/models/items.php

@@ -11,7 +11,7 @@
  */
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;

app/plugins/dnd/models/languages.php

@@ -11,7 +11,7 @@
  */
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;

app/plugins/dnd/models/monsters.php

@@ -11,7 +11,7 @@
  */
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;

app/plugins/dnd/models/races.php

@@ -11,7 +11,7 @@
  */
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;

app/plugins/dnd/models/skills.php

@@ -11,7 +11,7 @@
  */
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;

app/plugins/dnd/models/sourcebooks.php

@@ -11,7 +11,7 @@
  */
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;

app/plugins/dnd/models/spells.php

@@ -11,7 +11,7 @@
  */
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;

app/plugins/dnd/models/traits.php

@@ -11,7 +11,7 @@
  */
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;

app/plugins/feedback/models/feedback.php

@@ -16,7 +16,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Feedback as Plugin;
 

app/plugins/fileshare/models/upload.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Bedrock\Classes\CustomException;

app/plugins/initiativetracker/models/inithistory.php

@@ -16,7 +16,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Feedback as Plugin;
 use TheTempusProject\TheTempusProject as App;

app/plugins/members/models/members.php

@@ -12,7 +12,7 @@
  */
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Sanitize;
 use TheTempusProject\Classes\DatabaseModel;

app/plugins/members/models/membershipAssociations.php

@@ -13,7 +13,7 @@
 
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Sanitize;
 use TheTempusProject\Classes\DatabaseModel;

app/plugins/members/models/membershipRecords.php

@@ -12,7 +12,7 @@
  */
 namespace TheTempusProject\Models;
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Sanitize;
 use TheTempusProject\Classes\DatabaseModel;

app/plugins/messages/models/message.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Houdini\Classes\Components;
 use TheTempusProject\Houdini\Classes\Views;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Sanitize;
 use TheTempusProject\TheTempusProject as App;

app/plugins/notes/models/notebooks.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;

app/plugins/notes/models/notes.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;

app/plugins/notifications/models/notification.php

@@ -16,7 +16,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Feedback as Plugin;
 use TheTempusProject\TheTempusProject as App;

app/plugins/polls/models/poll.php

@@ -30,7 +30,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Feedback as Plugin;
 

app/plugins/polls/models/vote.php

@@ -16,7 +16,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Feedback as Plugin;
 

app/plugins/reviews/models/review.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Reviews as Plugin;
 use TheTempusProject\TheTempusProject as App;

app/plugins/reviews/models/reviewcategory.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Reviews as Plugin;
 use TheTempusProject\TheTempusProject as App;

app/plugins/subscribe/models/subscribe.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Code;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 
 class Subscribe extends DatabaseModel {

app/plugins/suggestions/models/suggestions.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;

app/plugins/tablefinder/models/players.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Tablefinder as Plugin;
 

app/plugins/tablefinder/models/tables.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Tablefinder as Plugin;
 

app/plugins/testing/models/testing.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;

app/plugins/timers/controllers/timers.php

@@ -22,7 +22,7 @@ use TheTempusProject\Bedrock\Functions\Input;
 use TheTempusProject\Houdini\Classes\Issues;
 use TheTempusProject\Classes\Forms;
 use TheTempusProject\Houdini\Classes\Template;
-use TheTempusProject\Bedrock\Bin\Bedrock;
+use TheTempusProject\Bedrock\Bedrock;
 
 class Timers extends Controller {
     protected static $timers;

app/plugins/timers/models/timers.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\TheTempusProject as App;

app/plugins/todo/models/tasklists.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Bugreport as Plugin;

app/plugins/todo/models/tasks.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Classes\CustomException;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Bugreport as Plugin;

app/plugins/updates/models/update.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Models;
 
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Classes\DatabaseModel;
 use TheTempusProject\Plugins\Updates as Plugin;
 use TheTempusProject\TheTempusProject as App;

app/resources/controllers/example.php

@@ -14,7 +14,7 @@ namespace TheTempusProject\Controllers;
 use TheTempusProject\Classes\Controller;
 use TheTempusProject\Houdini\Classes\Template;
 use TheTempusProject\Houdini\Classes\Views;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 
 // The new controller must extend the default controller class or some functionality will be lost.
 class Example extends Controller {

bin/autoload.php

@@ -17,21 +17,80 @@ use TheTempusProject\Houdini\Classes\Template;
 use TheTempusProject\Houdini\Classes\Views;
 
 // Basic constants needed for loading files
-define( 'APP_ROOT_DIRECTORY', dirname( __DIR__ ) . DIRECTORY_SEPARATOR );
+if ( ! defined( 'APP_SPACE' ) ) {
-define( 'CONFIG_DIRECTORY', APP_ROOT_DIRECTORY . 'app' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR );
+    define( 'APP_SPACE', __NAMESPACE__ );
+}
+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' ) ) {
+        require_once HERMES_CONFIG_DIRECTORY . 'constants.php';
+    }
+}
+
+// Bedrock Constants
+if ( ! defined( 'BEDROCK_CONSTANTS_LOADED' ) ) {
+    if ( defined( 'BEDROCK_CONFIG_DIRECTORY' ) ) {
+        require_once BEDROCK_CONFIG_DIRECTORY . 'constants.php';
+    }
+}
+
+// Canary Constants
+if ( ! defined( 'CANARY_CONSTANTS_LOADED' ) ) {
+    if ( defined( 'CANARY_CONFIG_DIRECTORY' ) ) {
+        require_once CANARY_CONFIG_DIRECTORY . 'constants.php';
+    }
+}
+
+// Require common functions
+require_once FUNCTIONS_DIRECTORY . 'common.php';
+
 // Determine which autoloader to sue
 if ( file_exists( VENDOR_DIRECTORY . 'autoload.php' ) ) {
     // Composer Autoloader
     require_once VENDOR_DIRECTORY . 'autoload.php';
     define( 'VENDOR_AUTOLOADED', true );
 } else {
-    sideLoad();
+    // Hermes Autoloader (Autoloader)
+    if ( ! defined( 'HERMES_AUTOLOADED' ) ) {
+        if ( defined( 'HERMES_ROOT_DIRECTORY' ) ) {
+            require_once HERMES_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
+        }
+    }
+    // Canary Autoloader (Debugging)
+    if ( ! defined( 'CANARY_AUTOLOADED' ) ) {
+        if ( defined( 'CANARY_ROOT_DIRECTORY' ) ) {
+            require_once CANARY_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
+        }
+    }
+    // Bedrock Autoloader (Core Functionality)
+    if ( ! defined( 'BEDROCK_AUTOLOADED' ) ) {
+        if ( defined( 'BEDROCK_ROOT_DIRECTORY' ) ) {
+            require_once BEDROCK_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
+        }
+    }
+    // Houdini Autoloader (Frontend Driver)
+    if ( ! defined( 'HOUDINI_AUTOLOADED' ) ) {
+        if ( defined( 'HOUDINI_ROOT_DIRECTORY' ) ) {
+            require_once HOUDINI_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
+        }
+    }
+    // App Autoloader
+    if ( file_exists( APP_DIRECTORY . 'autoload.php' ) ) {
+        require_once APP_DIRECTORY . 'autoload.php';
+    }
+    define( 'VENDOR_AUTOLOADED', false );
 }
 
 if ( class_exists( 'TheTempusProject\Hermes\Classes\Autoloader' ) && TEMPUS_PROJECT_CONSTANTS_LOADED ) {
@@ -105,7 +164,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;
@@ -116,60 +175,4 @@ function ttp_autoload() {
     define('TEMPUS_PROJECT_AUTOLOADED', true);
 }
 
-function sideLoad() {
-    // Hermes Constants
-    if ( ! defined( 'HERMES_CONSTANTS_LOADED' ) ) {
-        if ( defined( 'HERMES_CONFIG_DIRECTORY' ) ) {
-            require_once HERMES_CONFIG_DIRECTORY . 'constants.php';
-        }
-    }
-
-    // Bedrock Constants
-    if ( ! defined( 'BEDROCK_CONSTANTS_LOADED' ) ) {
-        if ( defined( 'BEDROCK_CONFIG_DIRECTORY' ) ) {
-            require_once BEDROCK_CONFIG_DIRECTORY . 'constants.php';
-        }
-    }
-
-    // Canary Constants
-    if ( ! defined( 'CANARY_CONSTANTS_LOADED' ) ) {
-        if ( defined( 'CANARY_CONFIG_DIRECTORY' ) ) {
-            require_once CANARY_CONFIG_DIRECTORY . 'constants.php';
-        }
-    }
-
-    // Require common functions
-    require_once FUNCTIONS_DIRECTORY . 'common.php';
-
-    // Hermes Autoloader (Autoloader)
-    if ( ! defined( 'HERMES_AUTOLOADED' ) ) {
-        if ( defined( 'HERMES_ROOT_DIRECTORY' ) ) {
-            require_once HERMES_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
-        }
-    }
-
-    // Canary Autoloader (Debugging)
-    if ( ! defined( 'CANARY_AUTOLOADED' ) ) {
-        if ( defined( 'CANARY_ROOT_DIRECTORY' ) ) {
-            require_once CANARY_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
-        }
-    }
-
-    // Bedrock Autoloader (Core Functionality)
-    if ( ! defined( 'BEDROCK_AUTOLOADED' ) ) {
-        if ( defined( 'BEDROCK_ROOT_DIRECTORY' ) ) {
-            require_once BEDROCK_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
-        }
-    }
-
-    // Houdini Autoloader (Frontend Driver)
-    if ( ! defined( 'HOUDINI_AUTOLOADED' ) ) {
-        if ( defined( 'HOUDINI_ROOT_DIRECTORY' ) ) {
-            require_once HOUDINI_ROOT_DIRECTORY . 'bin' . DIRECTORY_SEPARATOR . 'autoload.php';
-        }
-    }
-
-    define( 'VENDOR_AUTOLOADED', false );
-}
-
 require_once 'bin/tempus_project.php';

bin/tempus_project.php

@@ -13,13 +13,13 @@
  */
 namespace TheTempusProject;
 
-use TheTempusProject\Bedrock\Bin\Bedrock;
+use TheTempusProject\Bedrock\Bedrock;
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Input;
 use TheTempusProject\Bedrock\Functions\Session;
 use TheTempusProject\Bedrock\Functions\Cookie;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 
 use TheTempusProject\Hermes\Functions\Redirect;
 use TheTempusProject\Hermes\Functions\Route as Routes;

composer.json

@@ -21,23 +21,23 @@
     "require":
     {
         "fortawesome/font-awesome": "4.7",
-        "thetempusproject/bedrock": ">=1.0",
+        "thetempusproject/bedrock": "dev-main",
-        "thetempusproject/canary": ">=1.0",
+        "thetempusproject/canary": "dev-main",
-        "thetempusproject/houdini": ">=1.0",
+        "thetempusproject/houdini": "dev-main",
         "twbs/bootstrap": "3.3.7"
     },
     "autoload":
     {
-        "files":
-        [
-            "app/functions/forms.php",
-            "app/functions/common.php"
-        ],
         "classmap":
         [
             "app/classes",
+            "app/functions",
             "app/models"
         ],
+        "files":
+        [
+            "app/config/constants.php"
+        ],
         "psr-4":
         {
             "TheTempusProject\\Bedrock\\": "vendor/thetempusproject/bedrock",
@@ -45,13 +45,6 @@
             "TheTempusProject\\Houdini\\": "vendor/thetempusproject/houdini"
         }
     },
-    "scripts":
-    {
-        "post-root-package-install":
-        [
-            "@php -r \"file_exists('docker/.env') || copy('docker/.env.example', '.env');\""
-        ]
-    },
     "config":
     {
         "optimize-autoloader": true,

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "626435ee799589fce02b1a794a3d8347",
+    "content-hash": "8990675691531125da9ae6a4bef16a63",
     "packages": [
         {
             "name": "fortawesome/font-awesome",
@@ -60,11 +60,11 @@
         },
         {
             "name": "thetempusproject/bedrock",
-            "version": "1.0.5",
+            "version": "dev-main",
             "source": {
                 "type": "git",
                 "url": "https://git.thetempusproject.com/the-tempus-project/bedrock",
-                "reference": "79f21773c66a4b87e6a172cab3da23029c2441fd"
+                "reference": "c75fc2105955ffb3af56f68ca156f81e51f89488"
             },
             "require": {
                 "php": ">=8.1.0",
@@ -72,16 +72,17 @@
                 "thetempusproject/hermes": ">=1.0",
                 "thetempusproject/houdini": ">=1.0"
             },
+            "default-branch": true,
             "type": "library",
             "autoload": {
                 "files": [
-                    "Config/constants.php",
+                    "config/constants.php",
-                    "Bin/Bedrock.php"
+                    "bin/bedrock.php"
                 ],
-                "psr-4": {
+                "classmap": [
-                    "TheTempusProject\\Bedroock\\Classes\\": "Classes",
+                    "classes",
-                    "TheTempusProject\\Bedroock\\Functions\\": "Functions"
+                    "functions"
-                }
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -101,28 +102,29 @@
                 "framework",
                 "mvc"
             ],
-            "time": "2024-08-09T21:18:24+00:00"
+            "time": "2024-08-08T05:18:58+00:00"
         },
         {
             "name": "thetempusproject/canary",
-            "version": "1.0.3",
+            "version": "dev-main",
             "source": {
                 "type": "git",
                 "url": "https://git.thetempusproject.com/the-tempus-project/canary",
-                "reference": "289f35cf6b0bcacc4eaba056a11906426c6068fa"
+                "reference": "be5589533f8c1d0b1c28bac8829333f0077c698d"
             },
             "require": {
                 "php": ">=8.1.0"
             },
+            "default-branch": true,
             "type": "library",
             "autoload": {
                 "files": [
-                    "Config/constants.php",
+                    "config/constants.php",
-                    "Bin/Canary.php"
+                    "bin/canary.php"
                 ],
-                "psr-4": {
+                "classmap": [
-                    "TheTempusProject\\Canary\\Classes\\": "Classes"
+                    "classes"
-                }
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -144,19 +146,20 @@
                 "thetempusproject",
                 "tools"
             ],
-            "time": "2024-08-09T21:13:37+00:00"
+            "time": "2024-08-08T05:18:19+00:00"
         },
         {
             "name": "thetempusproject/hermes",
-            "version": "1.0",
+            "version": "dev-main",
             "source": {
                 "type": "git",
                 "url": "https://git.thetempusproject.com/the-tempus-project/hermes",
-                "reference": "9d6a79d80be98d0e598ce08c47a98d37814d1105"
+                "reference": "e38f8debefb7097b15cb479184dc869e3e3111c0"
             },
             "require": {
                 "php": ">=8.1.0"
             },
+            "default-branch": true,
             "type": "library",
             "autoload": {
                 "files": [
@@ -191,17 +194,18 @@
         },
         {
             "name": "thetempusproject/houdini",
-            "version": "1.0.5",
+            "version": "dev-main",
             "source": {
                 "type": "git",
                 "url": "https://git.thetempusproject.com/the-tempus-project/houdini",
-                "reference": "cbaba96d5ee2a3038b8c8b3e34c4b834de03b8f5"
+                "reference": "b2d044da64ca1869432dc12b9c98fdb60379ffd9"
             },
             "require": {
                 "php": ">=8.1.0",
                 "thetempusproject/canary": ">=1.0",
                 "thetempusproject/hermes": ">=1.0"
             },
+            "default-branch": true,
             "type": "library",
             "autoload": {
                 "files": [
@@ -231,7 +235,7 @@
                 "thetempusproject",
                 "tools"
             ],
-            "time": "2024-08-09T21:16:21+00:00"
+            "time": "2024-08-08T05:17:27+00:00"
         },
         {
             "name": "twbs/bootstrap",
@@ -292,7 +296,11 @@
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "dev",
-    "stability-flags": [],
+    "stability-flags": {
+        "thetempusproject/bedrock": 20,
+        "thetempusproject/canary": 20,
+        "thetempusproject/houdini": 20
+    },
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": [],

index.php

@@ -16,7 +16,7 @@ session_start();
 
 require_once 'bin/autoload.php';
 
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Input;
 use TheTempusProject\Hermes\Functions\Redirect;
 use TheTempusProject\Hermes\Functions\Route;

install.php

@@ -34,7 +34,7 @@ use TheTempusProject\Houdini\Classes\Components;
 use TheTempusProject\Houdini\Classes\Template;
 use TheTempusProject\Hermes\Functions\Redirect;
 use TheTempusProject\Hermes\Functions\Route;
-use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Canary\Canary as Debug;
 
 class Install extends Controller {
     private $installer;