From 3822ffd16a0658bdcdf9cafbd1dd3ad242df125d Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sun, 1 Dec 2013 13:43:09 -0500 Subject: [PATCH] prepare for next release. --- apps/advanced/composer.json | 2 +- apps/basic/composer.json | 2 +- apps/benchmark/composer.json | 2 +- framework/CHANGELOG.md | 6 +++++- framework/yii/BaseYii.php | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/advanced/composer.json b/apps/advanced/composer.json index c6535c4..72268b4 100644 --- a/apps/advanced/composer.json +++ b/apps/advanced/composer.json @@ -12,7 +12,7 @@ "irc": "irc://irc.freenode.net/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "alpha", + "minimum-stability": "dev", "require": { "php": ">=5.4.0", "yiisoft/yii2": "*", diff --git a/apps/basic/composer.json b/apps/basic/composer.json index 80875b8..a794341 100644 --- a/apps/basic/composer.json +++ b/apps/basic/composer.json @@ -12,7 +12,7 @@ "irc": "irc://irc.freenode.net/yii", "source": "https://github.com/yiisoft/yii2" }, - "minimum-stability": "alpha", + "minimum-stability": "dev", "require": { "php": ">=5.4.0", "yiisoft/yii2": "*", diff --git a/apps/benchmark/composer.json b/apps/benchmark/composer.json index cffcd9a..d980f9a 100644 --- a/apps/benchmark/composer.json +++ b/apps/benchmark/composer.json @@ -15,7 +15,7 @@ "config": { "vendor-dir": "protected/vendor" }, - "minimum-stability": "alpha", + "minimum-stability": "dev", "require": { "php": ">=5.4.0", "yiisoft/yii2": "*" diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 8e4a1fd..c460706 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -1,7 +1,11 @@ Yii Framework 2 Change Log ========================== -2.0 alpha, December 1, 2013 +2.0.0 beta under development +---------------------------- + + +2.0.0 alpha, December 1, 2013 --------------------------- - Initial release. diff --git a/framework/yii/BaseYii.php b/framework/yii/BaseYii.php index 073476f..9343764 100644 --- a/framework/yii/BaseYii.php +++ b/framework/yii/BaseYii.php @@ -104,7 +104,7 @@ class BaseYii */ public static function getVersion() { - return '2.0.0-alpha'; + return '2.0.0-dev'; } /**