From b1bb796ee01fb68d6112f1057729f91ea77b3356 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Tue, 16 Sep 2014 20:58:57 -0400 Subject: [PATCH] Fixed wrong instruction. --- .travis.yml | 2 +- apps/advanced/README.md | 2 +- apps/basic/README.md | 2 +- docs/guide/start-installation.md | 2 +- docs/guide/tutorial-advanced-app.md | 2 +- docs/guide/tutorial-start-from-scratch.md | 2 +- framework/UPGRADE.md | 15 +++++++++++++-- 7 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 11b7e096738..b59972ca9e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ addons: install: - composer self-update && composer --version - - composer global require "fxp/composer-asset-plugin:~1.0" + - composer global require "fxp/composer-asset-plugin:1.0.*@dev" - export PATH="$HOME/.composer/vendor/bin:$PATH" # core framework: - composer install --prefer-dist diff --git a/apps/advanced/README.md b/apps/advanced/README.md index 30707e0166b..a66505664fa 100644 --- a/apps/advanced/README.md +++ b/apps/advanced/README.md @@ -75,7 +75,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix). You can then install the application using the following command: ~~~ -php composer.phar global require "fxp/composer-asset-plugin:~1.0" +php composer.phar global require "fxp/composer-asset-plugin:1.0.*@dev" php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-advanced advanced ~~~ diff --git a/apps/basic/README.md b/apps/basic/README.md index 43aaed8f78b..bef61bd5954 100644 --- a/apps/basic/README.md +++ b/apps/basic/README.md @@ -55,7 +55,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix). You can then install this application template using the following command: ~~~ -php composer.phar global require "fxp/composer-asset-plugin:~1.0" +php composer.phar global require "fxp/composer-asset-plugin:1.0.*@dev" php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic ~~~ diff --git a/docs/guide/start-installation.md b/docs/guide/start-installation.md index e56f637cf65..c849b91d013 100644 --- a/docs/guide/start-installation.md +++ b/docs/guide/start-installation.md @@ -23,7 +23,7 @@ problems or want to learn more about Composer usage. With Composer installed, you can install Yii by running the following commands under a Web-accessible folder: - composer global require "fxp/composer-asset-plugin:~1.0" + composer global require "fxp/composer-asset-plugin:1.0.*@dev" composer create-project --prefer-dist yiisoft/yii2-app-basic basic The first command installs the [composer asset plugin](https://github.com/francoispluchino/composer-asset-plugin/) diff --git a/docs/guide/tutorial-advanced-app.md b/docs/guide/tutorial-advanced-app.md index 6909a8d5b26..a5db6a50374 100644 --- a/docs/guide/tutorial-advanced-app.md +++ b/docs/guide/tutorial-advanced-app.md @@ -22,7 +22,7 @@ curl -sS http://getcomposer.org/installer | php You can then install the application using the following command: ~~~ -php composer.phar global require "fxp/composer-asset-plugin:~1.0" +php composer.phar global require "fxp/composer-asset-plugin:1.0.*@dev" php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-advanced /path/to/yii-application ~~~ diff --git a/docs/guide/tutorial-start-from-scratch.md b/docs/guide/tutorial-start-from-scratch.md index 4acb7bb5309..42f2098cadb 100644 --- a/docs/guide/tutorial-start-from-scratch.md +++ b/docs/guide/tutorial-start-from-scratch.md @@ -48,6 +48,6 @@ Use the Template That's all that's required to create a new Yii application template. Now you can create projects using your template: ``` -php composer.phar global require "fxp/composer-asset-plugin:~1.0" +php composer.phar global require "fxp/composer-asset-plugin:1.0.*@dev" php composer.phar create-project --prefer-dist --stability=dev mysoft/yii2-app-coolone new-project ``` diff --git a/framework/UPGRADE.md b/framework/UPGRADE.md index ce9beb498a6..579da51dbae 100644 --- a/framework/UPGRADE.md +++ b/framework/UPGRADE.md @@ -12,11 +12,22 @@ for both A and B. Upgrade from Yii 2.0 Beta ------------------------- -* If you are using Composer to install Yii, you should run the following command first (once for all) to install +* If you are using Composer to upgrade Yii, you should run the following command first (once for all) to install the composer-asset-plugin: ``` - php composer.phar global require "fxp/composer-asset-plugin:~1.0" + php composer.phar global require "fxp/composer-asset-plugin:1.0.*@dev" + ``` + + You also need to add the following code to your project's `composer.json` file: + + ```json + "extra": { + "asset-installer-paths": { + "npm-asset-library": "vendor/npm", + "bower-asset-library": "vendor/bower" + } + } ``` * If you used `clearAll()` or `clearAllAssignments()` of `yii\rbac\DbManager`, you should replace