mirror of
https://github.com/yiisoft/yii2.git
synced 2025-11-29 05:47:17 +08:00
Merge branch 'master' into redis
* master: (806 commits)
avoid confusing docs about autoload return value
doc fix.
Fixed doc.
Fixed autoloader behavior according to leading \
Fix in RequestPanel
changed to trace from info.
Removed yii\debug\Module::enabled.
minor enhancement of debugger.
Refactored the basic app.
Added ErrorAction.
Use `hasAttribute()` instead to avoid code duplication
refactored NavBar and basic app navbar.
test break fix.
test break fix.
Fixed test breaks.
#735: removed hiddenInput to avoid confusion.
ResizableAsset typo fix!
Update radio and checkbox due to e3801fbf6b
css fix.
Fixed the basic app template.
...
Conflicts:
.travis.yml
tests/unit/data/config.php
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
<?php
|
||||
|
||||
return array(
|
||||
//'appClass' => '\yii\web\Application',
|
||||
'appClass' => '\yii\console\Application',
|
||||
'databases' => array(
|
||||
'mysql' => array(
|
||||
'dsn' => 'mysql:host=127.0.0.1;dbname=yiitest',
|
||||
@@ -14,10 +12,22 @@ return array(
|
||||
'dsn' => 'sqlite::memory:',
|
||||
'fixture' => __DIR__ . '/sqlite.sql',
|
||||
),
|
||||
),
|
||||
'redis' => array(
|
||||
'dsn' => 'redis://localhost:6379/0',
|
||||
'password' => null,
|
||||
// 'fixture' => __DIR__ . '/mysql.sql',
|
||||
),
|
||||
'sqlsrv' => array(
|
||||
'dsn' => 'sqlsrv:Server=localhost;Database=test',
|
||||
'username' => '',
|
||||
'password' => '',
|
||||
'fixture' => __DIR__ . '/mssql.sql',
|
||||
),
|
||||
'pgsql' => array(
|
||||
'dsn' => 'pgsql:host=localhost;dbname=yiitest;port=5432;',
|
||||
'username' => 'postgres',
|
||||
'password' => 'postgres',
|
||||
'fixture' => __DIR__ . '/postgres.sql',
|
||||
),
|
||||
'redis' => array(
|
||||
'dsn' => 'redis://localhost:6379/0',
|
||||
'password' => null,
|
||||
// 'fixture' => __DIR__ . '/mysql.sql',
|
||||
),
|
||||
)
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user