From 6cf4594622532f2279675244a6f8eda148b7eea8 Mon Sep 17 00:00:00 2001
From: Joey Kimsey <joey@blackairplane.com>
Date: Fri, 9 Aug 2024 01:25:21 -0400
Subject: [PATCH] composer updates

---
 app/config/constants.php |  12 ++--
 bin/autoload.php         | 140 ++++++++++++++++++++-------------------
 composer.json            |   8 +--
 3 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/app/config/constants.php b/app/config/constants.php
index 3539144..7cedba2 100644
--- a/app/config/constants.php
+++ b/app/config/constants.php
@@ -1,19 +1,15 @@
 <?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
 }
-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 );
+// 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( '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 );
@@ -59,7 +55,9 @@ if ( ! defined( 'CONFIG_DIRECTORY' ) ) {
 		define( 'CANARY_DEBUG_TO_CONSOLE', false );
 		define( 'CANARY_DEBUG_TO_FILE', true );
 	// Directories
-		define( 'VENDOR_DIRECTORY',               APP_ROOT_DIRECTORY  . 'vendor'            . DIRECTORY_SEPARATOR );
+		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' )) {
diff --git a/bin/autoload.php b/bin/autoload.php
index 200bbf5..ba1beec 100644
--- a/bin/autoload.php
+++ b/bin/autoload.php
@@ -16,45 +16,8 @@ use TheTempusProject\Hermes\Classes\Autoloader;
 use TheTempusProject\Houdini\Classes\Template;
 use TheTempusProject\Houdini\Classes\Views;
 
-// Basic constants needed for loading files
-if ( ! defined( 'APP_SPACE' ) ) {
-    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';
+define( 'APP_ROOT_DIRECTORY', dirname( __DIR__ ) . DIRECTORY_SEPARATOR );
+define( 'VENDOR_DIRECTORY', APP_ROOT_DIRECTORY  . 'vendor' . DIRECTORY_SEPARATOR );
 
 // Determine which autoloader to sue
 if ( file_exists( VENDOR_DIRECTORY . 'autoload.php' ) ) {
@@ -62,35 +25,7 @@ if ( file_exists( VENDOR_DIRECTORY . 'autoload.php' ) ) {
     require_once VENDOR_DIRECTORY . 'autoload.php';
     define( 'VENDOR_AUTOLOADED', true );
 } else {
-    // 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 );
+    sideLoad();
 }
 
 if ( class_exists( 'TheTempusProject\Hermes\Classes\Autoloader' ) && TEMPUS_PROJECT_CONSTANTS_LOADED ) {
@@ -176,3 +111,72 @@ function ttp_autoload() {
 }
 
 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' ) ) {
+            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 );
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index af997a5..ee41d93 100644
--- a/composer.json
+++ b/composer.json
@@ -28,16 +28,16 @@
     },
     "autoload":
     {
+        "files":
+        [
+            "app/config/constants.php"
+        ],
         "classmap":
         [
             "app/classes",
             "app/functions",
             "app/models"
         ],
-        "files":
-        [
-            "app/config/constants.php"
-        ],
         "psr-4":
         {
             "TheTempusProject\\Bedrock\\": "vendor/thetempusproject/bedrock",