Browse Source

Merge branch 'master' of git.yiisoft.com:yii2

tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
b7be92cecd
  1. 4
      tests/unit/MysqlTestCase.php
  2. 2
      tests/unit/framework/caching/DbCacheTest.php

4
tests/unit/MysqlTestCase.php

@ -4,7 +4,7 @@ namespace yiiunit;
class MysqlTestCase extends TestCase class MysqlTestCase extends TestCase
{ {
function __construct() protected function setUp()
{ {
if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) { if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) {
$this->markTestSkipped('pdo and pdo_mysql extensions are required.'); $this->markTestSkipped('pdo and pdo_mysql extensions are required.');
@ -15,7 +15,7 @@ class MysqlTestCase extends TestCase
* @param bool $reset whether to clean up the test database * @param bool $reset whether to clean up the test database
* @return \yii\db\Connection * @return \yii\db\Connection
*/ */
function getConnection($reset = true) public function getConnection($reset = true)
{ {
$params = $this->getParam('mysql'); $params = $this->getParam('mysql');
$db = new \yii\db\Connection; $db = new \yii\db\Connection;

2
tests/unit/framework/caching/DbCacheTest.php

@ -11,7 +11,7 @@ class DbCacheTest extends CacheTest
private $_cacheInstance; private $_cacheInstance;
private $_connection; private $_connection;
function __construct() protected function setUp()
{ {
if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) { if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) {
$this->markTestSkipped('pdo and pdo_mysql extensions are required.'); $this->markTestSkipped('pdo and pdo_mysql extensions are required.');

Loading…
Cancel
Save