Commit b9a30b30 by Alexander Makarov

Better naming for loadIfNot argument of Module::getModule and Module::getComponent

parent e585c69f
...@@ -201,17 +201,17 @@ abstract class Module extends Component implements Initable ...@@ -201,17 +201,17 @@ abstract class Module extends Component implements Initable
/** /**
* Retrieves the named module. * Retrieves the named module.
* @param string $id module ID (case-sensitive) * @param string $id module ID (case-sensitive)
* @param boolean $loadIfNot whether to load the module if it is not yet. * @param boolean $load whether to load the module if it is not yet loaded.
* @return Module|null the module instance, null if the module * @return Module|null the module instance, null if the module
* does not exist. * does not exist.
* @see hasModule() * @see hasModule()
*/ */
public function getModule($id, $loadIfNot = true) public function getModule($id, $load = true)
{ {
if (isset($this->_modules[$id])) { if (isset($this->_modules[$id])) {
if ($this->_modules[$id] instanceof Module) { if ($this->_modules[$id] instanceof Module) {
return $this->_modules[$id]; return $this->_modules[$id];
} elseif ($loadIfNot) { } elseif ($load) {
\Yii::trace("Loading \"$id\" module", __CLASS__); \Yii::trace("Loading \"$id\" module", __CLASS__);
return $this->_modules[$id] = \Yii::createObject($this->_modules[$id], $id, $this); return $this->_modules[$id] = \Yii::createObject($this->_modules[$id], $id, $this);
} }
...@@ -293,7 +293,7 @@ abstract class Module extends Component implements Initable ...@@ -293,7 +293,7 @@ abstract class Module extends Component implements Initable
$this->_modules[$id] = $module; $this->_modules[$id] = $module;
} }
} }
/** /**
* Checks whether the named component exists. * Checks whether the named component exists.
* @param string $id application component ID * @param string $id application component ID
...@@ -308,17 +308,17 @@ abstract class Module extends Component implements Initable ...@@ -308,17 +308,17 @@ abstract class Module extends Component implements Initable
/** /**
* Retrieves the named application component. * Retrieves the named application component.
* @param string $id application component ID (case-sensitive) * @param string $id application component ID (case-sensitive)
* @param boolean $loadIfNot whether to load the component if it is not yet. * @param boolean $load whether to load the component if it is not yet loaded.
* @return ApplicationComponent|null the application component instance, null if the application component * @return ApplicationComponent|null the application component instance, null if the application component
* does not exist. * does not exist.
* @see hasComponent() * @see hasComponent()
*/ */
public function getComponent($id, $loadIfNot = true) public function getComponent($id, $load = true)
{ {
if (isset($this->_components[$id])) { if (isset($this->_components[$id])) {
if ($this->_components[$id] instanceof ApplicationComponent) { if ($this->_components[$id] instanceof ApplicationComponent) {
return $this->_components[$id]; return $this->_components[$id];
} elseif ($loadIfNot) { } elseif ($load) {
\Yii::trace("Loading \"$id\" application component", __CLASS__); \Yii::trace("Loading \"$id\" application component", __CLASS__);
return $this->_components[$id] = \Yii::createObject($this->_components[$id]); return $this->_components[$id] = \Yii::createObject($this->_components[$id]);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment