session bugfixes

.gitlab-ci.yml

@@ -0,0 +1,49 @@
+stages:
+  - update
+
+variables:
+  TIMEZONE: "America/New_York" # For the system in general
+  DATE_TIMEZONE: ${TIMEZONE} # For PHP
+
+  GIT_DEPTH: 1
+  GITLAB_API_URL: ${CI_API_V4_URL}
+  TARGET_BRANCH: ${CI_COMMIT_REF_NAME} # This is the branch chosen in the `Pipeline Schedule`
+  TARGET_REMOTE: "https://${GITLAB_USERNAME}:${GITLAB_ACCESS_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}.git"
+
+  # These could/should be overridden in an extending job:
+  UPDATE_BRANCH_PREFIX: "update_PHP_deps_" # Used for the update branch name, it will be followed by the datetime
+  GIT_USER: "DependBot" # Used for the update commit
+  GIT_EMAIL: "webmaster@thetempusproject.com" # Used for the update commit
+  GITLAB_USERNAME: "root" # Used for pushing the new branch and opening the MR
+  GITLAB_ACCESS_TOKEN: "glpat-PKEmivGtBfbz4DVPdhzk" # Used for pushing the new branch and opening the MR
+  MERGE_IF_SUCCESSFUL: "true" # Set to true, to merge automatically if the pipeline succeeds
+  SECONDS_BETWEEN_POOLING: 10 # Nbr of seconds between checking if the MR pipeline is successful, so then it will merge
+  JOB_GIT_FLAGS: ""
+  JOB_CURL_FLAGS: ""
+  JOB_COMPOSER_FLAGS: ""
+
+composer_update:
+  stage: update
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main"'
+  image: composer:latest
+  interruptible: true # allows to stop the job if a newer pipeline starts, saving resources and allowing new jobs to start because job concurrency is limited
+  script:
+    - git ${JOB_GIT_FLAGS} fetch origin ${TARGET_BRANCH}
+    - git ${JOB_GIT_FLAGS} checkout ${TARGET_BRANCH}
+    - git reset --hard origin/main
+    - export DATE_TIME="$(date '+%Y%m%d%H%M%S')"
+    - export MR_BRANCH="${UPDATE_BRANCH_PREFIX}${DATE_TIME}"
+    - git ${JOB_GIT_FLAGS} checkout -b "${MR_BRANCH}"
+    - composer update ${JOB_COMPOSER_FLAGS}
+    - if [ "$(git diff)" == "" ]; then echo "No updates needed!"; exit 0; fi
+    - export TITLE="Update PHP dependencies [${DATE_TIME}]"
+    - git ${JOB_GIT_FLAGS} commit -a -m "${TITLE}"
+    - git ${JOB_GIT_FLAGS} push "${TARGET_REMOTE}" "${MR_BRANCH}"
+  artifacts:
+    paths:
+      - vendor/
+  cache:
+    key: ${CI_COMMIT_REF_SLUG}
+    paths:
+      - vendor/

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_error_handler( [ BEDROCK_DEFAULT_ERROR_HANDLER, 'handle_error' ] );
-        set_exception_handler( [ 'TheTempusProject\\Canary\\Canary', 'handle_exception' ] );
+        set_exception_handler( [ BEDROCK_DEFAULT_EXCEPTION_HANDLER, 'handle_exception' ] );
         self::$controllerName = DEFAULT_CONTROLLER_CLASS;
         self::$methodName = DEFAULT_CONTROLLER_METHOD;
         $this->setUrl( $url );

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;
 

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;
 

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;

Classes/Database.php

@@ -15,8 +15,7 @@ namespace TheTempusProject\Bedrock\Classes;
 
 use PDO;
 use PDOException;
-use TheTempusProject\Houdini\Classes\Pagination;
+use TheTempusProject\Canary\Bin\Canary as Debug;
-use TheTempusProject\Canary\Canary as Debug;
 
 class Database {
     public static $instance = null;

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;
 

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;
 

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

Config/constants.php

@@ -65,6 +65,12 @@
 	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');

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;

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 {
     /**

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 {
     /**

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 {
     /**

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 {
     /**

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 {
     /**
@@ -21,6 +21,9 @@ class Session {
      * @return {bool}
      */
     public static function exists( $name ) {
+        if (session_status() === PHP_SESSION_NONE) {
+            session_start();
+        }
         if ( ! Check::sessionName( $name ) ) {
             return false;
         }
@@ -42,11 +45,11 @@ class Session {
         if ( ! Check::sessionName( $name ) ) {
             return false;
         }
-        if ( self::exists( $name ) ) {
         $sessionName = DEFAULT_SESSION_PREFIX . $name;
+        if ( self::exists( $name ) ) {
             return $_SESSION[ $sessionName ];
         }
-        Debug::info("Session::get - Session not found: $name");
+        Debug::info( "Session::get - Session not found: $sessionName" );
         return false;
     }
 
@@ -58,12 +61,15 @@ class Session {
      * @return {bool}
      */
     public static function put( $name, $data ) {
+        if (session_status() === PHP_SESSION_NONE) {
+            session_start();
+        }
         if ( ! Check::sessionName( $name ) ) {
             return false;
         }
         $sessionName = DEFAULT_SESSION_PREFIX . $name;
         $_SESSION[ $sessionName ] = $data;
-        Debug::info("Session: Created: $sessionName");
+        Debug::info( "Session::get - Created/Updated: $sessionName" );
         return true;
     }
 
@@ -77,10 +83,10 @@ class Session {
         if ( ! Check::sessionName( $name ) ) {
             return false;
         }
-        if ( self::exists( $name ) ) {
         $sessionName = DEFAULT_SESSION_PREFIX . $name;
+        if ( self::exists( $name ) ) {
             unset( $_SESSION[$sessionName] );
-            Debug::info("Session::deleted: $sessionName");
+            Debug::info( "Session::delete - Deleted $sessionName" );
             return true;
         }
         Debug::error( "Session::delete - Session not found." );

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;

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;

composer.lock

@@ -12,7 +12,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.thetempusproject.com/the-tempus-project/canary",
-                "reference": "7746eb4af73f3eaba040d547904a251bbdab6977"
+                "reference": "7ce988fbd95c0d9b975e7647f2e4d7ee3d5e3aad"
             },
             "require": {
                 "php": ">=8.1.0"
@@ -48,7 +48,7 @@
                 "thetempusproject",
                 "tools"
             ],
-            "time": "2024-08-09T04:35:45+00:00"
+            "time": "2024-08-10T18:58:57+00:00"
         },
         {
             "name": "thetempusproject/hermes",
@@ -56,7 +56,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.thetempusproject.com/the-tempus-project/hermes",
-                "reference": "9d6a79d80be98d0e598ce08c47a98d37814d1105"
+                "reference": "171183c0abdbbdf12b3b577821636dd1c51ec752"
             },
             "require": {
                 "php": ">=8.1.0"
@@ -92,7 +92,7 @@
                 "thetempusproject",
                 "tools"
             ],
-            "time": "2024-08-08T05:24:32+00:00"
+            "time": "2024-08-13T02:56:27+00:00"
         },
         {
             "name": "thetempusproject/houdini",
@@ -100,7 +100,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.thetempusproject.com/the-tempus-project/houdini",
-                "reference": "008d7d90230f9eee87d8dbe982e55fae433e1337"
+                "reference": "4d2ccfb1c5f18dba9886405e7e6e2264e04e1f89"
             },
             "require": {
                 "php": ">=8.1.0",
@@ -137,7 +137,7 @@
                 "thetempusproject",
                 "tools"
             ],
-            "time": "2024-08-09T04:38:04+00:00"
+            "time": "2024-08-13T03:43:46+00:00"
         }
     ],
     "packages-dev": [],
@@ -150,5 +150,5 @@
         "php": ">=8.1.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }