Browse Source

code style fixes

tags/2.0.0-beta
Carsten Brandt 11 years ago
parent
commit
7d42fc4112
  1. 2
      docs/guide/basics.md
  2. 25
      framework/yii/console/controllers/FixtureController.php

2
docs/guide/basics.md

@ -90,7 +90,7 @@ For example, if standard alias `@app` refers to `/var/www/example.com/` then `\a
Custom alias may be added using the following code: Custom alias may be added using the following code:
```php ```php
Yii::setAlias('shared', realpath('~/src/shared')); Yii::setAlias('@shared', realpath('~/src/shared'));
``` ```
Additional autoloaders may be registered using standard PHP `spl_autoload_register`. Additional autoloaders may be registered using standard PHP `spl_autoload_register`.

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

@ -52,26 +52,24 @@ use yii\helpers\Console;
*/ */
class FixtureController extends Controller class FixtureController extends Controller
{ {
use DbTestTrait; use DbTestTrait;
/** /**
* @var string controller default action ID. * @var string controller default action ID.
*/ */
public $defaultAction = 'apply'; public $defaultAction = 'apply';
/** /**
* Alias to the path, where all fixtures are stored. * Alias to the path, where all fixtures are stored.
* @var string * @var string
*/ */
public $fixturePath = '@tests/unit/fixtures'; public $fixturePath = '@tests/unit/fixtures';
/** /**
* Id of the database connection component of the application. * Id of the database connection component of the application.
* @var string * @var string
*/ */
public $db = 'db'; public $db = 'db';
/** /**
* Returns the names of the global options for this command. * Returns the names of the global options for this command.
* @return array the names of the global options for this command. * @return array the names of the global options for this command.
@ -102,13 +100,13 @@ class FixtureController extends Controller
/** /**
* Apply given fixture to the table. Fixture name can be the same as the table name or * Apply given fixture to the table. Fixture name can be the same as the table name or
* you can specify table name as a second parameter. * you can specify table name as a second parameter.
* @param string $fixture * @param array $fixtures
* @throws \yii\console\Exception
*/ */
public function actionApply(array $fixtures) public function actionApply(array $fixtures)
{ {
if ($this->getFixtureManager() == null) { if ($this->getFixtureManager() == null) {
throw new Exception( throw new Exception('Fixture manager is not configured properly. '
'Fixture manager is not configured properly. '
. 'Please refer to official documentation for this purposes.'); . 'Please refer to official documentation for this purposes.');
} }
@ -124,7 +122,7 @@ class FixtureController extends Controller
/** /**
* Truncate given table and clear all fixtures from it. * Truncate given table and clear all fixtures from it.
* @param string $tables * @param array|string $tables
*/ */
public function actionClear(array $tables) public function actionClear(array $tables)
{ {
@ -161,7 +159,7 @@ class FixtureController extends Controller
{ {
$db = Yii::$app->getComponent($this->db); $db = Yii::$app->getComponent($this->db);
if ($db == null) { if ($db === null) {
throw new Exception("There is no database connection component with id \"{$this->db}\"."); throw new Exception("There is no database connection component with id \"{$this->db}\".");
} }
@ -174,8 +172,8 @@ class FixtureController extends Controller
*/ */
private function notifySuccess($fixtures) private function notifySuccess($fixtures)
{ {
$this->stdout("Fixtures were successfully loaded from path: \n", Console::FG_YELLOW); $this->stdout("Fixtures were successfully loaded from path:\n", Console::FG_YELLOW);
$this->stdout(realpath(Yii::getAlias($this->fixturePath)) . "\n\n", Console::FG_GREEN); $this->stdout(Yii::getAlias($this->fixturePath) . "\n\n", Console::FG_GREEN);
$this->outputList($fixtures); $this->outputList($fixtures);
} }
@ -187,7 +185,7 @@ class FixtureController extends Controller
private function confirmApply($fixtures) private function confirmApply($fixtures)
{ {
$this->stdout("Fixtures will be loaded from path: \n", Console::FG_YELLOW); $this->stdout("Fixtures will be loaded from path: \n", Console::FG_YELLOW);
$this->stdout(realpath(Yii::getAlias($this->fixturePath)) . "\n\n", Console::FG_GREEN); $this->stdout(Yii::getAlias($this->fixturePath) . "\n\n", Console::FG_GREEN);
$this->outputList($fixtures); $this->outputList($fixtures);
return $this->confirm('Load to database above fixtures?'); return $this->confirm('Load to database above fixtures?');
} }
@ -199,7 +197,7 @@ class FixtureController extends Controller
*/ */
private function confirmClear($tables) private function confirmClear($tables)
{ {
$this->stdout("Tables below will be cleared: \n\n", Console::FG_YELLOW); $this->stdout("Tables below will be cleared:\n\n", Console::FG_YELLOW);
$this->outputList($tables); $this->outputList($tables);
return $this->confirm('Clear tables?'); return $this->confirm('Clear tables?');
} }
@ -211,8 +209,7 @@ class FixtureController extends Controller
private function outputList($data) private function outputList($data)
{ {
foreach($data as $index => $item) { foreach($data as $index => $item) {
$this->stdout($index +1 . ". " . $item . "\n", Console::FG_GREEN); $this->stdout(($index + 1) . ". {$item}\n", Console::FG_GREEN);
} }
} }
} }

Loading…
Cancel
Save