php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-21 00:54:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8704 from mongosoft/master

Browse Source 
Small fixes
This commit is contained in:
Carsten Brandt
2015-06-08 18:53:59 +02:00
parent 71b4786850 7b5744a5c3
commit 0cd1b46e77
5 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/console/Markdown.php
View File

@@ -78,7 +78,7 @@ class Markdown extends \cebe\markdown\Parser
*/ */
protected function renderEmph($element) 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) protected function renderStrong($element)
{ {
return Console::ansiFormat($this->renderAbsy($element[1]), Console::BOLD); return Console::ansiFormat($this->renderAbsy($element[1]), [Console::BOLD]);
} }
/** /**

4
framework/db/mssql/QueryBuilder.php
View File

@@ -8,6 +8,8 @@
namespace yii\db\mssql; namespace yii\db\mssql;
use yii\base\InvalidParamException; 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). * 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 string $operator
* @param array $columns * @param array $columns
* @param array $values * @param Query $values
* @param array $params * @param array $params
* @return string SQL * @return string SQL
*/ */

1
framework/db/oci/Schema.php
View File

@@ -9,6 +9,7 @@ namespace yii\db\oci;
use yii\base\InvalidCallException; use yii\base\InvalidCallException;
use yii\db\Connection; use yii\db\Connection;
use yii\db\Expression;
use yii\db\TableSchema; use yii\db\TableSchema;
use yii\db\ColumnSchema; use yii\db\ColumnSchema;

3
framework/db/sqlite/QueryBuilder.php
View File

@@ -11,6 +11,7 @@ use yii\db\Connection;
use yii\db\Exception; use yii\db\Exception;
use yii\base\InvalidParamException; use yii\base\InvalidParamException;
use yii\base\NotSupportedException; use yii\base\NotSupportedException;
use yii\db\Query;
/** /**
* QueryBuilder is the query builder for SQLite databases. * QueryBuilder is the query builder for SQLite databases.
@@ -299,7 +300,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
* *
* @param string $operator * @param string $operator
* @param array $columns * @param array $columns
* @param array $values * @param Query $values
* @param array $params * @param array $params
* @return string SQL * @return string SQL
*/ */

1
framework/views/errorHandler/callStackItem.php
View File

@@ -7,6 +7,7 @@
/* @var $lines string[] */ /* @var $lines string[] */
/* @var $begin integer */ /* @var $begin integer */
/* @var $end integer */ /* @var $end integer */
/* @var $args array */
/* @var $handler \yii\web\ErrorHandler */ /* @var $handler \yii\web\ErrorHandler */
?> ?>
<li class="<?php if ($index === 1 || !$handler->isCoreFile($file)) echo 'application'; ?> call-stack-item" <li class="<?php if ($index === 1 || !$handler->isCoreFile($file)) echo 'application'; ?> call-stack-item"