Merge remote-tracking branch 'origin/update_PHP_deps_20240813063608'

app/plugins/bookmarks/models/bookmarkViews.php

@@ -20,7 +20,7 @@ use TheTempusProject\TheTempusProject as App;
 use TheTempusProject\Houdini\Classes\Filters;
 use TheTempusProject\Bedrock\Classes\CustomException;
 
-class BookmarkViews extends DatabaseModel {
+class Bookmarkviews extends DatabaseModel {
     public $tableName = 'bookmark_views';
     public $databaseMatrix = [
         [ 'title', 'varchar', '256' ],

composer.lock

@@ -60,11 +60,11 @@
         },
         {
             "name": "thetempusproject/bedrock",
-            "version": "1.0.6",
+            "version": "1.0.8",
             "source": {
                 "type": "git",
                 "url": "https://git.thetempusproject.com/the-tempus-project/bedrock",
-                "reference": "7228e530b87a124d83fb46985829fd7308bb6173"
+                "reference": "ef4818356ce4cb5c4ceaf09e013f5acd606b7e0a"
             },
             "require": {
                 "php": ">=8.1.0",
@@ -101,7 +101,7 @@
                 "framework",
                 "mvc"
             ],
-            "time": "2024-08-13T05:16:12+00:00"
+            "time": "2024-08-13T06:35:11+00:00"
         },
         {
             "name": "thetempusproject/canary",

install.php

@@ -99,18 +99,26 @@ class Install extends Controller {
             Debug::error( 'install hash not found on file.' );
             return false;
         }
-        if ( ! Session::exists( 'installHash' ) && ! Cookie::exists( 'installHash' ) ) {
+        $session = Session::get( 'installHash' );
+        $cookie = Cookie::get( 'installHash' );
+        $file = $this->installer->getNode('installHash');
+
+        if ( ! $session && ! $cookie ) {
             Debug::error( 'install hash not found in session or cookie.' );
             return false;
         }
-        if ( Cookie::exists( 'installHash' ) && !Session::exists( 'installHash' ) ) {
-            if ( Cookie::get( 'installHash' ) !== $this->installer->getNode('installHash') ) {
+        if ( $cookie && ! $session ) {
+            if ( $cookie !== $file ) {
+                Debug::error( 'install cookie did not match install file.' );
                 Cookie::delete( 'installHash' );
                 return false;
             }
-            Session::put( 'installHash', Cookie::get( 'installHash' ) );
+            Debug::error( 'cookie matches file, using as session' );
+            Session::put( 'installHash', $cookie );
+            return true;
         }
-        if ( Session::get( 'installHash' ) !== $this->installer->getNode('installHash') ) {
+        if ( $session !== $file ) {
+            Debug::error( 'session did not match file, deleting session' );
             Session::delete( 'installHash' );
             return false;
         }