canary and houdini updates

bugfix + composer version bumps
remove dumb constants
2024-08-09 17:18:24 -04:00 · 2024-08-09 02:22:58 -04:00 · 2024-08-09 02:04:04 -04:00 · 2024-08-09 01:35:47 -04:00 · 2024-08-09 01:00:02 -04:00 · 2024-08-09 00:39:54 -04:00
18 changed files with 50 additions and 78 deletions
--- a/Bin/Bedrock.php
+++ b/Bin/Bedrock.php
@ -14,7 +14,7 @@
 */
 namespace TheTempusProject\Bedrock\Bin;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Hermes\Functions\Route as Routes;
 use TheTempusProject\Bedrock\Functions\Input;
 use TheTempusProject\Bedrock\Functions\Check;
@ -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 );
--- a/Classes/Config.php
+++ b/Classes/Config.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Bedrock\Classes;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Functions\Input;

--- a/Classes/Controller.php
+++ b/Classes/Controller.php
@ -14,7 +14,7 @@
 */
 namespace TheTempusProject\Bedrock\Classes;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Session;
 use TheTempusProject\Houdini\Classes\Issues;

--- a/Classes/CustomException.php
+++ b/Classes/CustomException.php
@ -16,7 +16,7 @@ namespace TheTempusProject\Bedrock\Classes;

 use Exception;
 use TheTempusProject\Hermes\Functions\Redirect;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class CustomException extends Exception {
    private $originFunction = null;
--- a/Classes/Database.php
+++ b/Classes/Database.php
@ -16,7 +16,7 @@ namespace TheTempusProject\Bedrock\Classes;
 use PDO;
 use PDOException;
 use TheTempusProject\Houdini\Classes\Pagination;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class Database {
    public static $instance = null;
--- a/Classes/DatabaseModel.php
+++ b/Classes/DatabaseModel.php
@ -12,7 +12,7 @@
 */
 namespace TheTempusProject\Bedrock\Classes;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Functions\Check;
 use TheTempusProject\Bedrock\Bedrock;

--- a/Classes/Model.php
+++ b/Classes/Model.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Bedrock\Classes;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Classes\Database;

--- a/Classes/Pagination.php
+++ b/Classes/Pagination.php
@ -9,14 +9,14 @@
 * @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;
 use TheTempusProject\Bedrock\Functions\Input;
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Bedrock\Functions\Check;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class Pagination extends Template {
    //The settings that will not change
--- a/Config/constants.php
+++ b/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');
--- a/Functions/Check.php
+++ b/Functions/Check.php
@ -12,7 +12,7 @@
 namespace TheTempusProject\Bedrock\Functions;

 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class Check {
    private static $formValidator = null;
--- a/Functions/Code.php
+++ b/Functions/Code.php
@ -13,7 +13,7 @@
 */
 namespace TheTempusProject\Bedrock\Functions;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class Code {
    /**
--- a/Functions/Cookie.php
+++ b/Functions/Cookie.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Bedrock\Functions;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class Cookie {
    /**
--- a/Functions/Hash.php
+++ b/Functions/Hash.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Bedrock\Functions;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class Hash {
    /**
--- a/Functions/Input.php
+++ b/Functions/Input.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Bedrock\Functions;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class Input {
    /**
--- a/Functions/Session.php
+++ b/Functions/Session.php
@ -11,7 +11,7 @@
 */
 namespace TheTempusProject\Bedrock\Functions;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class Session {
    /**
--- a/Functions/Token.php
+++ b/Functions/Token.php
@ -12,7 +12,7 @@
 namespace TheTempusProject\Bedrock\Functions;

 use TheTempusProject\Bedrock\Classes\Config;
-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class Token {
    private static $tokenName;
--- a/Functions/Upload.php
+++ b/Functions/Upload.php
@ -13,7 +13,7 @@
 */
 namespace TheTempusProject\Bedrock\Functions;

-use TheTempusProject\Canary\Canary as Debug;
+use TheTempusProject\Canary\Bin\Canary as Debug;

 class Upload {
    public static $lastUpload = null;
--- a/composer.lock
+++ b/composer.lock
@ -12,7 +12,7 @@
            "source": {
                "type": "git",
                "url": "https://git.thetempusproject.com/the-tempus-project/canary",
-                "reference": "be5589533f8c1d0b1c28bac8829333f0077c698d"
+                "reference": "289f35cf6b0bcacc4eaba056a11906426c6068fa"
            },
            "require": {
                "php": ">=8.1.0"
@ -21,12 +21,12 @@
            "type": "library",
            "autoload": {
                "files": [
-                    "config/constants.php",
-                    "bin/canary.php"
+                    "Config/constants.php",
+                    "Bin/Canary.php"
                ],
-                "classmap": [
-                    "classes"
-                ]
+                "psr-4": {
+                    "TheTempusProject\\Canary\\Classes\\": "Classes"
+                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@ -48,7 +48,7 @@
                "thetempusproject",
                "tools"
            ],
-            "time": "2024-08-08T05:18:19+00:00"
+            "time": "2024-08-09T21:13:37+00:00"
        },
        {
            "name": "thetempusproject/hermes",
@ -56,7 +56,7 @@
            "source": {
                "type": "git",
                "url": "https://git.thetempusproject.com/the-tempus-project/hermes",
-                "reference": "e38f8debefb7097b15cb479184dc869e3e3111c0"
+                "reference": "9d6a79d80be98d0e598ce08c47a98d37814d1105"
            },
            "require": {
                "php": ">=8.1.0"
@ -100,7 +100,7 @@
            "source": {
                "type": "git",
                "url": "https://git.thetempusproject.com/the-tempus-project/houdini",
-                "reference": "b2d044da64ca1869432dc12b9c98fdb60379ffd9"
+                "reference": "cbaba96d5ee2a3038b8c8b3e34c4b834de03b8f5"
            },
            "require": {
                "php": ">=8.1.0",
@ -137,7 +137,7 @@
                "thetempusproject",
                "tools"
            ],
-            "time": "2024-08-08T05:17:27+00:00"
+            "time": "2024-08-09T21:16:21+00:00"
        }
    ],
    "packages-dev": [],
Author	SHA1	Message	Date
Joey Kimsey	79f21773c6	canary and houdini updates	2024-08-09 17:18:24 -04:00
Joey Kimsey	d9f0e86ce1	bugfix + composer version bumps	2024-08-09 02:22:58 -04:00
Joey Kimsey	5b823f02f1	remove dumb constants	2024-08-09 02:04:04 -04:00
Joey Kimsey	f80f7bed6b	more fixes for composer use	2024-08-09 01:35:47 -04:00
Joey Kimsey	e3cf6beebb	code fixes to support composer	2024-08-09 01:00:02 -04:00
Joey Kimsey	570a286c13	composer updates	2024-08-09 00:39:54 -04:00