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

minor fixes.

Browse Source
This commit is contained in:
Qiang Xue
2014-01-02 23:08:14 -05:00
parent 4c45b429e5
commit 9f74bba3f7
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
framework/yii/console/controllers/FixtureController.php
View File

@ -8,8 +8,9 @@
namespace yii\console\controllers;
use Yii;
use yii\base\InvalidConfigException;
use yii\console\Controller;
use yii\console\Exception;
use yii\test\DbTestTrait;
/**
* This command manages fixtures load to the database tables.
@ -51,7 +52,7 @@ use yii\console\Exception;
class FixtureController extends Controller
{
use \yii\test\DbTestTrait;
use DbTestTrait;
/**
* @var string controller default action ID.
@ -104,8 +105,8 @@ class FixtureController extends Controller
*/
public function actionApply($fixture)
{
$this->fixtureManager->basePath = $this->fixturePath;
$this->fixtureManager->db = $this->db;
$this->getFixtureManager()->basePath = $this->fixturePath;
$this->getFixtureManager()->db = $this->db;
$this->loadFixtures([$fixture]);
}
@ -121,28 +122,29 @@ class FixtureController extends Controller
/**
* Checks if the database and fixtures path are available.
* @throws Exception
* @throws InvalidConfigException
*/
public function checkRequirements()
{
$path = Yii::getAlias($this->fixturePath, false);
if (!is_dir($path) || !is_writable($path)) {
throw new Exception("The fixtures path \"{$this->fixturePath}\" not exist or is not writable");
throw new InvalidConfigException("The fixtures path \"{$this->fixturePath}\" not exist or is not writable");
}
}
/**
* Returns database connection component
* @return \yii\db\Connection|null
* @return \yii\db\Connection
* @throws InvalidConfigException if [[db]] is invalid.
*/
public function getDbConnection()
{
$db = Yii::$app->getComponent($this->db);
if ($db == null) {
throw new Exception("There is no database connection component with id \"{$this->db}\".");
throw new InvalidConfigException("There is no database connection component with id \"{$this->db}\".");
}
return $db;