php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-25 11:10:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added yii\base\Application::loadedModules

Browse Source
This commit is contained in:
Qiang Xue
2014-09-30 21:36:29 -04:00
parent 76ade0f6b0
commit 858ceb5039
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@@ -7,6 +7,7 @@ Yii Framework 2 Change Log
- Bug #5260: `yii\i18n\Formatter::decimalSeparator` and `yii\i18n\Formatter::thousandSeparator` where not configurable when intl is not installed (execut, cebe) - Bug #5260: `yii\i18n\Formatter::decimalSeparator` and `yii\i18n\Formatter::thousandSeparator` where not configurable when intl is not installed (execut, cebe)
- Bug: Date and time formatting now assumes UTC as the timezone for input dates unless a timezone is explicitly given (cebe) - Bug: Date and time formatting now assumes UTC as the timezone for input dates unless a timezone is explicitly given (cebe)
- Enh #4275: Added `removeChildren()` to `yii\rbac\ManagerInterface` and implementations (samdark) - Enh #4275: Added `removeChildren()` to `yii\rbac\ManagerInterface` and implementations (samdark)
- Enh: Added `yii\base\Application::loadedModules` (qiangxue)
2.0.0-rc September 27, 2014 2.0.0-rc September 27, 2014

4
framework/base/Application.php
View File

@@ -180,6 +180,10 @@ abstract class Application extends Module
* This property is managed by the application. Do not modify this property. * This property is managed by the application. Do not modify this property.
*/ */
public $state; public $state;
/**
* @var array list of loaded modules indexed by their class names.
*/
public $loadedModules = [];
/** /**

10
framework/base/Module.php
View File

@@ -123,10 +123,6 @@ class Module extends ServiceLocator
* @var array child modules of this module * @var array child modules of this module
*/ */
private $_modules = []; private $_modules = [];
/**
* @var array list of currently requested modules indexed by their class names
*/
private static $_instances = [];
/** /**
@@ -151,7 +147,7 @@ class Module extends ServiceLocator
public static function getInstance() public static function getInstance()
{ {
$class = get_called_class(); $class = get_called_class();
return isset(self::$_instances[$class]) ? self::$_instances[$class] : null; return isset(Yii::$app->loadedModules[$class]) ? Yii::$app->loadedModules[$class] : null;
} }
/** /**
@@ -162,9 +158,9 @@ class Module extends ServiceLocator
public static function setInstance($instance) public static function setInstance($instance)
{ {
if ($instance === null) { if ($instance === null) {
unset(self::$_instances[get_called_class()]); unset(Yii::$app->loadedModules[get_called_class()]);
} else { } else {
self::$_instances[get_class($instance)] = $instance; Yii::$app->loadedModules[get_class($instance)] = $instance;
} }
} }