From fcb45848dde193a4c8e487414ef1de155e042293 Mon Sep 17 00:00:00 2001
From: Alexander Mohorev <dev.mohorev@gmail.com>
Date: Mon, 8 Jun 2015 16:04:15 +0300
Subject: [PATCH 1/5] The formatting value must be array

---
 framework/console/Markdown.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/console/Markdown.php b/framework/console/Markdown.php
index a1a5c5a24f..eb3410a1bd 100644
--- a/framework/console/Markdown.php
+++ b/framework/console/Markdown.php
@@ -78,7 +78,7 @@ class Markdown extends \cebe\markdown\Parser
      */
     protected function renderEmph($element)
     {
-        return Console::ansiFormat($this->renderAbsy($element[1]), Console::ITALIC);
+        return Console::ansiFormat($this->renderAbsy($element[1]), [Console::ITALIC]);
     }
 
     /**
@@ -88,7 +88,7 @@ class Markdown extends \cebe\markdown\Parser
      */
     protected function renderStrong($element)
     {
-        return Console::ansiFormat($this->renderAbsy($element[1]), Console::BOLD);
+        return Console::ansiFormat($this->renderAbsy($element[1]), [Console::BOLD]);
     }
 
     /**

From 2288f339e616714020ca0ca3539c2f1eb6218fb0 Mon Sep 17 00:00:00 2001
From: Alexander Mohorev <dev.mohorev@gmail.com>
Date: Mon, 8 Jun 2015 16:07:27 +0300
Subject: [PATCH 2/5] Parameter  type is not compatible with declaration

---
 framework/db/mssql/QueryBuilder.php  | 3 ++-
 framework/db/sqlite/QueryBuilder.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/framework/db/mssql/QueryBuilder.php b/framework/db/mssql/QueryBuilder.php
index 534d7649de..dd8f40fc27 100644
--- a/framework/db/mssql/QueryBuilder.php
+++ b/framework/db/mssql/QueryBuilder.php
@@ -8,6 +8,7 @@
 namespace yii\db\mssql;
 
 use yii\base\InvalidParamException;
+use yii\db\Query;
 
 /**
  * QueryBuilder is the query builder for MS SQL Server databases (version 2008 and above).
@@ -222,7 +223,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
      *
      * @param string $operator
      * @param array $columns
-     * @param array $values
+     * @param Query $values
      * @param array $params
      * @return string SQL
      */
diff --git a/framework/db/sqlite/QueryBuilder.php b/framework/db/sqlite/QueryBuilder.php
index 0581371a63..ac8edca012 100644
--- a/framework/db/sqlite/QueryBuilder.php
+++ b/framework/db/sqlite/QueryBuilder.php
@@ -11,6 +11,7 @@ use yii\db\Connection;
 use yii\db\Exception;
 use yii\base\InvalidParamException;
 use yii\base\NotSupportedException;
+use yii\db\Query;
 
 /**
  * QueryBuilder is the query builder for SQLite databases.
@@ -299,7 +300,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
      *
      * @param string $operator
      * @param array $columns
-     * @param array $values
+     * @param Query $values
      * @param array $params
      * @return string SQL
      */

From 2134c72bb023a366bcd3a48168f480541278bd31 Mon Sep 17 00:00:00 2001
From: Alexander Mohorev <dev.mohorev@gmail.com>
Date: Mon, 8 Jun 2015 16:10:41 +0300
Subject: [PATCH 3/5] Undefined class Expression

---
 framework/db/oci/Schema.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/framework/db/oci/Schema.php b/framework/db/oci/Schema.php
index 96f83260b2..fd4cbafb3f 100644
--- a/framework/db/oci/Schema.php
+++ b/framework/db/oci/Schema.php
@@ -9,6 +9,7 @@ namespace yii\db\oci;
 
 use yii\base\InvalidCallException;
 use yii\db\Connection;
+use yii\db\Expression;
 use yii\db\TableSchema;
 use yii\db\ColumnSchema;
 

From 651ed4ee2c863fef59a30478845dd3a5933130cb Mon Sep 17 00:00:00 2001
From: Alexander Mohorev <dev.mohorev@gmail.com>
Date: Mon, 8 Jun 2015 16:11:16 +0300
Subject: [PATCH 4/5] Undefined class NotSupportedException

---
 framework/db/mssql/QueryBuilder.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/framework/db/mssql/QueryBuilder.php b/framework/db/mssql/QueryBuilder.php
index dd8f40fc27..f3df81879f 100644
--- a/framework/db/mssql/QueryBuilder.php
+++ b/framework/db/mssql/QueryBuilder.php
@@ -8,6 +8,7 @@
 namespace yii\db\mssql;
 
 use yii\base\InvalidParamException;
+use yii\base\NotSupportedException;
 use yii\db\Query;
 
 /**

From 7b5744a5c3b7d15003d5873db5d389989142d541 Mon Sep 17 00:00:00 2001
From: Alexander Mohorev <dev.mohorev@gmail.com>
Date: Mon, 8 Jun 2015 16:17:40 +0300
Subject: [PATCH 5/5] Add  to list declared variables

---
 framework/views/errorHandler/callStackItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/framework/views/errorHandler/callStackItem.php b/framework/views/errorHandler/callStackItem.php
index 0f30012a1e..51ed203bd5 100644
--- a/framework/views/errorHandler/callStackItem.php
+++ b/framework/views/errorHandler/callStackItem.php
@@ -7,6 +7,7 @@
 /* @var $lines string[] */
 /* @var $begin integer */
 /* @var $end integer */
+/* @var $args array */
 /* @var $handler \yii\web\ErrorHandler */
 ?>
 <li class="<?php if ($index === 1 || !$handler->isCoreFile($file)) echo 'application'; ?> call-stack-item"