Merge pull request #8704 from mongosoft/master

Small fixes

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]);
     }
 
     /**

framework/db/mssql/QueryBuilder.php

@@ -8,6 +8,8 @@
 namespace yii\db\mssql;
 
 use yii\base\InvalidParamException;
+use yii\base\NotSupportedException;
+use yii\db\Query;
 
 /**
  * QueryBuilder is the query builder for MS SQL Server databases (version 2008 and above).
@@ -222,7 +224,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
      */

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;
 

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
      */

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"