Skip to content

Y
yii2
Commit 3697682a by Qiang Xue
Options

Merge branch 'master' of git://github.com/yiisoft/yii2

parents 34a2c590 1e5c4895
Showing with 446 additions and 363 deletions
apps/advanced/composer.json
...@@ -17,10 +17,7 @@ ...@@ -17,10 +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-asset/jquery": "@stable",
"bower-asset/jquery-ui": "@stable",
"bower-asset/jquery.inputmask": "@stable"
}, },
"require-dev": { "require-dev": {
"yiisoft/yii2-codeception": "*", "yiisoft/yii2-codeception": "*",
......
apps/basic/composer.json
...@@ -17,10 +17,7 @@ ...@@ -17,10 +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-asset/jquery": "@stable",
"bower-asset/jquery-ui": "@stable",
"bower-asset/jquery.inputmask": "@stable"
}, },
"require-dev": { "require-dev": {
"yiisoft/yii2-codeception": "*", "yiisoft/yii2-codeception": "*",
......
composer.json
...@@ -78,13 +78,13 @@ ...@@ -78,13 +78,13 @@
"yiisoft/yii2-composer": "*", "yiisoft/yii2-composer": "*",
"ezyang/htmlpurifier": "4.6.*", "ezyang/htmlpurifier": "4.6.*",
"cebe/markdown": "0.9.*", "cebe/markdown": "0.9.*",
"bower-asset/jquery": "~1.11 | ~2.1", "bower-asset/jquery": "2.1.*@stable | ~2.1@stable | ~1.11@stable",
"bower-asset/jquery.inputmask": "~3.1", "bower-asset/jquery.inputmask": "3.1.* | ~3.1",
"bower-asset/punycode": "~1.3", "bower-asset/punycode": "1.3.* | ~1.3",
"bower-asset/yii2-pjax": "~2.0", "bower-asset/yii2-pjax": "2.0.* | ~2.0",
"bower-asset/bootstrap": "~3.2", "bower-asset/bootstrap": "3.2.* | ~3.1",
"bower-asset/jquery-ui": "~1.11", "bower-asset/jquery-ui": "1.11.*@stable | ~1.11@stable",
"bower-asset/typeahead.js": "~0.10" "bower-asset/typeahead.js": "0.10.* | ~0.10"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "3.7.*", "phpunit/phpunit": "3.7.*",
...@@ -134,6 +134,9 @@ ...@@ -134,6 +134,9 @@
"framework/yii" "framework/yii"
], ],
"extra": { "extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
},
"asset-installer-paths": { "asset-installer-paths": {
"npm-asset-library": "vendor/npm", "npm-asset-library": "vendor/npm",
"bower-asset-library": "vendor/bower" "bower-asset-library": "vendor/bower"
......
extensions/apidoc/composer.json
{ {
"name": "yiisoft/yii2-apidoc", "name": "yiisoft/yii2-apidoc",
"description": "API Documentation generator for the Yii framework 2.0", "description": "API Documentation generator for the Yii framework 2.0",
"keywords": ["yii2", "phpdoc", "apidoc", "api", "documentation"], "keywords": ["yii2", "phpdoc", "apidoc", "api", "documentation"],
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Aapidoc", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Aapidoc",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"authors": [ "authors": [
{ {
"name": "Carsten Brandt", "name": "Carsten Brandt",
"email": "mail@cebe.cc" "email": "mail@cebe.cc"
} }
], ],
"minimum-stability": "dev", "minimum-stability": "dev",
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"yiisoft/yii2-bootstrap": "*", "yiisoft/yii2-bootstrap": "*",
"phpdocumentor/reflection": ">=1.0.3", "phpdocumentor/reflection": ">=1.0.3",
"phpdocumentor/reflection-docblock": ">2.0.1", "phpdocumentor/reflection-docblock": ">2.0.1",
"nikic/php-parser": "0.9.*", "nikic/php-parser": "0.9.*",
"cebe/js-search": "*", "cebe/js-search": "*",
"cebe/markdown": "dev-master as 0.9.0", "cebe/markdown": "dev-master as 0.9.0",
"cebe/markdown-latex": "*" "cebe/markdown-latex": "*"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\apidoc\\": "" } "psr-4": { "yii\\apidoc\\": "" }
}, },
"bin": ["apidoc"], "bin": ["apidoc"],
"extra": { "extra": {
"asset-installer-paths": { "branch-alias": {
"npm-asset-library": "vendor/npm", "dev-master": "2.0.x-dev"
"bower-asset-library": "vendor/bower" },
} "asset-installer-paths": {
} "npm-asset-library": "vendor/npm",
"bower-asset-library": "vendor/bower"
}
}
} }
extensions/authclient/composer.json
{ {
"name": "yiisoft/yii2-authclient", "name": "yiisoft/yii2-authclient",
"description": "External authentication via OAuth and OpenID for the Yii framework", "description": "External authentication via OAuth and OpenID for the Yii framework",
"keywords": ["yii2", "OAuth", "OpenID", "auth"], "keywords": ["yii2", "OAuth", "OpenID", "auth"],
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?state=open", "issues": "https://github.com/yiisoft/yii2/issues?state=open",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"authors": [ "authors": [
{ {
"name": "Paul Klimov", "name": "Paul Klimov",
"email": "klimov.paul@gmail.com" "email": "klimov.paul@gmail.com"
} }
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"ext-curl": "*" "ext-curl": "*"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\authclient\\": "" } "psr-4": { "yii\\authclient\\": "" }
} },
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
}
} }
extensions/bootstrap/composer.json
...@@ -19,11 +19,16 @@ ...@@ -19,11 +19,16 @@
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"bower-asset/bootstrap": "~3.2" "bower-asset/bootstrap": "3.2.* | ~3.1"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"yii\\bootstrap\\": "" "yii\\bootstrap\\": ""
} }
},
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
} }
} }
extensions/codeception/composer.json
{ {
"name": "yiisoft/yii2-codeception", "name": "yiisoft/yii2-codeception",
"description": "The Codeception integration for the Yii framework", "description": "The Codeception integration for the Yii framework",
"keywords": ["yii2", "codeception"], "keywords": ["yii2", "codeception"],
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"authors": [ "authors": [
{ {
"name": "Mark Jebri", "name": "Mark Jebri",
"email": "mark.github@yandex.ru" "email": "mark.github@yandex.ru"
} }
], ],
"require": { "require": {
"yiisoft/yii2": "*" "yiisoft/yii2": "*"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\codeception\\": "" } "psr-4": { "yii\\codeception\\": "" }
} },
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
}
} }
extensions/composer/composer.json
{ {
"name": "yiisoft/yii2-composer", "name": "yiisoft/yii2-composer",
"description": "The composer plugin for Yii extension installer", "description": "The composer plugin for Yii extension installer",
"keywords": ["yii2", "composer", "extension installer"], "keywords": ["yii2", "composer", "extension installer"],
"type": "composer-plugin", "type": "composer-plugin",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?state=open", "issues": "https://github.com/yiisoft/yii2/issues?state=open",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"authors": [ "authors": [
{ {
"name": "Qiang Xue", "name": "Qiang Xue",
"email": "qiang.xue@gmail.com" "email": "qiang.xue@gmail.com"
} }
], ],
"autoload": { "require": {
"psr-4": { "yii\\composer\\": "" } "composer-plugin-api": "1.0.0"
}, },
"extra": { "autoload": {
"class": "yii\\composer\\Plugin" "psr-4": { "yii\\composer\\": "" }
}, },
"require": { "extra": {
"composer-plugin-api": "1.0.0" "class": "yii\\composer\\Plugin",
} "branch-alias": {
"dev-master": "2.0.x-dev"
}
}
} }
extensions/debug/composer.json
...@@ -25,5 +25,10 @@ ...@@ -25,5 +25,10 @@
"psr-4": { "psr-4": {
"yii\\debug\\": "" "yii\\debug\\": ""
} }
},
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
} }
} }
extensions/elasticsearch/composer.json
{ {
"name": "yiisoft/yii2-elasticsearch", "name": "yiisoft/yii2-elasticsearch",
"description": "Elasticsearch integration and ActiveRecord for the Yii framework", "description": "Elasticsearch integration and ActiveRecord for the Yii framework",
"keywords": ["yii2", "elasticsearch", "active-record", "search", "fulltext"], "keywords": ["yii2", "elasticsearch", "active-record", "search", "fulltext"],
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Aelasticsearch", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Aelasticsearch",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"authors": [ "authors": [
{ {
"name": "Carsten Brandt", "name": "Carsten Brandt",
"email": "mail@cebe.cc" "email": "mail@cebe.cc"
} }
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"ext-curl": "*" "ext-curl": "*"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\elasticsearch\\": "" } "psr-4": { "yii\\elasticsearch\\": "" }
} },
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
}
} }
extensions/faker/composer.json
{ {
"name": "yiisoft/yii2-faker", "name": "yiisoft/yii2-faker",
"description": "Fixture generator. The Faker integration for the Yii framework.", "description": "Fixture generator. The Faker integration for the Yii framework.",
"keywords": ["yii2", "faker", "fixture"], "keywords": ["yii2", "faker", "fixture"],
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"authors": [ "authors": [
{ {
"name": "Mark Jebri", "name": "Mark Jebri",
"email": "mark.github@yandex.ru" "email": "mark.github@yandex.ru"
} }
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"fzaninotto/faker": "*" "fzaninotto/faker": "*"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\faker\\": "" } "psr-4": { "yii\\faker\\": "" }
} },
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
}
} }
extensions/gii/composer.json
...@@ -21,11 +21,16 @@ ...@@ -21,11 +21,16 @@
"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" "bower-asset/typeahead.js": "0.10.* | ~0.10"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"yii\\gii\\": "" "yii\\gii\\": ""
} }
},
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
} }
} }
extensions/imagine/composer.json
{ {
"name": "yiisoft/yii2-imagine", "name": "yiisoft/yii2-imagine",
"description": "The Imagine integration for the Yii framework", "description": "The Imagine integration for the Yii framework",
"keywords": ["yii2", "imagine", "image", "helper"], "keywords": ["yii2", "imagine", "image", "helper"],
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Aimagine", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Aimagine",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"authors": [ "authors": [
{ {
"name": "Antonio Ramirez", "name": "Antonio Ramirez",
"email": "amigo.cobos@gmail.com" "email": "amigo.cobos@gmail.com"
} }
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"imagine/imagine": "v0.5.0" "imagine/imagine": "v0.5.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"yii\\imagine\\": "" "yii\\imagine\\": ""
} }
} },
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
}
} }
extensions/jui/composer.json
...@@ -19,11 +19,16 @@ ...@@ -19,11 +19,16 @@
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"bower-asset/jquery-ui": "~1.11" "bower-asset/jquery-ui": "1.11.*@stable | ~1.11@stable"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"yii\\jui\\": "" "yii\\jui\\": ""
} }
},
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
} }
} }
extensions/mongodb/composer.json
{ {
"name": "yiisoft/yii2-mongodb", "name": "yiisoft/yii2-mongodb",
"description": "MongoDb extension for the Yii framework", "description": "MongoDb extension for the Yii framework",
"keywords": ["yii2", "mongo", "mongodb", "active-record"], "keywords": ["yii2", "mongo", "mongodb", "active-record"],
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?state=open", "issues": "https://github.com/yiisoft/yii2/issues?state=open",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"authors": [ "authors": [
{ {
"name": "Paul Klimov", "name": "Paul Klimov",
"email": "klimov.paul@gmail.com" "email": "klimov.paul@gmail.com"
} }
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"ext-mongo": ">=1.3.0" "ext-mongo": ">=1.3.0"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\mongodb\\": "" } "psr-4": { "yii\\mongodb\\": "" }
} },
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
}
} }
extensions/redis/composer.json
{ {
"name": "yiisoft/yii2-redis", "name": "yiisoft/yii2-redis",
"description": "Redis Cache, Session and ActiveRecord for the Yii framework", "description": "Redis Cache, Session and ActiveRecord for the Yii framework",
"keywords": ["yii2", "redis", "active-record", "cache", "session"], "keywords": ["yii2", "redis", "active-record", "cache", "session"],
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Aredis", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Aredis",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"authors": [ "authors": [
{ {
"name": "Carsten Brandt", "name": "Carsten Brandt",
"email": "mail@cebe.cc" "email": "mail@cebe.cc"
} }
], ],
"require": { "require": {
"yiisoft/yii2": "*" "yiisoft/yii2": "*"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\redis\\": "" } "psr-4": { "yii\\redis\\": "" }
} },
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
}
} }
extensions/smarty/composer.json
{ {
"name": "yiisoft/yii2-smarty", "name": "yiisoft/yii2-smarty",
"description": "The Smarty integration for the Yii framework", "description": "The Smarty integration for the Yii framework",
"keywords": ["yii2", "smarty", "renderer"], "keywords": ["yii2", "smarty", "renderer"],
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Asmarty", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Asmarty",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"authors": [ "authors": [
{ {
"name": "Alexander Makarov", "name": "Alexander Makarov",
"email": "sam@rmcreative.ru" "email": "sam@rmcreative.ru"
} }
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"smarty/smarty": "*" "smarty/smarty": "*"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\smarty\\": "" } "psr-4": { "yii\\smarty\\": "" }
} },
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
}
} }
extensions/sphinx/composer.json
{ {
"name": "yiisoft/yii2-sphinx", "name": "yiisoft/yii2-sphinx",
"description": "Sphinx full text search engine extension for the Yii framework", "description": "Sphinx full text search engine extension for the Yii framework",
"keywords": ["yii2", "sphinx", "active-record", "search", "fulltext"], "keywords": ["yii2", "sphinx", "active-record", "search", "fulltext"],
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Asphinx", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Asphinx",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"authors": [ "authors": [
{ {
"name": "Paul Klimov", "name": "Paul Klimov",
"email": "klimov.paul@gmail.com" "email": "klimov.paul@gmail.com"
} }
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"ext-pdo": "*", "ext-pdo": "*",
"ext-pdo_mysql": "*" "ext-pdo_mysql": "*"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\sphinx\\": "" } "psr-4": { "yii\\sphinx\\": "" }
} },
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
}
} }
extensions/swiftmailer/composer.json
{ {
"name": "yiisoft/yii2-swiftmailer", "name": "yiisoft/yii2-swiftmailer",
"description": "The SwiftMailer integration for the Yii framework", "description": "The SwiftMailer integration for the Yii framework",
"keywords": ["yii2", "swift", "swiftmailer", "mail", "email", "mailer"], "keywords": ["yii2", "swift", "swiftmailer", "mail", "email", "mailer"],
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Aswiftmailer", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Aswiftmailer",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"authors": [ "authors": [
{ {
"name": "Paul Klimov", "name": "Paul Klimov",
"email": "klimov.paul@gmail.com" "email": "klimov.paul@gmail.com"
} }
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"swiftmailer/swiftmailer": "*" "swiftmailer/swiftmailer": "*"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\swiftmailer\\": "" } "psr-4": { "yii\\swiftmailer\\": "" }
} },
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
}
} }
extensions/twig/composer.json
{ {
"name": "yiisoft/yii2-twig", "name": "yiisoft/yii2-twig",
"description": "The Twig integration for the Yii framework", "description": "The Twig integration for the Yii framework",
"keywords": ["yii2", "twig", "renderer"], "keywords": ["yii2", "twig", "renderer"],
"type": "yii2-extension", "type": "yii2-extension",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"support": { "support": {
"issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Atwig", "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Atwig",
"forum": "http://www.yiiframework.com/forum/", "forum": "http://www.yiiframework.com/forum/",
"wiki": "http://www.yiiframework.com/wiki/", "wiki": "http://www.yiiframework.com/wiki/",
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"authors": [ "authors": [
{ {
"name": "Alexander Makarov", "name": "Alexander Makarov",
"email": "sam@rmcreative.ru" "email": "sam@rmcreative.ru"
} }
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"twig/twig": "*" "twig/twig": "*"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\twig\\": "" } "psr-4": { "yii\\twig\\": "" }
} },
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
}
} }
framework/composer.json
...@@ -58,15 +58,20 @@ ...@@ -58,15 +58,20 @@
"yiisoft/yii2-composer": "*", "yiisoft/yii2-composer": "*",
"ezyang/htmlpurifier": "4.6.*", "ezyang/htmlpurifier": "4.6.*",
"cebe/markdown": "0.9.*", "cebe/markdown": "0.9.*",
"bower-asset/jquery": "~1.11 | ~2.1", "bower-asset/jquery": "2.1.*@stable | ~2.1@stable | ~1.11@stable",
"bower-asset/jquery.inputmask": "~3.1", "bower-asset/jquery.inputmask": "3.1.* | ~3.1",
"bower-asset/punycode": "~1.3", "bower-asset/punycode": "1.3.* | ~1.3",
"bower-asset/yii2-pjax": "~2.0" "bower-asset/yii2-pjax": "2.0.* | ~2.0"
}, },
"autoload": { "autoload": {
"psr-4": {"yii\\": ""} "psr-4": {"yii\\": ""}
}, },
"bin": [ "bin": [
"yii" "yii"
] ],
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
}
} }
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