Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@qiangxue
qiangxue committed Sep 16, 2014
1 parent 3ad86bf commit b6a53e3
Show file tree
Hide file tree
Showing 11 changed files with 220 additions and 200 deletions.
1 change: 1 addition & 0 deletions apps/advanced/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ at [getcomposer.org](http:https://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 create-project --prefer-dist --stability=dev yiisoft/yii2-app-advanced advanced
~~~

Expand Down
1 change: 1 addition & 0 deletions apps/basic/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ at [getcomposer.org](http:https://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 create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
~~~

Expand Down
7 changes: 1 addition & 6 deletions apps/basic/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,7 @@
"php": ">=5.4.0",
"yiisoft/yii2": "*",
"yiisoft/yii2-bootstrap": "*",
"yiisoft/yii2-swiftmailer": "*",
/* bower packages, added temporarily to test "composer-asset-plugin" */
"bower-asset/bootstrap": "3.2.* | 3.1.* | 3.0.*",
"bower-asset/jquery": "2.1.1",
"bower-asset/jquery-ui": "1.11.*",
"bower-asset/typeahead.js": "0.10.*"
"yiisoft/yii2-swiftmailer": "*"
},
"require-dev": {
"yiisoft/yii2-codeception": "*",
Expand Down
260 changes: 134 additions & 126 deletions composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,128 +1,136 @@
{
"name": "yiisoft/yii2-dev",
"description": "Yii PHP Framework Version 2 - Development Package",
"keywords": ["yii2", "framework"],
"homepage": "http:https://www.yiiframework.com/",
"type": "yii2-extension",
"license": "BSD-3-Clause",
"authors": [
{
"name": "Qiang Xue",
"email": "[email protected]",
"homepage": "http:https://www.yiiframework.com/",
"role": "Founder and project lead"
},
{
"name": "Alexander Makarov",
"email": "[email protected]",
"homepage": "http:https://rmcreative.ru/",
"role": "Core framework development"
},
{
"name": "Maurizio Domba",
"homepage": "http:https://mdomba.info/",
"role": "Core framework development"
},
{
"name": "Carsten Brandt",
"email": "[email protected]",
"homepage": "http:https://cebe.cc/",
"role": "Core framework development"
},
{
"name": "Timur Ruziev",
"email": "[email protected]",
"homepage": "http:https://resurtm.com/",
"role": "Core framework development"
},
{
"name": "Paul Klimov",
"email": "[email protected]",
"role": "Core framework development"
}
],
"support": {
"issues": "https://github.com/yiisoft/yii2/issues?state=open",
"forum": "http:https://www.yiiframework.com/forum/",
"wiki": "http:https://www.yiiframework.com/wiki/",
"irc": "irc:https://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2"
},
"minimum-stability": "dev",
"replace": {
"yiisoft/yii2-apidoc": "self.version",
"yiisoft/yii2-authclient": "self.version",
"yiisoft/yii2-bootstrap": "self.version",
"yiisoft/yii2-codeception": "self.version",
"yiisoft/yii2-debug": "self.version",
"yiisoft/yii2-elasticsearch": "self.version",
"yiisoft/yii2-faker": "self.version",
"yiisoft/yii2-imagine": "self.version",
"yiisoft/yii2-gii": "self.version",
"yiisoft/yii2-jui": "self.version",
"yiisoft/yii2-mongodb": "self.version",
"yiisoft/yii2-redis": "self.version",
"yiisoft/yii2-smarty": "self.version",
"yiisoft/yii2-swiftmailer": "self.version",
"yiisoft/yii2-sphinx": "self.version",
"yiisoft/yii2-twig": "self.version",
"yiisoft/yii2": "self.version"
},
"require": {
"php": ">=5.4.0",
"ext-mbstring": "*",
"lib-pcre": "*",
"yiisoft/yii2-composer": "*",
"yiisoft/jquery": "~2.0 | ~1.10",
"yiisoft/jquery-pjax": "*",
"ezyang/htmlpurifier": "4.6.*",
"cebe/markdown": "0.9.*"
},
"require-dev": {
"phpunit/phpunit": "3.7.*",
"twig/twig": "*",
"smarty/smarty": "*",
"imagine/imagine": "v0.5.0",
"swiftmailer/swiftmailer": "*",
"cebe/indent": "*"
},
"suggest": {
"phpdocumentor/reflection": "required by yii2-apidoc extension",
"twbs/bootstrap": "required by yii2-bootstrap, yii2-debug, yii2-gii extension",
"ext-curl": "required by yii2-elasticsearch extension",
"ext-mongo": "required by yii2-mongo extension",
"ext-pdo": "required by yii2-sphinx extension",
"ext-pdo_mysql": "required by yii2-sphinx extension",
"fzaninotto/faker": "required by yii2-faker extension",
"imagine/imagine": "required by yii2-imagine extension",
"phpspec/php-diff": "required by yii2-gii extension",
"smarty/smarty": "required by yii2-smarty extension",
"swiftmailer/swiftmailer": "required by yii2-swiftmailer extension",
"twig/twig": "required by yii2-twig extension",
"yiisoft/yii2-coding-standards": "you can use this package to check for code style issues when contributing to yii"
},
"autoload": {
"psr-4": {
"yii\\": "framework/",
"yii\\apidoc\\": "extensions/apidoc/",
"yii\\authclient\\": "extensions/authclient/",
"yii\\bootstrap\\": "extensions/bootstrap/",
"yii\\codeception\\": "extensions/codeception/",
"yii\\debug\\": "extensions/debug/",
"yii\\elasticsearch\\": "extensions/elasticsearch/",
"yii\\faker\\": "extensions/faker/",
"yii\\gii\\": "extensions/gii/",
"yii\\imagine\\" : "extensions/imagine/",
"yii\\jui\\": "extensions/jui/",
"yii\\mongodb\\": "extensions/mongodb/",
"yii\\redis\\": "extensions/redis/",
"yii\\smarty\\": "extensions/smarty/",
"yii\\swiftmailer\\": "extensions/swiftmailer/",
"yii\\sphinx\\": "extensions/sphinx/",
"yii\\twig\\": "extensions/twig/"
}
},
"bin": [
"framework/yii"
]
"name": "yiisoft/yii2-dev",
"description": "Yii PHP Framework Version 2 - Development Package",
"keywords": [
"yii2",
"framework"
],
"homepage": "http:https://www.yiiframework.com/",
"type": "yii2-extension",
"license": "BSD-3-Clause",
"authors": [
{
"name": "Qiang Xue",
"email": "[email protected]",
"homepage": "http:https://www.yiiframework.com/",
"role": "Founder and project lead"
},
{
"name": "Alexander Makarov",
"email": "[email protected]",
"homepage": "http:https://rmcreative.ru/",
"role": "Core framework development"
},
{
"name": "Maurizio Domba",
"homepage": "http:https://mdomba.info/",
"role": "Core framework development"
},
{
"name": "Carsten Brandt",
"email": "[email protected]",
"homepage": "http:https://cebe.cc/",
"role": "Core framework development"
},
{
"name": "Timur Ruziev",
"email": "[email protected]",
"homepage": "http:https://resurtm.com/",
"role": "Core framework development"
},
{
"name": "Paul Klimov",
"email": "[email protected]",
"role": "Core framework development"
}
],
"support": {
"issues": "https://github.com/yiisoft/yii2/issues?state=open",
"forum": "http:https://www.yiiframework.com/forum/",
"wiki": "http:https://www.yiiframework.com/wiki/",
"irc": "irc:https://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2"
},
"minimum-stability": "dev",
"replace": {
"yiisoft/yii2-apidoc": "self.version",
"yiisoft/yii2-authclient": "self.version",
"yiisoft/yii2-bootstrap": "self.version",
"yiisoft/yii2-codeception": "self.version",
"yiisoft/yii2-debug": "self.version",
"yiisoft/yii2-elasticsearch": "self.version",
"yiisoft/yii2-faker": "self.version",
"yiisoft/yii2-imagine": "self.version",
"yiisoft/yii2-gii": "self.version",
"yiisoft/yii2-jui": "self.version",
"yiisoft/yii2-mongodb": "self.version",
"yiisoft/yii2-redis": "self.version",
"yiisoft/yii2-smarty": "self.version",
"yiisoft/yii2-swiftmailer": "self.version",
"yiisoft/yii2-sphinx": "self.version",
"yiisoft/yii2-twig": "self.version",
"yiisoft/yii2": "self.version"
},
"require": {
"php": ">=5.4.0",
"ext-mbstring": "*",
"lib-pcre": "*",
"yiisoft/yii2-composer": "*",
"yiisoft/jquery": "~2.0 | ~1.10",
"yiisoft/jquery-pjax": "*",
"ezyang/htmlpurifier": "4.6.*",
"cebe/markdown": "0.9.*",
"bower-asset/jquery": ">=1.8",
"bower-asset/jquery.inputmask": ">=3.0.0",
"bower-asset/punycode": ">=1.3.0",
"bower-asset/yii2-pjax": ">=2.0.0",
"bower-asset/bootstrap": ">=3.0.0",
"bower-asset/jquery.ui": ">=1.10.0"
},
"require-dev": {
"phpunit/phpunit": "3.7.*",
"twig/twig": "*",
"smarty/smarty": "*",
"imagine/imagine": "v0.5.0",
"swiftmailer/swiftmailer": "*",
"cebe/indent": "*"
},
"suggest": {
"phpdocumentor/reflection": "required by yii2-apidoc extension",
"ext-curl": "required by yii2-elasticsearch extension",
"ext-mongo": "required by yii2-mongo extension",
"ext-pdo": "required by yii2-sphinx extension",
"ext-pdo_mysql": "required by yii2-sphinx extension",
"fzaninotto/faker": "required by yii2-faker extension",
"imagine/imagine": "required by yii2-imagine extension",
"phpspec/php-diff": "required by yii2-gii extension",
"smarty/smarty": "required by yii2-smarty extension",
"swiftmailer/swiftmailer": "required by yii2-swiftmailer extension",
"twig/twig": "required by yii2-twig extension",
"yiisoft/yii2-coding-standards": "you can use this package to check for code style issues when contributing to yii"
},
"autoload": {
"psr-4": {
"yii\\": "framework/",
"yii\\apidoc\\": "extensions/apidoc/",
"yii\\authclient\\": "extensions/authclient/",
"yii\\bootstrap\\": "extensions/bootstrap/",
"yii\\codeception\\": "extensions/codeception/",
"yii\\debug\\": "extensions/debug/",
"yii\\elasticsearch\\": "extensions/elasticsearch/",
"yii\\faker\\": "extensions/faker/",
"yii\\gii\\": "extensions/gii/",
"yii\\imagine\\": "extensions/imagine/",
"yii\\jui\\": "extensions/jui/",
"yii\\mongodb\\": "extensions/mongodb/",
"yii\\redis\\": "extensions/redis/",
"yii\\smarty\\": "extensions/smarty/",
"yii\\swiftmailer\\": "extensions/swiftmailer/",
"yii\\sphinx\\": "extensions/sphinx/",
"yii\\twig\\": "extensions/twig/"
}
},
"bin": [
"framework/yii"
]
}
7 changes: 5 additions & 2 deletions docs/guide/start-installation.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ On Windows, you'll download and run [Composer-Setup.exe](https://getcomposer.org
Please refer to the [Composer Documentation](https://getcomposer.org/doc/) if you encounter any
problems or want to learn more about Composer usage.

With Composer installed, you can install Yii by running the following command under a Web-accessible folder:
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 create-project --prefer-dist yiisoft/yii2-app-basic basic

The above command installs Yii in a directory named `basic`.
The first command installs the [composer asset plugin](https://github.com/francoispluchino/composer-asset-plugin/)
which allows managing bower and npm package dependencies through composer. You only need to run this command
once for all. The second command installs Yii in a directory named `basic`.

> Tip: If you want to install the latest development version of Yii, you may use the following command,
> which adds a [stability option](https://getcomposer.org/doc/04-schema.md#minimum-stability):
Expand Down
1 change: 1 addition & 0 deletions docs/guide/tutorial-advanced-app.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ curl -sS http:https://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 create-project --prefer-dist --stability=dev yiisoft/yii2-app-advanced /path/to/yii-application
~~~

Expand Down
1 change: 1 addition & 0 deletions docs/guide/tutorial-start-from-scratch.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +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 create-project --prefer-dist --stability=dev mysoft/yii2-app-coolone new-project
```
3 changes: 2 additions & 1 deletion extensions/bootstrap/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
}
],
"require": {
"yiisoft/yii2": "*"
"yiisoft/yii2": "*",
"bower-asset/bootstrap": ">=3.0.0"
},
"autoload": {
"psr-4": {
Expand Down
3 changes: 2 additions & 1 deletion extensions/gii/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"require": {
"yiisoft/yii2": "*",
"yiisoft/yii2-bootstrap": "*",
"phpspec/php-diff": ">=1.0.2"
"phpspec/php-diff": ">=1.0.2",
"bower-asset/typeahead.js": ">=0.10.0"
},
"autoload": {
"psr-4": {
Expand Down
3 changes: 2 additions & 1 deletion extensions/jui/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
}
],
"require": {
"yiisoft/yii2": "*"
"yiisoft/yii2": "*",
"bower-asset/jquery.ui": ">=1.10.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit b6a53e3

Please sign in to comment.