projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #7792 from seamuslee001/CRM-18021
[civicrm-core.git]
/
Civi.php
diff --git
a/Civi.php
b/Civi.php
index 01e1fbbc4d773db0639c0ea61cd20770d09e91df..fe16326de75dec4adc5e30a6069cdb2cd449e869 100644
(file)
--- a/
Civi.php
+++ b/
Civi.php
@@
-54,6
+54,13
@@
class Civi {
return Civi\Core\Container::singleton();
}
return Civi\Core\Container::singleton();
}
+ /**
+ * @return \Civi\Core\Lock\LockManager
+ */
+ public static function lockManager() {
+ return \Civi\Core\Container::getBootService('lockManager');
+ }
+
/**
* @return \Psr\Log\LoggerInterface
*/
/**
* @return \Psr\Log\LoggerInterface
*/
@@
-67,11
+74,7
@@
class Civi {
* @return \Civi\Core\Paths
*/
public static function paths() {
* @return \Civi\Core\Paths
*/
public static function paths() {
- // Paths must be available before container can boot.
- if (!isset(Civi::$statics[__CLASS__]['paths'])) {
- Civi::$statics[__CLASS__]['paths'] = new \Civi\Core\Paths();
- }
- return Civi::$statics[__CLASS__]['paths'];
+ return \Civi\Core\Container::getBootService('paths');
}
/**
}
/**
@@
-90,8
+93,8
@@
class Civi {
* singletons, containers.
*/
public static function reset() {
* singletons, containers.
*/
public static function reset() {
- Civi\Core\Container::singleton(TRUE);
self::$statics = array();
self::$statics = array();
+ Civi\Core\Container::singleton();
}
/**
}
/**
@@
-109,7
+112,7
@@
class Civi {
* @return \Civi\Core\SettingsBag
*/
public static function settings($domainID = NULL) {
* @return \Civi\Core\SettingsBag
*/
public static function settings($domainID = NULL) {
- return
Civi\Core\Container::singleton()->get
('settings_manager')->getBagByDomain($domainID);
+ return
\Civi\Core\Container::getBootService
('settings_manager')->getBagByDomain($domainID);
}
}
}
}