Commit 1a31b238 by Paul Klimov

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

parents ee0c9ed6 dc79c8c1
......@@ -22,7 +22,7 @@ before_script:
- tests/unit/data/travis/sphinx-setup.sh
#script:
# - phpunit --coverage-clover tests/unit/runtime/coveralls/clover.xml --verbose --exclude-group mssql,oci,wincache,xcache,zenddata,vendor,sphinx
# - phpunit --coverage-clover tests/unit/runtime/coveralls/clover.xml --verbose --exclude-group mssql,oci,wincache,xcache,zenddata,vendor
#after_script:
# - php vendor/bin/coveralls
......@@ -11,7 +11,7 @@
</testsuite>
</testsuites>
<filter>
<blacklist>
<blacklist>
<file>framework/yii/helpers/Json.php</file>
<file>framework/yii/helpers/StringHelper.php</file>
<file>framework/yii/helpers/VarDumper.php</file>
......@@ -20,7 +20,7 @@
<file>framework/yii/helpers/FileHelper.php</file>
<file>framework/yii/helpers/ArrayHelper.php</file>
<file>framework/yii/helpers/Console.php</file>
<file>framework/yii/i18n/GettextFile.php</file>
<file>framework/yii/i18n/GettextFile.php</file>
<file>framework/yii/web/ResponseFormatterInterface.php</file>
<directory suffix="Exception.php">framework/yii/base</directory>
<directory suffix=".php">framework/yii/db/mssql</directory>
......
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