php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-26 20:00:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adjusted dependency versions to stable ones.

Browse Source
This commit is contained in:
Qiang Xue
2014-09-18 23:09:45 -04:00
parent 45a748a2d4
commit a81969950d
7 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
composer.json
View File

@@ -76,15 +76,15 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"lib-pcre": "*", "lib-pcre": "*",
"yiisoft/yii2-composer": "*", "yiisoft/yii2-composer": "*",
"yiisoft/jquery": "~2.0 | ~1.10",
"ezyang/htmlpurifier": "4.6.*", "ezyang/htmlpurifier": "4.6.*",
"cebe/markdown": "0.9.*", "cebe/markdown": "0.9.*",
"bower-asset/jquery": ">=1.8", "bower-asset/jquery": "1.11.* | 2.1.*",
"bower-asset/jquery.inputmask": ">=3.0.0", "bower-asset/jquery.inputmask": "3.1.*",
"bower-asset/punycode": ">=1.3.0", "bower-asset/punycode": "1.3.*",
"bower-asset/yii2-pjax": ">=2.0.0", "bower-asset/yii2-pjax": "2.0.*",
"bower-asset/bootstrap": ">=3.0.0", "bower-asset/bootstrap": "3.2.*",
"bower-asset/jquery-ui": ">=1.10.0" "bower-asset/jquery-ui": "1.11.*",
"bower-asset/typeahead.js": "0.10.*"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "3.7.*", "phpunit/phpunit": "3.7.*",

11
extensions/README.md
View File

@@ -9,7 +9,10 @@ To add a new extension named `xyz` (must be in lower case), take the following s
* `CHANGELOG.md` * `CHANGELOG.md`
* `LICENSE.md` * `LICENSE.md`
3. ask Qiang to create a subsplit for `xyz` and a composer package named `yii2-xyz`; 3. ask Qiang to create a subsplit for `xyz` and a composer package named `yii2-xyz`;
4. modify `/composer.json` and add `yiisoft/yii2-xyz` to the `replace` section; 4. If an extension depends on external bower/npm packages:
5. If an extension contains js/css files or depends on external bower packages: * in the `composer.json` file of the extension, list the dependencies in the format of `'bower-asset/PackageName': '1.1'`;
* create `bower.json` * create an asset bundle class to list the needed js/css files from the package. The `sourcePath`
* ask Qiang to register a bower package with the name `yii2-xyz` property of the bundle should point to the distribution path of the package, such as
`@bower/PackageName`, or `@bower/PackageName/dist`.
5. modify `/composer.json` and add `yiisoft/yii2-xyz` to the `replace` section. Also add any bower/npm
dependencies to the `require` section.

2
extensions/bootstrap/composer.json
View File

@@ -19,7 +19,7 @@
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"bower-asset/bootstrap": ">=3.0.0" "bower-asset/bootstrap": "3.2.*"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
extensions/gii/composer.json
View File

@@ -21,7 +21,7 @@
"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" "bower-asset/typeahead.js": "0.10.*"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
extensions/jui/composer.json
View File

@@ -19,7 +19,7 @@
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"bower-asset/jquery-ui": ">=1.10.0" "bower-asset/jquery-ui": "1.11.*"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

9
framework/composer.json
View File

@@ -56,13 +56,12 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"lib-pcre": "*", "lib-pcre": "*",
"yiisoft/yii2-composer": "*", "yiisoft/yii2-composer": "*",
"yiisoft/jquery": "~2.0 | ~1.10",
"ezyang/htmlpurifier": "4.6.*", "ezyang/htmlpurifier": "4.6.*",
"cebe/markdown": "0.9.*", "cebe/markdown": "0.9.*",
"bower-asset/jquery": ">=1.8", "bower-asset/jquery": "1.11.* | 2.1.*",
"bower-asset/jquery.inputmask": ">=3.0.0", "bower-asset/jquery.inputmask": "3.1.*",
"bower-asset/punycode": ">=1.3.0", "bower-asset/punycode": "1.3.*",
"bower-asset/yii2-pjax": ">=2.0.0" "bower-asset/yii2-pjax": "2.0.*"
}, },
"autoload": { "autoload": {
"psr-4": {"yii\\": ""} "psr-4": {"yii\\": ""}

2
framework/web/JqueryAsset.php
View File

@@ -15,7 +15,7 @@ namespace yii\web;
*/ */
class JqueryAsset extends AssetBundle class JqueryAsset extends AssetBundle
{ {
public $sourcePath = '@vendor/yiisoft/jquery'; public $sourcePath = '@bower/jquery/dist';
public $js = [ public $js = [
'jquery.js', 'jquery.js',
]; ];