bugfix + composer version bumps

Bin/Bedrock.php

@@ -46,8 +46,8 @@ class Bedrock {
         Debug::group( 'Bedrock Application' );
         ob_start();
         self::$activeConfig = new Config( CONFIG_JSON );
-        set_error_handler( [ 'TheTempusProject\\Canary\\Canary', 'handle_error' ] );
-        set_exception_handler( [ 'TheTempusProject\\Canary\\Canary', 'handle_exception' ] );
+        set_error_handler( [ BEDROCK_DEFAULT_ERROR_HANDLER, 'handle_error' ] );
+        set_exception_handler( [ BEDROCK_DEFAULT_EXCEPTION_HANDLER, 'handle_exception' ] );
         self::$controllerName = DEFAULT_CONTROLLER_CLASS;
         self::$methodName = DEFAULT_CONTROLLER_METHOD;
         $this->setUrl( $url );

Classes/Pagination.php

@@ -9,7 +9,7 @@
  * @link    https://TheTempusProject.com/Core
  * @license https://opensource.org/licenses/MIT [MIT LICENSE]
  */
-namespace TheTempusProject\Houdini\Classes;
+namespace TheTempusProject\Bedrock\Classes;
 
 use TheTempusProject\Houdini\Classes\Template;
 use TheTempusProject\Hermes\Functions\Route as Routes;

Config/constants.php

@@ -47,24 +47,30 @@
 	}
 // Debug
     // Log Levels
-    if ( ! defined('CANARY_DEBUG_LEVEL_ERROR' ) ) {
-        define( 'CANARY_DEBUG_LEVEL_ERROR', 'error' );
-    }
-    if ( ! defined('CANARY_DEBUG_LEVEL_WARN' ) ) {
-        define( 'CANARY_DEBUG_LEVEL_WARN', 'warn' );
-    }
-    if ( ! defined('CANARY_DEBUG_LEVEL_INFO' ) ) {
-        define( 'CANARY_DEBUG_LEVEL_INFO', 'info' );
-    }
-    if ( ! defined('CANARY_DEBUG_LEVEL_LOG' ) ) {
-        define( 'CANARY_DEBUG_LEVEL_LOG', 'log' );
-    }
-    if ( ! defined('CANARY_DEBUG_LEVEL_DEBUG' ) ) {
-        define( 'CANARY_DEBUG_LEVEL_DEBUG', 'debug' );
-    }
+	    if ( ! defined('CANARY_DEBUG_LEVEL_ERROR' ) ) {
+	        define( 'CANARY_DEBUG_LEVEL_ERROR', 'error' );
+	    }
+	    if ( ! defined('CANARY_DEBUG_LEVEL_WARN' ) ) {
+	        define( 'CANARY_DEBUG_LEVEL_WARN', 'warn' );
+	    }
+	    if ( ! defined('CANARY_DEBUG_LEVEL_INFO' ) ) {
+	        define( 'CANARY_DEBUG_LEVEL_INFO', 'info' );
+	    }
+	    if ( ! defined('CANARY_DEBUG_LEVEL_LOG' ) ) {
+	        define( 'CANARY_DEBUG_LEVEL_LOG', 'log' );
+	    }
+	    if ( ! defined('CANARY_DEBUG_LEVEL_DEBUG' ) ) {
+	        define( 'CANARY_DEBUG_LEVEL_DEBUG', 'debug' );
+	    }
 	if (!defined('CANARY_ENABLED')) {
 		define('CANARY_ENABLED', false);
 	}
+	if (!defined('BEDROCK_DEFAULT_ERROR_HANDLER')) {
+		define('BEDROCK_DEFAULT_ERROR_HANDLER', 'TheTempusProject\\Canary\\Bin\\Canary');
+	}
+	if (!defined('BEDROCK_DEFAULT_EXCEPTION_HANDLER')) {
+		define('BEDROCK_DEFAULT_EXCEPTION_HANDLER', 'TheTempusProject\\Canary\\Bin\\Canary');
+	}
 	if (!defined('DEBUG_EMAIL')) {
 		define('DEBUG_EMAIL', 'webmaster@' . $_SERVER['HTTP_HOST']);
 	}
@@ -114,40 +120,6 @@
 	if (!defined('BEDROCK_CONFIG_JSON')) {
 		define('BEDROCK_CONFIG_JSON', BEDROCK_CONFIG_DIRECTORY . 'config.json');
 	}
-// Shared Directories
-	if (!defined('APP_ROOT_DIRECTORY')) {
-		define('APP_ROOT_DIRECTORY', BEDROCK_ROOT_DIRECTORY);
-	}
-	if (!defined('CONFIG_DIRECTORY')) {
-		define('CONFIG_DIRECTORY', BEDROCK_CONFIG_DIRECTORY);
-	}
-	if (!defined('BIN_DIRECTORY')) {
-		define('BIN_DIRECTORY', BEDROCK_BIN_DIRECTORY);
-	}
-	if (!defined('VIEW_DIRECTORY')) {
-		define('VIEW_DIRECTORY', BEDROCK_VIEW_DIRECTORY);
-	}
-	if (!defined('ERRORS_DIRECTORY')) {
-		define('ERRORS_DIRECTORY', BEDROCK_ERRORS_DIRECTORY);
-	}
-	if (!defined('CLASSES_DIRECTORY')) {
-		define('CLASSES_DIRECTORY', BEDROCK_CLASSES_DIRECTORY);
-	}
-	if (!defined('FUNCTIONS_DIRECTORY')) {
-		define('FUNCTIONS_DIRECTORY', BEDROCK_FUNCTIONS_DIRECTORY);
-	}
-	if (!defined('RESOURCES_DIRECTORY')) {
-		define('RESOURCES_DIRECTORY', BEDROCK_RESOURCES_DIRECTORY);
-	}
-	if (!defined('TEMPLATE_DIRECTORY')) {
-		define('TEMPLATE_DIRECTORY', BEDROCK_ROOT_DIRECTORY . 'templates' . DIRECTORY_SEPARATOR);
-	}
-	if (!defined('UPLOAD_DIRECTORY')) {
-		define('UPLOAD_DIRECTORY', BEDROCK_ROOT_DIRECTORY . 'uploads' . DIRECTORY_SEPARATOR);
-	}
-	if (!defined('IMAGE_UPLOAD_DIRECTORY')) {
-		define('IMAGE_UPLOAD_DIRECTORY', BEDROCK_ROOT_DIRECTORY . 'images' . DIRECTORY_SEPARATOR);
-	}
 // Files
 	if (!defined('COMPOSER_JSON_LOCATION')) {
 		define('COMPOSER_JSON_LOCATION', APP_ROOT_DIRECTORY . 'composer.json');

composer.lock

@@ -12,7 +12,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.thetempusproject.com/the-tempus-project/canary",
-                "reference": "7746eb4af73f3eaba040d547904a251bbdab6977"
+                "reference": "8dff31b4eefa3efeb9f81d2e6b6ef3e9f8c9f27b"
             },
             "require": {
                 "php": ">=8.1.0"
@@ -48,7 +48,7 @@
                 "thetempusproject",
                 "tools"
             ],
-            "time": "2024-08-09T04:35:45+00:00"
+            "time": "2024-08-09T06:18:45+00:00"
         },
         {
             "name": "thetempusproject/hermes",
@@ -100,7 +100,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.thetempusproject.com/the-tempus-project/houdini",
-                "reference": "3de98733ac32c0a6e1a3230cbccfa33263e399be"
+                "reference": "34babdb2dc508450d14a0764bf81b032a6861a58"
             },
             "require": {
                 "php": ">=8.1.0",
@@ -137,7 +137,7 @@
                 "thetempusproject",
                 "tools"
             ],
-            "time": "2024-08-09T04:56:06+00:00"
+            "time": "2024-08-09T06:20:26+00:00"
         }
     ],
     "packages-dev": [],