From 8bbcff70db9a7513e0a5f3916a9c7bbdc4d1c099 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sun, 13 Apr 2014 17:58:59 -0400 Subject: [PATCH] prepare for 2.0.0-beta release. --- apps/advanced/composer.json | 2 +- apps/basic/composer.json | 2 +- apps/benchmark/composer.json | 2 +- build/controllers/ReleaseController.php | 6 ------ extensions/apidoc/CHANGELOG.md | 4 ++-- extensions/authclient/CHANGELOG.md | 4 ++-- extensions/bootstrap/ActiveForm.php | 1 - extensions/bootstrap/CHANGELOG.md | 4 ++-- extensions/codeception/CHANGELOG.md | 4 ++-- extensions/composer/CHANGELOG.md | 4 ++-- extensions/debug/CHANGELOG.md | 4 ++-- extensions/elasticsearch/CHANGELOG.md | 4 ++-- extensions/faker/CHANGELOG.md | 4 ++-- extensions/gii/CHANGELOG.md | 4 ++-- extensions/imagine/CHANGELOG.md | 4 ++-- extensions/jui/CHANGELOG.md | 4 ++-- extensions/mongodb/CHANGELOG.md | 4 ++-- extensions/redis/CHANGELOG.md | 4 ++-- extensions/smarty/CHANGELOG.md | 4 ++-- extensions/sphinx/CHANGELOG.md | 4 ++-- extensions/swiftmailer/CHANGELOG.md | 4 ++-- extensions/twig/CHANGELOG.md | 4 ++-- framework/BaseYii.php | 2 +- framework/CHANGELOG.md | 4 ++-- framework/base/Application.php | 4 ++-- framework/db/Connection.php | 3 +-- 26 files changed, 43 insertions(+), 51 deletions(-) diff --git a/apps/advanced/composer.json b/apps/advanced/composer.json index 774497124cc..9f4d4449264 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": "dev", + "minimum-stability": "beta", "require": { "php": ">=5.4.0", "yiisoft/yii2": "*", diff --git a/apps/basic/composer.json b/apps/basic/composer.json index 726a7ea93d6..e879e6b3e42 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": "dev", + "minimum-stability": "beta", "require": { "php": ">=5.4.0", "yiisoft/yii2": "*", diff --git a/apps/benchmark/composer.json b/apps/benchmark/composer.json index c8ed58953a0..105469774ba 100644 --- a/apps/benchmark/composer.json +++ b/apps/benchmark/composer.json @@ -15,7 +15,7 @@ "config": { "vendor-dir": "protected/vendor" }, - "minimum-stability": "dev", + "minimum-stability": "beta", "require": { "php": ">=5.4.0", "yiisoft/yii2": "*" diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php index f5ccaa92f07..f6dcacf3805 100644 --- a/build/controllers/ReleaseController.php +++ b/build/controllers/ReleaseController.php @@ -32,7 +32,6 @@ public function actionPrepare($version) { $this->closeChangelogs($version); $this->composerSetStability($version); - $this->composerCreateLocks(); $this->updateYiiVersion($version); } @@ -107,11 +106,6 @@ protected function composerSetStability($version) ); } - protected function composerCreateLocks() - { - $this->confirm('Run composer update for each app and commit the composer.lock file. Hit enter when done.'); - } - protected function updateYiiVersion($version) { $this->sed( diff --git a/extensions/apidoc/CHANGELOG.md b/extensions/apidoc/CHANGELOG.md index 16875d20abe..37a351662c1 100644 --- a/extensions/apidoc/CHANGELOG.md +++ b/extensions/apidoc/CHANGELOG.md @@ -1,7 +1,7 @@ Yii Framework 2 apidoc extension Change Log =========================================== -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Initial release. diff --git a/extensions/authclient/CHANGELOG.md b/extensions/authclient/CHANGELOG.md index 975a6e9ddf2..c58e9764fbd 100644 --- a/extensions/authclient/CHANGELOG.md +++ b/extensions/authclient/CHANGELOG.md @@ -1,7 +1,7 @@ Yii Framework 2 authclient extension Change Log =============================================== -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Initial release. \ No newline at end of file diff --git a/extensions/bootstrap/ActiveForm.php b/extensions/bootstrap/ActiveForm.php index ae8b2989909..58bbf54bebd 100644 --- a/extensions/bootstrap/ActiveForm.php +++ b/extensions/bootstrap/ActiveForm.php @@ -41,7 +41,6 @@ * To get a different column layout in horizontal mode you can modify those options * through [[fieldConfig]]: * - * * ```php * $form = ActiveForm::begin([ * 'layout' => 'horizontal', diff --git a/extensions/bootstrap/CHANGELOG.md b/extensions/bootstrap/CHANGELOG.md index e73249eaf24..ee05e13ae5e 100644 --- a/extensions/bootstrap/CHANGELOG.md +++ b/extensions/bootstrap/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 bootstrap extension Change Log ============================================== -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Bug #2361: `yii\bootstrap\NavBar::brandUrl` should default to the home URL of application (qiangxue) - Enh #1474: Added option to make NavBar 100% width (cebe) diff --git a/extensions/codeception/CHANGELOG.md b/extensions/codeception/CHANGELOG.md index 0b09d7d8112..61cee68edaf 100644 --- a/extensions/codeception/CHANGELOG.md +++ b/extensions/codeception/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 Codeception extension Change Log ================================================ -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Initial release. - Enh: yii\codeception\TestCase now supports loading and using fixtures via Yii fixture framework (qiangxue) diff --git a/extensions/composer/CHANGELOG.md b/extensions/composer/CHANGELOG.md index 8d00d050751..fc852ebff09 100644 --- a/extensions/composer/CHANGELOG.md +++ b/extensions/composer/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 composer extension Change Log ============================================= -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Bug #1480: Fixed issue with creating extensions.php when php opcache is enabled (cebe) - Enh: Added support for installing packages conforming to PSR-4 standard (qiangxue) diff --git a/extensions/debug/CHANGELOG.md b/extensions/debug/CHANGELOG.md index 9f3a30f071d..2e51ddef008 100644 --- a/extensions/debug/CHANGELOG.md +++ b/extensions/debug/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 debug extension Change Log ========================================== -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Bug #1783: Using VarDumper::dumpAsString() instead var_export(), because var_export() does not handle circular references. (djagya) - Bug #1504: Debug toolbar isn't loaded successfully in some environments when xdebug is enabled (qiangxue) diff --git a/extensions/elasticsearch/CHANGELOG.md b/extensions/elasticsearch/CHANGELOG.md index 5a770550054..61632884ead 100644 --- a/extensions/elasticsearch/CHANGELOG.md +++ b/extensions/elasticsearch/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 elasticsearch extension Change Log ================================================== -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Bug #1993: afterFind event in AR is now called after relations have been populated (cebe, creocoder) - Bug #2324: Fixed QueryBuilder bug when building a query with "query" option (mintao) diff --git a/extensions/faker/CHANGELOG.md b/extensions/faker/CHANGELOG.md index 269f9288c6e..3b0b096fd3a 100644 --- a/extensions/faker/CHANGELOG.md +++ b/extensions/faker/CHANGELOG.md @@ -1,7 +1,7 @@ Yii Framework 2 faker extension Change Log ============================================== -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Initial release. \ No newline at end of file diff --git a/extensions/gii/CHANGELOG.md b/extensions/gii/CHANGELOG.md index 252daa0b0fe..d226af2b6ad 100644 --- a/extensions/gii/CHANGELOG.md +++ b/extensions/gii/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 gii extension Change Log ======================================== -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Bug #1405: fixed disambiguation of relation names generated by gii (qiangxue) - Bug #1904: Fixed autocomplete to work with underscore inputs "_" (tonydspaniard) diff --git a/extensions/imagine/CHANGELOG.md b/extensions/imagine/CHANGELOG.md index b751ac2cc25..09fbb5ab8db 100644 --- a/extensions/imagine/CHANGELOG.md +++ b/extensions/imagine/CHANGELOG.md @@ -1,7 +1,7 @@ Yii Framework 2 imagine extension Change Log ================================================ -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Initial release. diff --git a/extensions/jui/CHANGELOG.md b/extensions/jui/CHANGELOG.md index c644db6961a..8d5f34687b6 100644 --- a/extensions/jui/CHANGELOG.md +++ b/extensions/jui/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 jui extension Change Log ======================================== -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Bug #1550: fixed the issue that JUI input widgets did not property input IDs. (qiangxue) - Bug #2514: Jui sortable clientEvents were not working because of wrong naming assumptions. (cebe) diff --git a/extensions/mongodb/CHANGELOG.md b/extensions/mongodb/CHANGELOG.md index ab3154620a6..1bb11897e11 100644 --- a/extensions/mongodb/CHANGELOG.md +++ b/extensions/mongodb/CHANGELOG.md @@ -1,7 +1,7 @@ Yii Framework 2 mongodb extension Change Log ============================================ -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Initial release. diff --git a/extensions/redis/CHANGELOG.md b/extensions/redis/CHANGELOG.md index fd7f51b55c4..eabe47b1b74 100644 --- a/extensions/redis/CHANGELOG.md +++ b/extensions/redis/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 redis extension Change Log ========================================== -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Bug #1993: afterFind event in AR is now called after relations have been populated (cebe, creocoder) - Enh #1773: keyPrefix property of Session and Cache is not restricted to alnum characters anymore (cebe) diff --git a/extensions/smarty/CHANGELOG.md b/extensions/smarty/CHANGELOG.md index 8d907756f0f..1503c7ee150 100644 --- a/extensions/smarty/CHANGELOG.md +++ b/extensions/smarty/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 smarty extension Change Log =========================================== -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - no changes in this release. diff --git a/extensions/sphinx/CHANGELOG.md b/extensions/sphinx/CHANGELOG.md index d392d219a7e..bd1b2d6d990 100644 --- a/extensions/sphinx/CHANGELOG.md +++ b/extensions/sphinx/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 sphinx extension Change Log =========================================== -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Bug #1993: afterFind event in AR is now called after relations have been populated (cebe, creocoder) - Bug #2160: SphinxQL does not support `OFFSET` (qiangxue, romeo7) diff --git a/extensions/swiftmailer/CHANGELOG.md b/extensions/swiftmailer/CHANGELOG.md index a4468b75424..3c44ecdafe1 100644 --- a/extensions/swiftmailer/CHANGELOG.md +++ b/extensions/swiftmailer/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 swiftmailer extension Change Log ================================================ -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Bug #1817: Message charset not applied for alternative bodies (klimov-paul) diff --git a/extensions/twig/CHANGELOG.md b/extensions/twig/CHANGELOG.md index f92daecb2a2..505117f9adc 100644 --- a/extensions/twig/CHANGELOG.md +++ b/extensions/twig/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 twig extension Change Log ========================================= -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Add File based Twig loader for better caching and usability of twig's file based function (dev-mraj, samdark) diff --git a/framework/BaseYii.php b/framework/BaseYii.php index bfe0240b77d..3370af6c20c 100644 --- a/framework/BaseYii.php +++ b/framework/BaseYii.php @@ -92,7 +92,7 @@ class BaseYii */ public static function getVersion() { - return '2.0.0-dev'; + return '2.0.0-beta'; } /** diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index e0c6701433f..f05866ef27a 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 Change Log ========================== -2.0.0 beta under development ----------------------------- +2.0.0-beta April 13, 2014 +------------------------- - Bug #1265: AssetController does not override 'js' and 'css' for compressed bundles (klimov-paul) - Bug #1326: The `visible` setting for `DetailView` doesn't work as expected (qiangxue) diff --git a/framework/base/Application.php b/framework/base/Application.php index f385708ff71..dc656ef134b 100644 --- a/framework/base/Application.php +++ b/framework/base/Application.php @@ -13,8 +13,8 @@ * Application is the base class for all application classes. * * @property \yii\web\AssetManager $assetManager The asset manager component. This property is read-only. - * @property \yii\rbac\ManagerInterface $authManager The auth manager for this application. Null is returned if auth - * manager is not configured. This property is read-only. + * @property \yii\rbac\ManagerInterface $authManager The auth manager for this application. Null is returned + * if auth manager is not configured. This property is read-only. * @property string $basePath The root directory of the application. * @property \yii\caching\Cache $cache The cache application component. Null if the component is not enabled. * This property is read-only. diff --git a/framework/db/Connection.php b/framework/db/Connection.php index 45fdf795721..7e999cd0fc9 100644 --- a/framework/db/Connection.php +++ b/framework/db/Connection.php @@ -89,8 +89,7 @@ * ] * ~~~ * - * @property string $driverName Name of the DB driver. Change this property if you want to override the - * driver name specified in [[dsn]]. This can be useful if you're working with the database via ODBC layer. + * @property string $driverName Name of the DB driver. * @property boolean $isActive Whether the DB connection is established. This property is read-only. * @property string $lastInsertID The row ID of the last row inserted, or the last value retrieved from the * sequence object. This property is read-only.