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

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),
+			'%y' => array(self::FG_YELLOW),
-			'%g' => array(static::FG_GREEN),
+			'%g' => array(self::FG_GREEN),
-			'%b' => array(static::FG_BLUE),
+			'%b' => array(self::FG_BLUE),
-			'%r' => array(static::FG_RED),
+			'%r' => array(self::FG_RED),
-			'%p' => array(static::FG_PURPLE),
+			'%p' => array(self::FG_PURPLE),
-			'%m' => array(static::FG_PURPLE),
+			'%m' => array(self::FG_PURPLE),
-			'%c' => array(static::FG_CYAN),
+			'%c' => array(self::FG_CYAN),
-			'%w' => array(static::FG_GREY),
+			'%w' => array(self::FG_GREY),
-			'%k' => array(static::FG_BLACK),
+			'%k' => array(self::FG_BLACK),
 			'%n' => array(0), // reset
-			'%Y' => array(static::FG_YELLOW, static::BOLD),
+			'%Y' => array(self::FG_YELLOW, self::BOLD),
-			'%G' => array(static::FG_GREEN, static::BOLD),
+			'%G' => array(self::FG_GREEN, self::BOLD),
-			'%B' => array(static::FG_BLUE, static::BOLD),
+			'%B' => array(self::FG_BLUE, self::BOLD),
-			'%R' => array(static::FG_RED, static::BOLD),
+			'%R' => array(self::FG_RED, self::BOLD),
-			'%P' => array(static::FG_PURPLE, static::BOLD),
+			'%P' => array(self::FG_PURPLE, self::BOLD),
-			'%M' => array(static::FG_PURPLE, static::BOLD),
+			'%M' => array(self::FG_PURPLE, self::BOLD),
-			'%C' => array(static::FG_CYAN, static::BOLD),
+			'%C' => array(self::FG_CYAN, self::BOLD),
-			'%W' => array(static::FG_GREY, static::BOLD),
+			'%W' => array(self::FG_GREY, self::BOLD),
-			'%K' => array(static::FG_BLACK, static::BOLD),
+			'%K' => array(self::FG_BLACK, self::BOLD),
-			'%N' => array(0, static::BOLD),
+			'%N' => array(0, self::BOLD),
-			'%3' => array(static::BG_YELLOW),
+			'%3' => array(self::BG_YELLOW),
-			'%2' => array(static::BG_GREEN),
+			'%2' => array(self::BG_GREEN),
-			'%4' => array(static::BG_BLUE),
+			'%4' => array(self::BG_BLUE),
-			'%1' => array(static::BG_RED),
+			'%1' => array(self::BG_RED),
-			'%5' => array(static::BG_PURPLE),
+			'%5' => array(self::BG_PURPLE),
-			'%6' => array(static::BG_PURPLE),
+			'%6' => array(self::BG_PURPLE),
-			'%7' => array(static::BG_CYAN),
+			'%7' => array(self::BG_CYAN),
-			'%0' => array(static::BG_GREY),
+			'%0' => array(self::BG_GREY),
-			'%F' => array(static::BLINK),
+			'%F' => array(self::BLINK),
-			'%U' => array(static::UNDERLINE),
+			'%U' => array(self::UNDERLINE),
-			'%8' => array(static::NEGATIVE),
+			'%8' => array(self::NEGATIVE),
-			'%9' => array(static::BOLD),
+			'%9' => array(self::BOLD),
-			'%_' => array(static::BOLD)
+			'%_' => array(self::BOLD)
 		);
 
 		if ($colored) {