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

modified Application constructor signature.

Browse Source
This commit is contained in:
Qiang Xue
2013-04-09 22:43:04 -04:00
parent 6f11f9e349
commit 122bd231b4
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
framework/base/Application.php
View File

@@ -98,16 +98,24 @@ class Application extends Module
/**
* Constructor.
* @param string $id the ID of this application. The ID should uniquely identify the application from others.
* @param string $basePath the base path of this application. This should point to
* the directory containing all application logic, template and data.
* @param array $config name-value pairs that will be used to initialize the object properties
* @param array $config name-value pairs that will be used to initialize the object properties.
* Note that the configuration must contain both [[id]] and [[basePath]].
* @throws InvalidConfigException if either [[id]] or [[basePath]] configuration is missing.
*/
public function __construct($id, $basePath, $config = array())
public function __construct($config = array())
{
Yii::$app = $this;
$this->id = $id;
$this->setBasePath($basePath);
if (!isset($config['id'])) {
throw new InvalidConfigException('The "id" configuration is required.');
}
if (isset($config['basePath'])) {
$this->setBasePath($config['basePath']);
unset($config['basePath']);
} else {
throw new InvalidConfigException('The "basePath" configuration is required.');
}
if (YII_ENABLE_ERROR_HANDLER) {
ini_set('display_errors', 0);

4
tests/unit/framework/helpers/HtmlTest.php
View File

@@ -10,7 +10,9 @@ class HtmlTest extends \yii\test\TestCase
{
public function setUp()
{
new Application('test', '@yiiunit/runtime', array(
new Application(array(
'id' => 'test',
'basePath' => '@yiiunit/runtime',
'components' => array(
'request' => array(
'class' => 'yii\web\Request',