Browse Source

Refactored instanceof in Module into method in Application

tags/2.0.0-beta
Alexander Makarov 11 years ago
parent
commit
e8eccc281d
  1. 14
      framework/yii/base/Application.php
  2. 12
      framework/yii/base/Module.php

14
framework/yii/base/Application.php

@ -172,6 +172,20 @@ abstract class Application extends Module
} }
/** /**
* Initializes the application.
* This method is called after the application is created and initialized with property values
* given in configuration.
*/
public function init()
{
$this->preloadComponents();
if ($this->controllerNamespace === null) {
$this->controllerNamespace = 'app\\controllers';
}
}
/**
* Loads components that are declared in [[preload]]. * Loads components that are declared in [[preload]].
* @throws InvalidConfigException if a component or module to be preloaded is unknown * @throws InvalidConfigException if a component or module to be preloaded is unknown
*/ */

12
framework/yii/base/Module.php

@ -167,20 +167,16 @@ abstract class Module extends Component
/** /**
* Initializes the module. * Initializes the module.
* This method is called after the module is created and initialized with property values * This method is called after the module is created and initialized with property values
* given in configuration. The default implement will create a path alias using the module [[id]] * given in configuration. The default implementation will create a path alias using the module [[id]]
* and then call [[preloadComponents()]] to load components that are declared in [[preload]]. * and then call [[preloadComponents()]] to load components that are declared in [[preload]].
*/ */
public function init() public function init()
{ {
$this->preloadComponents(); $this->preloadComponents();
if ($this->controllerNamespace === null) { if ($this->controllerNamespace === null) {
if ($this instanceof Application) { $class = get_class($this);
$this->controllerNamespace = 'app\\controllers'; if (($pos = strrpos($class, '\\')) !== false) {
} else { $this->controllerNamespace = substr($class, 0, $pos) . '\\controllers';
$class = get_class($this);
if (($pos = strrpos($class, '\\')) !== false) {
$this->controllerNamespace = substr($class, 0, $pos) . '\\controllers';
}
} }
} }
} }

Loading…
Cancel
Save