Error202
/
yii2-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #299 from creocoder/yiic-to-yii 

yiic => yii additional corrections
tags/2.0.0-beta
Carsten Brandt 12 years ago
parent
612af2ad85 8b311ecbe7
commit
16931cad97
10 changed files with 177 additions and 177 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      build/controllers/LocaleController.php
  2. 4
      yii/console/Application.php
  3. 4
      yii/console/Controller.php
  4. 2
      yii/console/Request.php
  5. 2
      yii/console/controllers/AssetController.php
  6. 14
      yii/console/controllers/HelpController.php
  7. 2
      yii/console/controllers/MessageController.php
  8. 40
      yii/console/controllers/MigrateController.php
  9. 4
      yii/db/Migration.php
  10. 2
      yii/i18n/data/plurals.php

2
build/controllers/LocaleController.php
Unescape View File

@ -93,7 +93,7 @@ class LocaleController extends Controller
/** /**
* Plural rules. * Plural rules.
* *
* This file is automatically generated by the "yiic locale/plural" command under the "build" folder. * This file is automatically generated by the "yii locale/plural" command under the "build" folder.
* Do not modify it directly. * Do not modify it directly.
* *
* The original plural rule data used for generating this file has the following copyright terms: * The original plural rule data used for generating this file has the following copyright terms:

4
yii/console/Application.php
Unescape View File

@ -30,7 +30,7 @@ use yii\base\InvalidRouteException;
* To run the console application, enter the following on the command line: * To run the console application, enter the following on the command line:
* *
* ~~~ * ~~~
* yiic <route> [--param1=value1 --param2 ...] * yii <route> [--param1=value1 --param2 ...]
* ~~~ * ~~~
* *
* where `<route>` refers to a controller route in the form of `ModuleID/ControllerID/ActionID` * where `<route>` refers to a controller route in the form of `ModuleID/ControllerID/ActionID`
@ -42,7 +42,7 @@ use yii\base\InvalidRouteException;
* To use this command, simply type: * To use this command, simply type:
* *
* ~~~ * ~~~
* yiic help * yii help
* ~~~ * ~~~
* *
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>

4
yii/console/Controller.php
Unescape View File

@ -18,10 +18,10 @@ use yii\helpers\Console;
* *
* A controller consists of one or several actions known as sub-commands. * A controller consists of one or several actions known as sub-commands.
* Users call a console command by specifying the corresponding route which identifies a controller action. * Users call a console command by specifying the corresponding route which identifies a controller action.
* The `yiic` program is used when calling a console command, like the following: * The `yii` program is used when calling a console command, like the following:
* *
* ~~~ * ~~~
* yiic <route> [--param1=value1 --param2 ...] * yii <route> [--param1=value1 --param2 ...]
* ~~~ * ~~~
* *
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>

2
yii/console/Request.php
Unescape View File

@ -27,7 +27,7 @@ class Request extends \yii\base\Request
public function resolve() public function resolve()
{ {
$rawParams = $this->getRawParams(); $rawParams = $this->getRawParams();
array_shift($rawParams); // the 1st argument is the yiic script name array_shift($rawParams); // the 1st argument is the yii script name
if (isset($rawParams[0])) { if (isset($rawParams[0])) {
$route = $rawParams[0]; $route = $rawParams[0];

2
yii/console/controllers/AssetController.php
Unescape View File

@ -261,7 +261,7 @@ class AssetController extends Controller
file_put_contents($bundleFile, <<<EOD file_put_contents($bundleFile, <<<EOD
<?php <?php
/** /**
* This file is generated by the "yiic script" command. * This file is generated by the "yii script" command.
* DO NOT MODIFY THIS FILE DIRECTLY. * DO NOT MODIFY THIS FILE DIRECTLY.
* @version $version * @version $version
*/ */

14
yii/console/controllers/HelpController.php
Unescape View File

@ -25,7 +25,7 @@ use yii\helpers\StringHelper;
* This command can be used as follows on command line: * This command can be used as follows on command line:
* *
* ~~~ * ~~~
* yiic help [command name] * yii help [command name]
* ~~~ * ~~~
* *
* In the above, if the command name is not provided, all * In the above, if the command name is not provided, all
@ -41,8 +41,8 @@ class HelpController extends Controller
* about a particular command. For example, * about a particular command. For example,
* *
* ~~~ * ~~~
* yiic help # list available commands * yii help # list available commands
* yiic help message # display help info about "message" * yii help message # display help info about "message"
* ~~~ * ~~~
* *
* @param string $command The name of the command to show help about. * @param string $command The name of the command to show help about.
@ -148,7 +148,7 @@ class HelpController extends Controller
echo "* $command\n"; echo "* $command\n";
} }
echo "\nTo see the help of each command, enter:\n"; echo "\nTo see the help of each command, enter:\n";
echo "\n yiic help <command-name>\n\n"; echo "\n yii help <command-name>\n\n";
} else { } else {
echo "\nNo commands are found.\n"; echo "\nNo commands are found.\n";
} }
@ -188,7 +188,7 @@ class HelpController extends Controller
echo "\n"; echo "\n";
} }
echo "\n\nTo see the detailed information about individual sub-commands, enter:\n"; echo "\n\nTo see the detailed information about individual sub-commands, enter:\n";
echo "\n yiic help <sub-command>\n\n"; echo "\n yii help <sub-command>\n\n";
} }
} }
@ -259,9 +259,9 @@ class HelpController extends Controller
echo "\nUSAGE\n\n"; echo "\nUSAGE\n\n";
if ($action->id === $controller->defaultAction) { if ($action->id === $controller->defaultAction) {
echo 'yiic ' . $controller->getUniqueId(); echo 'yii ' . $controller->getUniqueId();
} else { } else {
echo "yiic " . $action->getUniqueId(); echo "yii " . $action->getUniqueId();
} }
list ($required, $optional) = $this->getArgHelps($method, isset($tags['param']) ? $tags['param'] : array()); list ($required, $optional) = $this->getArgHelps($method, isset($tags['param']) ? $tags['param'] : array());
if (!empty($required)) { if (!empty($required)) {

2
yii/console/controllers/MessageController.php
Unescape View File

@ -194,7 +194,7 @@ class MessageController extends Controller
/** /**
* Message translations. * Message translations.
* *
* This file is automatically generated by 'yiic message' command. * This file is automatically generated by 'yii message' command.
* It contains the localizable messages extracted from source code. * It contains the localizable messages extracted from source code.
* You may modify this file by translating the extracted messages. * You may modify this file by translating the extracted messages.
* *

40
yii/console/controllers/MigrateController.php
Unescape View File

@ -42,13 +42,13 @@ use yii\helpers\ArrayHelper;
* *
* ~~~ * ~~~
* # creates a new migration named 'create_user_table' * # creates a new migration named 'create_user_table'
* yiic migrate/create create_user_table * yii migrate/create create_user_table
* *
* # applies ALL new migrations * # applies ALL new migrations
* yiic migrate * yii migrate
* *
* # reverts the last applied migration * # reverts the last applied migration
* yiic migrate/down * yii migrate/down
* ~~~ * ~~~
* *
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
@ -135,8 +135,8 @@ class MigrateController extends Controller
* For example, * For example,
* *
* ~~~ * ~~~
* yiic migrate # apply all new migrations * yii migrate # apply all new migrations
* yiic migrate 3 # apply the first 3 new migrations * yii migrate 3 # apply the first 3 new migrations
* ~~~ * ~~~
* *
* @param integer $limit the number of new migrations to be applied. If 0, it means * @param integer $limit the number of new migrations to be applied. If 0, it means
@ -184,8 +184,8 @@ class MigrateController extends Controller
* For example, * For example,
* *
* ~~~ * ~~~
* yiic migrate/down # revert the last migration * yii migrate/down # revert the last migration
* yiic migrate/down 3 # revert the last 3 migrations * yii migrate/down 3 # revert the last 3 migrations
* ~~~ * ~~~
* *
* @param integer $limit the number of migrations to be reverted. Defaults to 1, * @param integer $limit the number of migrations to be reverted. Defaults to 1,
@ -231,8 +231,8 @@ class MigrateController extends Controller
* them again. For example, * them again. For example,
* *
* ~~~ * ~~~
* yiic migrate/redo # redo the last applied migration * yii migrate/redo # redo the last applied migration
* yiic migrate/redo 3 # redo the last 3 applied migrations * yii migrate/redo 3 # redo the last 3 applied migrations
* ~~~ * ~~~
* *
* @param integer $limit the number of migrations to be redone. Defaults to 1, * @param integer $limit the number of migrations to be redone. Defaults to 1,
@ -284,8 +284,8 @@ class MigrateController extends Controller
* them again. For example, * them again. For example,
* *
* ~~~ * ~~~
* yiic migrate/to 101129_185401 # using timestamp * yii migrate/to 101129_185401 # using timestamp
* yiic migrate/to m101129_185401_create_user_table # using full name * yii migrate/to m101129_185401_create_user_table # using full name
* ~~~ * ~~~
* *
* @param string $version the version name that the application should be migrated to. * @param string $version the version name that the application should be migrated to.
@ -332,8 +332,8 @@ class MigrateController extends Controller
* No actual migration will be performed. * No actual migration will be performed.
* *
* ~~~ * ~~~
* yiic migrate/mark 101129_185401 # using timestamp * yii migrate/mark 101129_185401 # using timestamp
* yiic migrate/mark m101129_185401_create_user_table # using full name * yii migrate/mark m101129_185401_create_user_table # using full name
* ~~~ * ~~~
* *
* @param string $version the version at which the migration history should be marked. * @param string $version the version at which the migration history should be marked.
@ -398,9 +398,9 @@ class MigrateController extends Controller
* so far. For example, * so far. For example,
* *
* ~~~ * ~~~
* yiic migrate/history # showing the last 10 migrations * yii migrate/history # showing the last 10 migrations
* yiic migrate/history 5 # showing the last 5 migrations * yii migrate/history 5 # showing the last 5 migrations
* yiic migrate/history 0 # showing the whole history * yii migrate/history 0 # showing the whole history
* ~~~ * ~~~
* *
* @param integer $limit the maximum number of migrations to be displayed. * @param integer $limit the maximum number of migrations to be displayed.
@ -432,9 +432,9 @@ class MigrateController extends Controller
* For example, * For example,
* *
* ~~~ * ~~~
* yiic migrate/new # showing the first 10 new migrations * yii migrate/new # showing the first 10 new migrations
* yiic migrate/new 5 # showing the first 5 new migrations * yii migrate/new 5 # showing the first 5 new migrations
* yiic migrate/new 0 # showing all new migrations * yii migrate/new 0 # showing all new migrations
* ~~~ * ~~~
* *
* @param integer $limit the maximum number of new migrations to be displayed. * @param integer $limit the maximum number of new migrations to be displayed.
@ -469,7 +469,7 @@ class MigrateController extends Controller
* skeleton by filling up the actual migration logic. * skeleton by filling up the actual migration logic.
* *
* ~~~ * ~~~
* yiic migrate/create create_user_table * yii migrate/create create_user_table
* ~~~ * ~~~
* *
* @param string $name the name of the new migration. This should only contain * @param string $name the name of the new migration. This should only contain

4
yii/db/Migration.php
Unescape View File

@ -10,14 +10,14 @@ namespace yii\db;
/** /**
* Migration is the base class for representing a database migration. * Migration is the base class for representing a database migration.
* *
* Migration is designed to be used together with the "yiic migrate" command. * Migration is designed to be used together with the "yii migrate" command.
* *
* Each child class of Migration represents an individual database migration which * Each child class of Migration represents an individual database migration which
* is identified by the child class name. * is identified by the child class name.
* *
* Within each migration, the [[up()]] method should be overwritten to contain the logic * Within each migration, the [[up()]] method should be overwritten to contain the logic
* for "upgrading" the database; while the [[down()]] method for the "downgrading" * for "upgrading" the database; while the [[down()]] method for the "downgrading"
* logic. The "yiic migrate" command manages all available migrations in an application. * logic. The "yii migrate" command manages all available migrations in an application.
* *
* If the database supports transactions, you may also overwrite [[safeUp()]] and * If the database supports transactions, you may also overwrite [[safeUp()]] and
* [[safeDown()]] so that if anything wrong happens during the upgrading or downgrading, * [[safeDown()]] so that if anything wrong happens during the upgrading or downgrading,

2
yii/i18n/data/plurals.php
Unescape View File

@ -2,7 +2,7 @@
/** /**
* Plural rules. * Plural rules.
* *
* This file is automatically generated by the "yiic locale/plural" command under the "build" folder. * This file is automatically generated by the "yii locale/plural" command under the "build" folder.
* Do not modify it directly. * Do not modify it directly.
* *
* The original plural rule data used for generating this file has the following copyright terms: * The original plural rule data used for generating this file has the following copyright terms:

Write Preview
Loading…
Cancel
Save