Skip to content

Y
yii2
Commit b6a53e30 by Qiang Xue
Options

WIP

parent 3ad86bf9
Showing with 220 additions and 200 deletions
apps/advanced/README.md
...@@ -75,6 +75,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix). ...@@ -75,6 +75,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
You can then install the application using the following command: 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 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-advanced advanced
~~~ ~~~
......
apps/basic/README.md
...@@ -55,6 +55,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix). ...@@ -55,6 +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: 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 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
~~~ ~~~
......
apps/basic/composer.json
...@@ -17,12 +17,7 @@ ...@@ -17,12 +17,7 @@
"php": ">=5.4.0", "php": ">=5.4.0",
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"yiisoft/yii2-bootstrap": "*", "yiisoft/yii2-bootstrap": "*",
"yiisoft/yii2-swiftmailer": "*", "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.*"
}, },
"require-dev": { "require-dev": {
"yiisoft/yii2-codeception": "*", "yiisoft/yii2-codeception": "*",
......
composer.json
{ {
"name": "yiisoft/yii2-dev", "name": "yiisoft/yii2-dev",
"description": "Yii PHP Framework Version 2 - Development Package", "description": "Yii PHP Framework Version 2 - Development Package",
"keywords": ["yii2", "framework"], "keywords": [
"homepage": "http://www.yiiframework.com/", "yii2",
"type": "yii2-extension", "framework"
"license": "BSD-3-Clause", ],
"authors": [ "homepage": "http://www.yiiframework.com/",
{ "type": "yii2-extension",
"name": "Qiang Xue", "license": "BSD-3-Clause",
"email": "qiang.xue@gmail.com", "authors": [
"homepage": "http://www.yiiframework.com/", {
"role": "Founder and project lead" "name": "Qiang Xue",
}, "email": "qiang.xue@gmail.com",
{ "homepage": "http://www.yiiframework.com/",
"name": "Alexander Makarov", "role": "Founder and project lead"
"email": "sam@rmcreative.ru", },
"homepage": "http://rmcreative.ru/", {
"role": "Core framework development" "name": "Alexander Makarov",
}, "email": "sam@rmcreative.ru",
{ "homepage": "http://rmcreative.ru/",
"name": "Maurizio Domba", "role": "Core framework development"
"homepage": "http://mdomba.info/", },
"role": "Core framework development" {
}, "name": "Maurizio Domba",
{ "homepage": "http://mdomba.info/",
"name": "Carsten Brandt", "role": "Core framework development"
"email": "mail@cebe.cc", },
"homepage": "http://cebe.cc/", {
"role": "Core framework development" "name": "Carsten Brandt",
}, "email": "mail@cebe.cc",
{ "homepage": "http://cebe.cc/",
"name": "Timur Ruziev", "role": "Core framework development"
"email": "resurtm@gmail.com", },
"homepage": "http://resurtm.com/", {
"role": "Core framework development" "name": "Timur Ruziev",
}, "email": "resurtm@gmail.com",
{ "homepage": "http://resurtm.com/",
"name": "Paul Klimov", "role": "Core framework development"
"email": "klimov.paul@gmail.com", },
"role": "Core framework development" {
} "name": "Paul Klimov",
], "email": "klimov.paul@gmail.com",
"support": { "role": "Core framework development"
"issues": "https://github.com/yiisoft/yii2/issues?state=open", }
"forum": "http://www.yiiframework.com/forum/", ],
"wiki": "http://www.yiiframework.com/wiki/", "support": {
"irc": "irc://irc.freenode.net/yii", "issues": "https://github.com/yiisoft/yii2/issues?state=open",
"source": "https://github.com/yiisoft/yii2" "forum": "http://www.yiiframework.com/forum/",
}, "wiki": "http://www.yiiframework.com/wiki/",
"minimum-stability": "dev", "irc": "irc://irc.freenode.net/yii",
"replace": { "source": "https://github.com/yiisoft/yii2"
"yiisoft/yii2-apidoc": "self.version", },
"yiisoft/yii2-authclient": "self.version", "minimum-stability": "dev",
"yiisoft/yii2-bootstrap": "self.version", "replace": {
"yiisoft/yii2-codeception": "self.version", "yiisoft/yii2-apidoc": "self.version",
"yiisoft/yii2-debug": "self.version", "yiisoft/yii2-authclient": "self.version",
"yiisoft/yii2-elasticsearch": "self.version", "yiisoft/yii2-bootstrap": "self.version",
"yiisoft/yii2-faker": "self.version", "yiisoft/yii2-codeception": "self.version",
"yiisoft/yii2-imagine": "self.version", "yiisoft/yii2-debug": "self.version",
"yiisoft/yii2-gii": "self.version", "yiisoft/yii2-elasticsearch": "self.version",
"yiisoft/yii2-jui": "self.version", "yiisoft/yii2-faker": "self.version",
"yiisoft/yii2-mongodb": "self.version", "yiisoft/yii2-imagine": "self.version",
"yiisoft/yii2-redis": "self.version", "yiisoft/yii2-gii": "self.version",
"yiisoft/yii2-smarty": "self.version", "yiisoft/yii2-jui": "self.version",
"yiisoft/yii2-swiftmailer": "self.version", "yiisoft/yii2-mongodb": "self.version",
"yiisoft/yii2-sphinx": "self.version", "yiisoft/yii2-redis": "self.version",
"yiisoft/yii2-twig": "self.version", "yiisoft/yii2-smarty": "self.version",
"yiisoft/yii2": "self.version" "yiisoft/yii2-swiftmailer": "self.version",
}, "yiisoft/yii2-sphinx": "self.version",
"require": { "yiisoft/yii2-twig": "self.version",
"php": ">=5.4.0", "yiisoft/yii2": "self.version"
"ext-mbstring": "*", },
"lib-pcre": "*", "require": {
"yiisoft/yii2-composer": "*", "php": ">=5.4.0",
"yiisoft/jquery": "~2.0 | ~1.10", "ext-mbstring": "*",
"yiisoft/jquery-pjax": "*", "lib-pcre": "*",
"ezyang/htmlpurifier": "4.6.*", "yiisoft/yii2-composer": "*",
"cebe/markdown": "0.9.*" "yiisoft/jquery": "~2.0 | ~1.10",
}, "yiisoft/jquery-pjax": "*",
"require-dev": { "ezyang/htmlpurifier": "4.6.*",
"phpunit/phpunit": "3.7.*", "cebe/markdown": "0.9.*",
"twig/twig": "*", "bower-asset/jquery": ">=1.8",
"smarty/smarty": "*", "bower-asset/jquery.inputmask": ">=3.0.0",
"imagine/imagine": "v0.5.0", "bower-asset/punycode": ">=1.3.0",
"swiftmailer/swiftmailer": "*", "bower-asset/yii2-pjax": ">=2.0.0",
"cebe/indent": "*" "bower-asset/bootstrap": ">=3.0.0",
}, "bower-asset/jquery.ui": ">=1.10.0"
"suggest": { },
"phpdocumentor/reflection": "required by yii2-apidoc extension", "require-dev": {
"twbs/bootstrap": "required by yii2-bootstrap, yii2-debug, yii2-gii extension", "phpunit/phpunit": "3.7.*",
"ext-curl": "required by yii2-elasticsearch extension", "twig/twig": "*",
"ext-mongo": "required by yii2-mongo extension", "smarty/smarty": "*",
"ext-pdo": "required by yii2-sphinx extension", "imagine/imagine": "v0.5.0",
"ext-pdo_mysql": "required by yii2-sphinx extension", "swiftmailer/swiftmailer": "*",
"fzaninotto/faker": "required by yii2-faker extension", "cebe/indent": "*"
"imagine/imagine": "required by yii2-imagine extension", },
"phpspec/php-diff": "required by yii2-gii extension", "suggest": {
"smarty/smarty": "required by yii2-smarty extension", "phpdocumentor/reflection": "required by yii2-apidoc extension",
"swiftmailer/swiftmailer": "required by yii2-swiftmailer extension", "ext-curl": "required by yii2-elasticsearch extension",
"twig/twig": "required by yii2-twig extension", "ext-mongo": "required by yii2-mongo extension",
"yiisoft/yii2-coding-standards": "you can use this package to check for code style issues when contributing to yii" "ext-pdo": "required by yii2-sphinx extension",
}, "ext-pdo_mysql": "required by yii2-sphinx extension",
"autoload": { "fzaninotto/faker": "required by yii2-faker extension",
"psr-4": { "imagine/imagine": "required by yii2-imagine extension",
"yii\\": "framework/", "phpspec/php-diff": "required by yii2-gii extension",
"yii\\apidoc\\": "extensions/apidoc/", "smarty/smarty": "required by yii2-smarty extension",
"yii\\authclient\\": "extensions/authclient/", "swiftmailer/swiftmailer": "required by yii2-swiftmailer extension",
"yii\\bootstrap\\": "extensions/bootstrap/", "twig/twig": "required by yii2-twig extension",
"yii\\codeception\\": "extensions/codeception/", "yiisoft/yii2-coding-standards": "you can use this package to check for code style issues when contributing to yii"
"yii\\debug\\": "extensions/debug/", },
"yii\\elasticsearch\\": "extensions/elasticsearch/", "autoload": {
"yii\\faker\\": "extensions/faker/", "psr-4": {
"yii\\gii\\": "extensions/gii/", "yii\\": "framework/",
"yii\\imagine\\" : "extensions/imagine/", "yii\\apidoc\\": "extensions/apidoc/",
"yii\\jui\\": "extensions/jui/", "yii\\authclient\\": "extensions/authclient/",
"yii\\mongodb\\": "extensions/mongodb/", "yii\\bootstrap\\": "extensions/bootstrap/",
"yii\\redis\\": "extensions/redis/", "yii\\codeception\\": "extensions/codeception/",
"yii\\smarty\\": "extensions/smarty/", "yii\\debug\\": "extensions/debug/",
"yii\\swiftmailer\\": "extensions/swiftmailer/", "yii\\elasticsearch\\": "extensions/elasticsearch/",
"yii\\sphinx\\": "extensions/sphinx/", "yii\\faker\\": "extensions/faker/",
"yii\\twig\\": "extensions/twig/" "yii\\gii\\": "extensions/gii/",
} "yii\\imagine\\": "extensions/imagine/",
}, "yii\\jui\\": "extensions/jui/",
"bin": [ "yii\\mongodb\\": "extensions/mongodb/",
"framework/yii" "yii\\redis\\": "extensions/redis/",
] "yii\\smarty\\": "extensions/smarty/",
"yii\\swiftmailer\\": "extensions/swiftmailer/",
"yii\\sphinx\\": "extensions/sphinx/",
"yii\\twig\\": "extensions/twig/"
}
},
"bin": [
"framework/yii"
]
} }
docs/guide/start-installation.md
...@@ -21,11 +21,14 @@ On Windows, you'll download and run [Composer-Setup.exe](https://getcomposer.org ...@@ -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 Please refer to the [Composer Documentation](https://getcomposer.org/doc/) if you encounter any
problems or want to learn more about Composer usage. 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 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, > 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): > which adds a [stability option](https://getcomposer.org/doc/04-schema.md#minimum-stability):
......
docs/guide/tutorial-advanced-app.md
...@@ -22,6 +22,7 @@ curl -sS http://getcomposer.org/installer | php ...@@ -22,6 +22,7 @@ curl -sS http://getcomposer.org/installer | php
You can then install the application using the following command: 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 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-advanced /path/to/yii-application
~~~ ~~~
......
docs/guide/tutorial-start-from-scratch.md
...@@ -48,5 +48,6 @@ Use the Template ...@@ -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: 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 php composer.phar create-project --prefer-dist --stability=dev mysoft/yii2-app-coolone new-project
``` ```
extensions/bootstrap/composer.json
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
} }
], ],
"require": { "require": {
"yiisoft/yii2": "*" "yiisoft/yii2": "*",
"bower-asset/bootstrap": ">=3.0.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
extensions/gii/composer.json
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"yiisoft/yii2-bootstrap": "*", "yiisoft/yii2-bootstrap": "*",
"phpspec/php-diff": ">=1.0.2" "phpspec/php-diff": ">=1.0.2",
"bower-asset/typeahead.js": ">=0.10.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
extensions/jui/composer.json
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
} }
], ],
"require": { "require": {
"yiisoft/yii2": "*" "yiisoft/yii2": "*",
"bower-asset/jquery.ui": ">=1.10.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
framework/composer.json
{ {
"name": "yiisoft/yii2", "name": "yiisoft/yii2",
"description": "Yii PHP Framework Version 2", "description": "Yii PHP Framework Version 2",
"keywords": ["yii2", "framework"], "keywords": [
"homepage": "http://www.yiiframework.com/", "yii2",
"type": "library", "framework"
"license": "BSD-3-Clause", ],
"authors": [ "homepage": "http://www.yiiframework.com/",
{ "type": "library",
"name": "Qiang Xue", "license": "BSD-3-Clause",
"email": "qiang.xue@gmail.com", "authors": [
"homepage": "http://www.yiiframework.com/", {
"role": "Founder and project lead" "name": "Qiang Xue",
}, "email": "qiang.xue@gmail.com",
{ "homepage": "http://www.yiiframework.com/",
"name": "Alexander Makarov", "role": "Founder and project lead"
"email": "sam@rmcreative.ru", },
"homepage": "http://rmcreative.ru/", {
"role": "Core framework development" "name": "Alexander Makarov",
}, "email": "sam@rmcreative.ru",
{ "homepage": "http://rmcreative.ru/",
"name": "Maurizio Domba", "role": "Core framework development"
"homepage": "http://mdomba.info/", },
"role": "Core framework development" {
}, "name": "Maurizio Domba",
{ "homepage": "http://mdomba.info/",
"name": "Carsten Brandt", "role": "Core framework development"
"email": "mail@cebe.cc", },
"homepage": "http://cebe.cc/", {
"role": "Core framework development" "name": "Carsten Brandt",
}, "email": "mail@cebe.cc",
{ "homepage": "http://cebe.cc/",
"name": "Timur Ruziev", "role": "Core framework development"
"email": "resurtm@gmail.com", },
"homepage": "http://resurtm.com/", {
"role": "Core framework development" "name": "Timur Ruziev",
}, "email": "resurtm@gmail.com",
{ "homepage": "http://resurtm.com/",
"name": "Paul Klimov", "role": "Core framework development"
"email": "klimov.paul@gmail.com", },
"role": "Core framework development" {
} "name": "Paul Klimov",
], "email": "klimov.paul@gmail.com",
"support": { "role": "Core framework development"
"issues": "https://github.com/yiisoft/yii2/issues?state=open", }
"forum": "http://www.yiiframework.com/forum/", ],
"wiki": "http://www.yiiframework.com/wiki/", "support": {
"irc": "irc://irc.freenode.net/yii", "issues": "https://github.com/yiisoft/yii2/issues?state=open",
"source": "https://github.com/yiisoft/yii2" "forum": "http://www.yiiframework.com/forum/",
}, "wiki": "http://www.yiiframework.com/wiki/",
"require": { "irc": "irc://irc.freenode.net/yii",
"php": ">=5.4.0", "source": "https://github.com/yiisoft/yii2"
"ext-mbstring": "*", },
"lib-pcre": "*", "require": {
"yiisoft/yii2-composer": "*", "php": ">=5.4.0",
"ezyang/htmlpurifier": "4.6.*", "ext-mbstring": "*",
"cebe/markdown": "0.9.*" "lib-pcre": "*",
}, "yiisoft/yii2-composer": "*",
"autoload": { "ezyang/htmlpurifier": "4.6.*",
"psr-4": { "yii\\": "" } "cebe/markdown": "0.9.*",
}, "bower-asset/jquery": ">=1.8",
"bin": [ "bower-asset/jquery.inputmask": ">=3.0.0",
"yii" "bower-asset/punycode": ">=1.3.0",
] "bower-asset/yii2-pjax": ">=2.0.0"
},
"autoload": {
"psr-4": {"yii\\": ""}
},
"bin": [
"yii"
]
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment