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

minor issue fix about fixture controllers.

Browse Source
This commit is contained in:
Qiang Xue
2014-01-02 23:34:00 -05:00
parent 9f74bba3f7
commit 239778efbd
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/yii/faker/FixtureController.php
View File

@@ -219,7 +219,7 @@ class FixtureController extends \yii\console\controllers\FixtureController
if (empty($files)) {
throw new Exception(
"No files were found by name: \"{$file}\". \n"
"No files were found by name: \"" . implode(', ', $file) . "\". \n"
. "Check that template with these name exists, under template path: \n\"{$templatePath}\"."
);
}

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

@@ -8,8 +8,8 @@
namespace yii\console\controllers;
use Yii;
use yii\base\InvalidConfigException;
use yii\console\Controller;
use yii\console\Exception;
use yii\test\DbTestTrait;
/**
@@ -122,14 +122,14 @@ class FixtureController extends Controller
/**
* Checks if the database and fixtures path are available.
* @throws InvalidConfigException
* @throws Exception
*/
public function checkRequirements()
{
$path = Yii::getAlias($this->fixturePath, false);
if (!is_dir($path) || !is_writable($path)) {
throw new InvalidConfigException("The fixtures path \"{$this->fixturePath}\" not exist or is not writable");
throw new Exception("The fixtures path \"{$this->fixturePath}\" not exist or is not writable");
}
}
@@ -137,14 +137,14 @@ class FixtureController extends Controller
/**
* Returns database connection component
* @return \yii\db\Connection
* @throws InvalidConfigException if [[db]] is invalid.
* @throws Exception if [[db]] is invalid.
*/
public function getDbConnection()
{
$db = Yii::$app->getComponent($this->db);
if ($db == null) {
throw new InvalidConfigException("There is no database connection component with id \"{$this->db}\".");
throw new Exception("There is no database connection component with id \"{$this->db}\".");
}
return $db;