X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=Civi.php;h=fe16326de75dec4adc5e30a6069cdb2cd449e869;hb=6ebffd05169b6953ed8722ee68bb0f40b3e8a610;hp=d4fe840ce686748d75395e73409542f7051c8a47;hpb=7b5937feec104d6843290f2c4822799b7c3d9fe2;p=civicrm-core.git

diff --git a/Civi.php b/Civi.php
index d4fe840ce6..fe16326de7 100644
--- a/Civi.php
+++ b/Civi.php
@@ -54,6 +54,29 @@ class Civi {
     return Civi\Core\Container::singleton();
   }
 
+  /**
+   * @return \Civi\Core\Lock\LockManager
+   */
+  public static function lockManager() {
+    return \Civi\Core\Container::getBootService('lockManager');
+  }
+
+  /**
+   * @return \Psr\Log\LoggerInterface
+   */
+  public static function log() {
+    return Civi\Core\Container::singleton()->get('psr_log');
+  }
+
+  /**
+   * Obtain the core file/path mapper.
+   *
+   * @return \Civi\Core\Paths
+   */
+  public static function paths() {
+    return \Civi\Core\Container::getBootService('paths');
+  }
+
   /**
    * Fetch a service from the container.
    *
@@ -70,8 +93,26 @@ class Civi {
    * singletons, containers.
    */
   public static function reset() {
-    Civi\Core\Container::singleton(TRUE);
     self::$statics = array();
+    Civi\Core\Container::singleton();
+  }
+
+  /**
+   * @return CRM_Core_Resources
+   */
+  public static function resources() {
+    return CRM_Core_Resources::singleton();
+  }
+
+  /**
+   * Obtain the domain settings.
+   *
+   * @param int|null $domainID
+   *   For the default domain, leave $domainID as NULL.
+   * @return \Civi\Core\SettingsBag
+   */
+  public static function settings($domainID = NULL) {
+    return \Civi\Core\Container::getBootService('settings_manager')->getBagByDomain($domainID);
   }
 
 }