Skip to content

Commit

Permalink
Rename yiic to yii. Fixes yiisoft#113
Browse files Browse the repository at this point in the history
  • Loading branch information
rinatio committed May 16, 2013
1 parent 16931ca commit 5a81959
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 32 deletions.
6 changes: 2 additions & 4 deletions apps/bootstrap/protected/yii.bat
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
@echo off

rem -------------------------------------------------------------
rem Yii command line script for Windows.
rem
rem This is the bootstrap script for running yiic on Windows.
rem Yii command line bootstrap script for Windows.
rem
rem @author Qiang Xue <qiang.xue@gmail.com>
rem @link http://www.yiiframework.com/
Expand All @@ -19,4 +17,4 @@ if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe

"%PHP_COMMAND%" "%YII_PATH%yii" %*

@endlocal
@endlocal
2 changes: 1 addition & 1 deletion build/build
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));

require(__DIR__ . '/../yii/Yii.php');

$id = 'yiic-build';
$id = 'yii-build';
$basePath = __DIR__;

$application = new yii\console\Application(array('id' => $id, 'basePath' => $basePath));
Expand Down
2 changes: 1 addition & 1 deletion build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
</fileset>

<fileset dir="." id="executables">
<include name="${build.src.dir}/**/yiic" />
<include name="${build.src.dir}/**/yii" />
</fileset>

<target name="src" depends="sync">
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"vendor-dir": "yii/vendor"
},
"bin": [
"yii/yiic"
"yii/yii"
],
"repositories": [
{
Expand Down
9 changes: 4 additions & 5 deletions docs/guide/bootstrap.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@ app/
img/ containing image files
themes/ containing application themes
protected/ containing protected application files
yiic yiic command line script for Unix/Linux
yiic.bat yiic command line script for Windows
yiic.php yiic command line PHP script
commands/ containing customized 'yiic' commands
yii yii command line script for Unix/Linux
yii.bat yii command line script for Windows
commands/ containing customized yii console commands
components/ containing reusable user components
config/ containing configuration files
console.php the console application configuration
Expand Down Expand Up @@ -60,4 +59,4 @@ app/
~~~


TBD
TBD
28 changes: 14 additions & 14 deletions docs/guide/migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The following steps show how we can use database migration during development:
4. Doug applies the migration to his local development database


Yii supports database migration via the `yiic migrate` command line tool. This
Yii supports database migration via the `yii migrate` command line tool. This
tool supports creating new migrations, applying/reverting/redoing migrations, and
showing migration history and new migrations.

Expand All @@ -29,7 +29,7 @@ Creating Migrations
To create a new migration (e.g. create a news table), we run the following command:

~~~
yiic migrate/create <name>
yii migrate/create <name>
~~~

The required `name` parameter specifies a very brief description of the migration
Expand All @@ -38,7 +38,7 @@ is used as part of a PHP class name. Therefore, it should only contain letters,
digits and/or underscore characters.

~~~
yiic migrate/create create_news_table
yii migrate/create create_news_table
~~~

The above command will create under the `protected/migrations` directory a new
Expand Down Expand Up @@ -153,7 +153,7 @@ To apply all available new migrations (i.e., make the local database up-to-date)
run the following command:

~~~
yiic migrate
yii migrate
~~~

The command will show the list of all new migrations. If you confirm to apply
Expand All @@ -170,7 +170,7 @@ Sometimes, we may only want to apply one or a few new migrations. We can use the
following command:

~~~
yiic migrate/up 3
yii migrate/up 3
~~~

This command will apply the 3 new migrations. Changing the value 3 will allow
Expand All @@ -179,7 +179,7 @@ us to change the number of migrations to be applied.
We can also migrate the database to a specific version with the following command:

~~~
yiic migrate/to 101129_185401
yii migrate/to 101129_185401
~~~

That is, we use the timestamp part of a migration name to specify the version
Expand All @@ -196,7 +196,7 @@ To revert the last one or several applied migrations, we can use the following
command:

~~~
yiic migrate/down [step]
yii migrate/down [step]
~~~

where the optional `step` parameter specifies how many migrations to be reverted
Expand All @@ -213,7 +213,7 @@ Redoing migrations means first reverting and then applying the specified migrati
This can be done with the following command:

~~~
yiic migrate/redo [step]
yii migrate/redo [step]
~~~

where the optional `step` parameter specifies how many migrations to be redone.
Expand All @@ -227,8 +227,8 @@ Besides applying and reverting migrations, the migration tool can also display
the migration history and the new migrations to be applied.

~~~
yiic migrate/history [limit]
yiic migrate/new [limit]
yii migrate/history [limit]
yii migrate/new [limit]
~~~

where the optional parameter `limit` specifies the number of migrations to be
Expand All @@ -247,10 +247,10 @@ often happens when developing a new migration. We can use the following command
to achieve this goal.

~~~
yiic migrate/mark 101129_185401
yii migrate/mark 101129_185401
~~~

This command is very similar to `yiic migrate/to` command, except that it only
This command is very similar to `yii migrate/to` command, except that it only
modifies the migration history table to the specified version without applying
or reverting the migrations.

Expand Down Expand Up @@ -291,15 +291,15 @@ line:
To specify these options, execute the migrate command using the following format

~~~
yiic migrate/up --option1=value1 --option2=value2 ...
yii migrate/up --option1=value1 --option2=value2 ...
~~~

For example, if we want to migrate for a `forum` module whose migration files
are located within the module's `migrations` directory, we can use the following
command:

~~~
yiic migrate/up --migrationPath=ext.forum.migrations
yii migrate/up --migrationPath=ext.forum.migrations
~~~


Expand Down
4 changes: 2 additions & 2 deletions docs/guide/upgrade-from-v1.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ with significant improvements. For more details, please see the "assets" subsect
While Yii 2.0 continues to use PHP as its main template language, it comes with built-in
support for two popular template engines: Smarty and Twig. The Prado template engine is
no longer supported. To use these template engines, you just need to use `tpl` as the file
extension for your Smarty views, or `twig` for Twig views. You may also configure the
extension for your Smarty views, or `twig` for Twig views. You may also configure the
`View::renderers` property to use other template engines.


Expand Down Expand Up @@ -252,7 +252,7 @@ Console applications are now composed by controllers, too, like Web applications
console controllers and Web controllers share the same base controller class.

Each console controller is like `CConsoleCommand` in 1.1. It consists of one or several
actions. You use the `yiic <route>` command to execute a console command, where `<route>`
actions. You use the `yii <route>` command to execute a console command, where `<route>`
stands for a controller route (e.g. `sitemap/index`). Additional anonymous arguments
are passed as the parameters to the corresponding controller action method, and named arguments
are treated as global options declared in `globalOptions()`.
Expand Down
6 changes: 2 additions & 4 deletions yii/yii.bat
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
@echo off

rem -------------------------------------------------------------
rem Yii command line script for Windows.
rem
rem This is the bootstrap script for running yiic on Windows.
rem Yii command line bootstrap script for Windows.
rem
rem @author Qiang Xue <qiang.xue@gmail.com>
rem @link http://www.yiiframework.com/
Expand All @@ -19,4 +17,4 @@ if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe

"%PHP_COMMAND%" "%YII_PATH%yii" %*

@endlocal
@endlocal

0 comments on commit 5a81959

Please sign in to comment.