Browse Source

minor issue fix about fixture controllers.

tags/2.0.0-beta
Qiang Xue 11 years ago
parent
commit
239778efbd
  1. 2
      extensions/yii/faker/FixtureController.php
  2. 10
      framework/yii/console/controllers/FixtureController.php

2
extensions/yii/faker/FixtureController.php

@ -219,7 +219,7 @@ class FixtureController extends \yii\console\controllers\FixtureController
if (empty($files)) { if (empty($files)) {
throw new Exception( 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}\"." . "Check that template with these name exists, under template path: \n\"{$templatePath}\"."
); );
} }

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

@ -8,8 +8,8 @@
namespace yii\console\controllers; namespace yii\console\controllers;
use Yii; use Yii;
use yii\base\InvalidConfigException;
use yii\console\Controller; use yii\console\Controller;
use yii\console\Exception;
use yii\test\DbTestTrait; use yii\test\DbTestTrait;
/** /**
@ -122,14 +122,14 @@ class FixtureController extends Controller
/** /**
* Checks if the database and fixtures path are available. * Checks if the database and fixtures path are available.
* @throws InvalidConfigException * @throws Exception
*/ */
public function checkRequirements() public function checkRequirements()
{ {
$path = Yii::getAlias($this->fixturePath, false); $path = Yii::getAlias($this->fixturePath, false);
if (!is_dir($path) || !is_writable($path)) { 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 * Returns database connection component
* @return \yii\db\Connection * @return \yii\db\Connection
* @throws InvalidConfigException if [[db]] is invalid. * @throws Exception if [[db]] is invalid.
*/ */
public function getDbConnection() public function getDbConnection()
{ {
$db = Yii::$app->getComponent($this->db); $db = Yii::$app->getComponent($this->db);
if ($db == null) { 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; return $db;

Loading…
Cancel
Save