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

Merge pull request #300 from rinatio/113-yiic-to-yii 

Rename yiic to yii. Fixes #113
tags/2.0.0-beta
Carsten Brandt 13 years ago
parent
16931cad97 5a81959d4a
commit
ab10896b03
8 changed files with 27 additions and 32 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. 4
      apps/bootstrap/protected/yii.bat
  2. 2
      build/build
  3. 2
      build/build.xml
  4. 2
      composer.json
  5. 7
      docs/guide/bootstrap.md
  6. 28
      docs/guide/migration.md
  7. 2
      docs/guide/upgrade-from-v1.md
  8. 4
      yii/yii.bat

4
apps/bootstrap/protected/yii.bat
Unescape View File

@ -1,9 +1,7 @@
@echo off @echo off
rem ------------------------------------------------------------- rem -------------------------------------------------------------
rem Yii command line script for Windows. rem Yii command line bootstrap script for Windows.
rem
rem This is the bootstrap script for running yiic on Windows.
rem rem
rem @author Qiang Xue <qiang.xue@gmail.com> rem @author Qiang Xue <qiang.xue@gmail.com>
rem @link http://www.yiiframework.com/ rem @link http://www.yiiframework.com/

2
build/build
Unescape View File

@ -13,7 +13,7 @@ defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
require(__DIR__ . '/../yii/Yii.php'); require(__DIR__ . '/../yii/Yii.php');
$id = 'yiic-build'; $id = 'yii-build';
$basePath = __DIR__; $basePath = __DIR__;
$application = new yii\console\Application(array('id' => $id, 'basePath' => $basePath)); $application = new yii\console\Application(array('id' => $id, 'basePath' => $basePath));

2
build/build.xml
Unescape View File

@ -94,7 +94,7 @@
</fileset> </fileset>
<fileset dir="." id="executables"> <fileset dir="." id="executables">
<include name="${build.src.dir}/**/yiic" /> <include name="${build.src.dir}/**/yii" />
</fileset> </fileset>
<target name="src" depends="sync"> <target name="src" depends="sync">

2
composer.json
Unescape View File

@ -67,7 +67,7 @@
"vendor-dir": "yii/vendor" "vendor-dir": "yii/vendor"
}, },
"bin": [ "bin": [
"yii/yiic" "yii/yii"
], ],
"repositories": [ "repositories": [
{ {

7
docs/guide/bootstrap.md
Unescape View File

@ -28,10 +28,9 @@ app/
img/ containing image files img/ containing image files
themes/ containing application themes themes/ containing application themes
protected/ containing protected application files protected/ containing protected application files
yiic yiic command line script for Unix/Linux yii yii command line script for Unix/Linux
yiic.bat yiic command line script for Windows yii.bat yii command line script for Windows
yiic.php yiic command line PHP script commands/ containing customized yii console commands
commands/ containing customized 'yiic' commands
components/ containing reusable user components components/ containing reusable user components
config/ containing configuration files config/ containing configuration files
console.php the console application configuration console.php the console application configuration

28
docs/guide/migration.md
Unescape View File

@ -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 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 tool supports creating new migrations, applying/reverting/redoing migrations, and
showing migration history and new migrations. showing migration history and new migrations.
@ -29,7 +29,7 @@ Creating Migrations
To create a new migration (e.g. create a news table), we run the following command: 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 The required `name` parameter specifies a very brief description of the migration
@ -38,7 +38,7 @@ is used as part of a PHP class name. Therefore, it should only contain letters,
digits and/or underscore characters. 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 The above command will create under the `protected/migrations` directory a new
@ -153,7 +153,7 @@ To apply all available new migrations (i.e., make the local database up-to-date)
run the following command: run the following command:
~~~ ~~~
yiic migrate yii migrate
~~~ ~~~
The command will show the list of all new migrations. If you confirm to apply The command will show the list of all new migrations. If you confirm to apply
@ -170,7 +170,7 @@ Sometimes, we may only want to apply one or a few new migrations. We can use the
following command: following command:
~~~ ~~~
yiic migrate/up 3 yii migrate/up 3
~~~ ~~~
This command will apply the 3 new migrations. Changing the value 3 will allow This command will apply the 3 new migrations. Changing the value 3 will allow
@ -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: 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 That is, we use the timestamp part of a migration name to specify the version
@ -196,7 +196,7 @@ To revert the last one or several applied migrations, we can use the following
command: command:
~~~ ~~~
yiic migrate/down [step] yii migrate/down [step]
~~~ ~~~
where the optional `step` parameter specifies how many migrations to be reverted where the optional `step` parameter specifies how many migrations to be reverted
@ -213,7 +213,7 @@ Redoing migrations means first reverting and then applying the specified migrati
This can be done with the following command: 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. where the optional `step` parameter specifies how many migrations to be redone.
@ -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. the migration history and the new migrations to be applied.
~~~ ~~~
yiic migrate/history [limit] yii migrate/history [limit]
yiic migrate/new [limit] yii migrate/new [limit]
~~~ ~~~
where the optional parameter `limit` specifies the number of migrations to be where the optional parameter `limit` specifies the number of migrations to be
@ -247,10 +247,10 @@ often happens when developing a new migration. We can use the following command
to achieve this goal. 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 modifies the migration history table to the specified version without applying
or reverting the migrations. or reverting the migrations.
@ -291,7 +291,7 @@ line:
To specify these options, execute the migrate command using the following format 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 For example, if we want to migrate for a `forum` module whose migration files
@ -299,7 +299,7 @@ are located within the module's `migrations` directory, we can use the following
command: command:
~~~ ~~~
yiic migrate/up --migrationPath=ext.forum.migrations yii migrate/up --migrationPath=ext.forum.migrations
~~~ ~~~

2
docs/guide/upgrade-from-v1.md
Unescape View File

@ -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. 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 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 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 passed as the parameters to the corresponding controller action method, and named arguments
are treated as global options declared in `globalOptions()`. are treated as global options declared in `globalOptions()`.

4
yii/yii.bat
Unescape View File

@ -1,9 +1,7 @@
@echo off @echo off
rem ------------------------------------------------------------- rem -------------------------------------------------------------
rem Yii command line script for Windows. rem Yii command line bootstrap script for Windows.
rem
rem This is the bootstrap script for running yiic on Windows.
rem rem
rem @author Qiang Xue <qiang.xue@gmail.com> rem @author Qiang Xue <qiang.xue@gmail.com>
rem @link http://www.yiiframework.com/ rem @link http://www.yiiframework.com/

Write Preview
Loading…
Cancel
Save