CRM_Core_Session - Add option 'useFakeSession()' for stateless requests

diff --git a/CRM/Core/Session.php b/CRM/Core/Session.php
index 7ca6a46ead2587973f289598fc769743869e9f17..698b25eb9ddf22b8b0560e35b9657a17f0c4fbaf 100644 (file)
--- a/CRM/Core/Session.php
+++ b/CRM/Core/Session.php
@@ -86,6 +86,39 @@ class CRM_Core_Session {
     return self::$_singleton;
   }
 
+  /**
+   * Replace the session object with a fake session.
+   */
+  public static function useFakeSession() {
+    self::$_singleton = new class() extends CRM_Core_Session {
+
+      public function initialize($isRead = FALSE) {
+        if ($isRead) {
+          return;
+        }
+
+        if (!isset($this->_session)) {
+          $this->_session = [];
+        }
+
+        if (!isset($this->_session[$this->_key]) || !is_array($this->_session[$this->_key])) {
+          $this->_session[$this->_key] = [];
+        }
+      }
+
+      public function isEmpty() {
+        return empty($this->_session);
+      }
+
+    };
+    self::$_singleton->_session = NULL;
+    // This is not a revocable proposition. Should survive, even with things 'System.flush'.
+    if (!defined('_CIVICRM_FAKE_SESSION')) {
+      define('_CIVICRM_FAKE_SESSION', TRUE);
+    }
+    return self::$_singleton;
+  }
+
   /**
    * Creates an array in the session.
    *

diff --git a/CRM/Utils/System/Drupal.php b/CRM/Utils/System/Drupal.php
index fea28fb6a4f4c469d92541dc22399f9149f12f31..34742a094fd21ef9ae555037df0020a6942b7b48 100644 (file)
--- a/CRM/Utils/System/Drupal.php
+++ b/CRM/Utils/System/Drupal.php
@@ -850,7 +850,9 @@ AND    u.status = 1
       if (!defined('MAINTENANCE_MODE') || MAINTENANCE_MODE != 'update') {
         module_invoke_all('exit');
       }
-      drupal_session_commit();
+      if (!defined('_CIVICRM_FAKE_SESSION')) {
+        drupal_session_commit();
+      }
     }
   }