Skip to content

Y
yii2
Commit 0f33f901 by Qiang Xue
Options

Merge branch 'master' of https://github.com/yiisoft/yii2

parents c7e40f5c a61ec6bd
Showing with 33 additions and 33 deletions
framework/db/Connection.php
......@@ -242,7 +242,7 @@ class Connection extends Component
'mysql' => 'yii\db\mysql\Schema', // MySQL
'sqlite' => 'yii\db\sqlite\Schema', // sqlite 3
'sqlite2' => 'yii\db\sqlite\Schema', // sqlite 2
'mssql' => 'yi\db\dao\mssql\Schema', // Mssql driver on windows hosts
'mssql' => 'yii\db\dao\mssql\Schema', // Mssql driver on windows hosts
'sqlsrv' => 'yii\db\mssql\Schema', // Mssql
'oci' => 'yii\db\oci\Schema', // Oracle driver
'dblib' => 'yii\db\mssql\Schema', // dblib drivers on linux (and maybe others os) hosts
......
framework/helpers/base/Console.php
......@@ -456,39 +456,39 @@ class Console
public static function renderColoredString($string, $colored = true)
{
static $conversions = array(
'%y' => array(static::FG_YELLOW),
'%g' => array(static::FG_GREEN),
'%b' => array(static::FG_BLUE),
'%r' => array(static::FG_RED),
'%p' => array(static::FG_PURPLE),
'%m' => array(static::FG_PURPLE),
'%c' => array(static::FG_CYAN),
'%w' => array(static::FG_GREY),
'%k' => array(static::FG_BLACK),
'%y' => array(self::FG_YELLOW),
'%g' => array(self::FG_GREEN),
'%b' => array(self::FG_BLUE),
'%r' => array(self::FG_RED),
'%p' => array(self::FG_PURPLE),
'%m' => array(self::FG_PURPLE),
'%c' => array(self::FG_CYAN),
'%w' => array(self::FG_GREY),
'%k' => array(self::FG_BLACK),
'%n' => array(0), // reset
'%Y' => array(static::FG_YELLOW, static::BOLD),
'%G' => array(static::FG_GREEN, static::BOLD),
'%B' => array(static::FG_BLUE, static::BOLD),
'%R' => array(static::FG_RED, static::BOLD),
'%P' => array(static::FG_PURPLE, static::BOLD),
'%M' => array(static::FG_PURPLE, static::BOLD),
'%C' => array(static::FG_CYAN, static::BOLD),
'%W' => array(static::FG_GREY, static::BOLD),
'%K' => array(static::FG_BLACK, static::BOLD),
'%N' => array(0, static::BOLD),
'%3' => array(static::BG_YELLOW),
'%2' => array(static::BG_GREEN),
'%4' => array(static::BG_BLUE),
'%1' => array(static::BG_RED),
'%5' => array(static::BG_PURPLE),
'%6' => array(static::BG_PURPLE),
'%7' => array(static::BG_CYAN),
'%0' => array(static::BG_GREY),
'%F' => array(static::BLINK),
'%U' => array(static::UNDERLINE),
'%8' => array(static::NEGATIVE),
'%9' => array(static::BOLD),
'%_' => array(static::BOLD)
'%Y' => array(self::FG_YELLOW, self::BOLD),
'%G' => array(self::FG_GREEN, self::BOLD),
'%B' => array(self::FG_BLUE, self::BOLD),
'%R' => array(self::FG_RED, self::BOLD),
'%P' => array(self::FG_PURPLE, self::BOLD),
'%M' => array(self::FG_PURPLE, self::BOLD),
'%C' => array(self::FG_CYAN, self::BOLD),
'%W' => array(self::FG_GREY, self::BOLD),
'%K' => array(self::FG_BLACK, self::BOLD),
'%N' => array(0, self::BOLD),
'%3' => array(self::BG_YELLOW),
'%2' => array(self::BG_GREEN),
'%4' => array(self::BG_BLUE),
'%1' => array(self::BG_RED),
'%5' => array(self::BG_PURPLE),
'%6' => array(self::BG_PURPLE),
'%7' => array(self::BG_CYAN),
'%0' => array(self::BG_GREY),
'%F' => array(self::BLINK),
'%U' => array(self::UNDERLINE),
'%8' => array(self::NEGATIVE),
'%9' => array(self::BOLD),
'%_' => array(self::BOLD)
);
if ($colored) {
......
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