From d2b864da84a68d56a96709479af78d203f050451 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sat, 27 Sep 2014 21:59:54 -0400 Subject: [PATCH] prepare for 2.0.0-rc release. --- apps/advanced/composer.json | 2 +- apps/basic/composer.json | 2 +- apps/benchmark/composer.json | 2 +- docs/guide/widget-bootstrap.md | 1 - extensions/apidoc/CHANGELOG.md | 4 +-- extensions/authclient/CHANGELOG.md | 4 +-- extensions/bootstrap/BootstrapThemeAsset.php | 27 ------------------- 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/faker/FixtureController.php | 8 +++--- 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/classes.php | 6 +++++ framework/console/Controller.php | 3 +++ .../console/controllers/CacheController.php | 6 ++--- .../console/controllers/FixtureController.php | 4 +-- framework/db/Connection.php | 2 -- framework/i18n/Formatter.php | 4 +-- framework/test/ArrayFixture.php | 2 +- framework/web/AssetManager.php | 3 +++ framework/web/Request.php | 1 - framework/web/Response.php | 1 + 35 files changed, 66 insertions(+), 82 deletions(-) delete mode 100644 extensions/bootstrap/BootstrapThemeAsset.php diff --git a/apps/advanced/composer.json b/apps/advanced/composer.json index 14487e3ccb..453b8c6f25 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": "RC", "require": { "php": ">=5.4.0", "yiisoft/yii2": "*", diff --git a/apps/basic/composer.json b/apps/basic/composer.json index 56756ec817..e56ed648d0 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": "RC", "require": { "php": ">=5.4.0", "yiisoft/yii2": "*", diff --git a/apps/benchmark/composer.json b/apps/benchmark/composer.json index c8ed58953a..92d97ca718 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": "RC", "require": { "php": ">=5.4.0", "yiisoft/yii2": "*" diff --git a/docs/guide/widget-bootstrap.md b/docs/guide/widget-bootstrap.md index 8db664ce1b..40771e2d9b 100644 --- a/docs/guide/widget-bootstrap.md +++ b/docs/guide/widget-bootstrap.md @@ -24,7 +24,6 @@ convenient way to include bootstrap assets in your pages with a single line adde public $depends = [ 'yii\web\YiiAsset', 'yii\bootstrap\BootstrapAsset', // this line - // 'yii\bootstrap\BootstrapThemeAsset' // uncomment to apply bootstrap 2 style to bootstrap 3 ]; ``` diff --git a/extensions/apidoc/CHANGELOG.md b/extensions/apidoc/CHANGELOG.md index be56c3f858..6b81be6d62 100644 --- a/extensions/apidoc/CHANGELOG.md +++ b/extensions/apidoc/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 apidoc extension Change Log =========================================== -2.0.0-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - no changes in this release. diff --git a/extensions/authclient/CHANGELOG.md b/extensions/authclient/CHANGELOG.md index 3f3b66eb10..e5b4528008 100644 --- a/extensions/authclient/CHANGELOG.md +++ b/extensions/authclient/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 authclient extension Change Log =============================================== -2.0.0-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - Bug #3633: OpenId return URL comparison advanced to prevent url encode problem (klimov-paul) - Bug #4490: `yii\authclient\widgets\AuthChoice` does not preserve initial settings while opening popup (klimov-paul) diff --git a/extensions/bootstrap/BootstrapThemeAsset.php b/extensions/bootstrap/BootstrapThemeAsset.php deleted file mode 100644 index 60747a9059..0000000000 --- a/extensions/bootstrap/BootstrapThemeAsset.php +++ /dev/null @@ -1,27 +0,0 @@ - - * @since 2.0 - */ -class BootstrapThemeAsset extends AssetBundle -{ - public $sourcePath = '@bower/bootstrap/dist'; - public $css = [ - 'css/bootstrap-theme.css', - ]; - public $depends = [ - 'yii\bootstrap\BootstrapAsset', - ]; -} diff --git a/extensions/bootstrap/CHANGELOG.md b/extensions/bootstrap/CHANGELOG.md index 82b040a977..0828758ef1 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-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - Bug #3292: Fixed dropdown widgets rendering incorrect HTML (it3rmit) - Bug #3740: Fixed duplicate error message when client validation is enabled (tadaszelvys) diff --git a/extensions/codeception/CHANGELOG.md b/extensions/codeception/CHANGELOG.md index 8aa8ee2f49..caac140c6c 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-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - no changes in this release. diff --git a/extensions/composer/CHANGELOG.md b/extensions/composer/CHANGELOG.md index d65e6a21da..955da3fb29 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-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - Bug #3438: Fixed support for non-lowercase package names (cebe) - Chg: Added `yii\composer\Installer::postCreateProject()` and modified the syntax of calling installer methods in composer.json (qiangxue) diff --git a/extensions/debug/CHANGELOG.md b/extensions/debug/CHANGELOG.md index 99525facf4..1a3212fb7c 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-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - Bug #1263: Fixed the issue that Gii and Debug modules might be affected by incompatible asset manager configuration (qiangxue) - Bug #3956: Debug toolbar was affecting flash message removal (samdark) diff --git a/extensions/elasticsearch/CHANGELOG.md b/extensions/elasticsearch/CHANGELOG.md index 70085163ca..749fd7033a 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-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - Bug #3587: Fixed an issue with storing empty records (cebe) - Bug #4187: Elasticsearch dynamic scripting is disabled in 1.2.0, so do not use it in query builder (cebe) diff --git a/extensions/faker/CHANGELOG.md b/extensions/faker/CHANGELOG.md index 4125281cd9..2287401086 100644 --- a/extensions/faker/CHANGELOG.md +++ b/extensions/faker/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 faker extension Change Log ============================================== -2.0.0-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - Chg #4622: Simplified the way of creating a Faker fixture template file (qiangxue) diff --git a/extensions/faker/FixtureController.php b/extensions/faker/FixtureController.php index ba3c50ddc1..4c5a191bc9 100644 --- a/extensions/faker/FixtureController.php +++ b/extensions/faker/FixtureController.php @@ -101,20 +101,20 @@ use yii\helpers\VarDumper; * //list all templates under specified template path * yii fixture/templates --templatePath='@app/path/to/my/custom/templates' * ~~~ - * + * * You also can create your own data providers for custom tables fields, see Faker library guide for more info (https://github.com/fzaninotto/Faker); * After you created custom provider, for example: * * ~~~ * class Book extends \Faker\Provider\Base * { - * + * * public function title($nbWords = 5) * { * $sentence = $this->generator->sentence($nbWords); * return mb_substr($sentence, 0, mb_strlen($sentence) - 1); * } - * + * * } * ~~~ * @@ -131,6 +131,8 @@ use yii\helpers\VarDumper; * ], * ~~~ * + * @property \Faker\Generator $generator This property is read-only. + * * @author Mark Jebri * @since 2.0.0 */ diff --git a/extensions/gii/CHANGELOG.md b/extensions/gii/CHANGELOG.md index f435c74291..89ae430ebf 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-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - Bug #1263: Fixed the issue that Gii and Debug modules might be affected by incompatible asset manager configuration (qiangxue) - Bug #2314: Gii model generator does not generate correct relation type in some special case (qiangxue) diff --git a/extensions/imagine/CHANGELOG.md b/extensions/imagine/CHANGELOG.md index 0b92a9bf5e..f01478f5d2 100644 --- a/extensions/imagine/CHANGELOG.md +++ b/extensions/imagine/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 imagine extension Change Log ================================================ -2.0.0-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - no changes in this release. diff --git a/extensions/jui/CHANGELOG.md b/extensions/jui/CHANGELOG.md index 76d0fd583e..48f5602b29 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-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - Chg #1551: Jui datepicker has a new property `$dateFormat` which is used to set the clientOption `dateFormat`. The new property does not use the datepicker formatting synax anymore but uses the same as the `yii\i18n\Formatter` diff --git a/extensions/mongodb/CHANGELOG.md b/extensions/mongodb/CHANGELOG.md index addd5c90b3..c556996691 100644 --- a/extensions/mongodb/CHANGELOG.md +++ b/extensions/mongodb/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 mongodb extension Change Log ============================================ -2.0.0-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - Bug #2337: `yii\mongodb\Collection::buildLikeCondition()` fixed to escape regular expression (klimov-paul) - Bug #3385: Fixed "The 'connected' property is deprecated" (samdark) diff --git a/extensions/redis/CHANGELOG.md b/extensions/redis/CHANGELOG.md index da24e9228e..faf6045d0a 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-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - Bug #1311: Fixed storage and finding of `null` and boolean values (samdark, cebe) - Enh #3520: Added `unlinkAll()`-method to active record to remove all records of a model relation (NmDimas, samdark, cebe) diff --git a/extensions/smarty/CHANGELOG.md b/extensions/smarty/CHANGELOG.md index 6a92c4e457..c0afb41bac 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-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - Enh #4619 (samdark, hwmaier) - New functions: diff --git a/extensions/sphinx/CHANGELOG.md b/extensions/sphinx/CHANGELOG.md index 4667822c6a..9eb1e7d728 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-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - Bug #3668: Escaping of the special characters at 'MATCH' statement added (klimov-paul) - Bug #4018: AR relation eager loading does not work with db models (klimov-paul) diff --git a/extensions/swiftmailer/CHANGELOG.md b/extensions/swiftmailer/CHANGELOG.md index 31c5c77e4b..70543d08db 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-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - no changes in this release. diff --git a/extensions/twig/CHANGELOG.md b/extensions/twig/CHANGELOG.md index 8ecad9a7b2..1353525db0 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-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - Bug #2925: Fixed throwing exception when accessing AR property with null value (samdark) - Bug #3767: Fixed repeated adding of extensions when using config. One may now pass extension instances as well (grachov) diff --git a/framework/BaseYii.php b/framework/BaseYii.php index 27acded22f..adfb969a26 100644 --- a/framework/BaseYii.php +++ b/framework/BaseYii.php @@ -93,7 +93,7 @@ class BaseYii */ public static function getVersion() { - return '2.0.0-dev'; + return '2.0.0-rc'; } /** diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index da94a1aca1..5ca4a8b649 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 Change Log ========================== -2.0.0-rc under development --------------------------- +2.0.0-rc September 27, 2014 +--------------------------- - Bug #1263: Fixed the issue that Gii and Debug modules might be affected by incompatible asset manager configuration (qiangxue) - Bug #2314: Gii model generator does not generate correct relation type in some special case (qiangxue) diff --git a/framework/classes.php b/framework/classes.php index 1819719cd2..a30909ba28 100644 --- a/framework/classes.php +++ b/framework/classes.php @@ -33,6 +33,7 @@ return [ 'yii\base\InvalidConfigException' => YII2_PATH . '/base/InvalidConfigException.php', 'yii\base\InvalidParamException' => YII2_PATH . '/base/InvalidParamException.php', 'yii\base\InvalidRouteException' => YII2_PATH . '/base/InvalidRouteException.php', + 'yii\base\InvalidValueException' => YII2_PATH . '/base/InvalidValueException.php', 'yii\base\Model' => YII2_PATH . '/base/Model.php', 'yii\base\ModelEvent' => YII2_PATH . '/base/ModelEvent.php', 'yii\base\Module' => YII2_PATH . '/base/Module.php', @@ -56,6 +57,7 @@ return [ 'yii\behaviors\SluggableBehavior' => YII2_PATH . '/behaviors/SluggableBehavior.php', 'yii\behaviors\TimestampBehavior' => YII2_PATH . '/behaviors/TimestampBehavior.php', 'yii\caching\ApcCache' => YII2_PATH . '/caching/ApcCache.php', + 'yii\caching\ArrayCache' => YII2_PATH . '/caching/ArrayCache.php', 'yii\caching\Cache' => YII2_PATH . '/caching/Cache.php', 'yii\caching\ChainedDependency' => YII2_PATH . '/caching/ChainedDependency.php', 'yii\caching\DbCache' => YII2_PATH . '/caching/DbCache.php', @@ -152,6 +154,7 @@ return [ 'yii\helpers\BaseArrayHelper' => YII2_PATH . '/helpers/BaseArrayHelper.php', 'yii\helpers\BaseConsole' => YII2_PATH . '/helpers/BaseConsole.php', 'yii\helpers\BaseFileHelper' => YII2_PATH . '/helpers/BaseFileHelper.php', + 'yii\helpers\BaseFormatConverter' => YII2_PATH . '/helpers/BaseFormatConverter.php', 'yii\helpers\BaseHtml' => YII2_PATH . '/helpers/BaseHtml.php', 'yii\helpers\BaseHtmlPurifier' => YII2_PATH . '/helpers/BaseHtmlPurifier.php', 'yii\helpers\BaseInflector' => YII2_PATH . '/helpers/BaseInflector.php', @@ -162,6 +165,7 @@ return [ 'yii\helpers\BaseVarDumper' => YII2_PATH . '/helpers/BaseVarDumper.php', 'yii\helpers\Console' => YII2_PATH . '/helpers/Console.php', 'yii\helpers\FileHelper' => YII2_PATH . '/helpers/FileHelper.php', + 'yii\helpers\FormatConverter' => YII2_PATH . '/helpers/FormatConverter.php', 'yii\helpers\Html' => YII2_PATH . '/helpers/Html.php', 'yii\helpers\HtmlPurifier' => YII2_PATH . '/helpers/HtmlPurifier.php', 'yii\helpers\Inflector' => YII2_PATH . '/helpers/Inflector.php', @@ -219,6 +223,7 @@ return [ 'yii\rest\UrlRule' => YII2_PATH . '/rest/UrlRule.php', 'yii\rest\ViewAction' => YII2_PATH . '/rest/ViewAction.php', 'yii\test\ActiveFixture' => YII2_PATH . '/test/ActiveFixture.php', + 'yii\test\ArrayFixture' => YII2_PATH . '/test/ArrayFixture.php', 'yii\test\BaseActiveFixture' => YII2_PATH . '/test/BaseActiveFixture.php', 'yii\test\DbFixture' => YII2_PATH . '/test/DbFixture.php', 'yii\test\Fixture' => YII2_PATH . '/test/Fixture.php', @@ -280,6 +285,7 @@ return [ 'yii\web\RequestParserInterface' => YII2_PATH . '/web/RequestParserInterface.php', 'yii\web\Response' => YII2_PATH . '/web/Response.php', 'yii\web\ResponseFormatterInterface' => YII2_PATH . '/web/ResponseFormatterInterface.php', + 'yii\web\ServerErrorHttpException' => YII2_PATH . '/web/ServerErrorHttpException.php', 'yii\web\Session' => YII2_PATH . '/web/Session.php', 'yii\web\SessionIterator' => YII2_PATH . '/web/SessionIterator.php', 'yii\web\TooManyRequestsHttpException' => YII2_PATH . '/web/TooManyRequestsHttpException.php', diff --git a/framework/console/Controller.php b/framework/console/Controller.php index 4e7f00695c..e6d703fa31 100644 --- a/framework/console/Controller.php +++ b/framework/console/Controller.php @@ -27,6 +27,9 @@ use yii\helpers\Console; * where `` is a route to a controller action and the params will be populated as properties of a command. * See [[options()]] for details. * + * @property string $help This property is read-only. + * @property string $helpSummary This property is read-only. + * * @author Qiang Xue * @since 2.0 */ diff --git a/framework/console/controllers/CacheController.php b/framework/console/controllers/CacheController.php index 25481941d3..5e0c131896 100644 --- a/framework/console/controllers/CacheController.php +++ b/framework/console/controllers/CacheController.php @@ -19,14 +19,14 @@ use yii\console\Exception; * ~~~ * #see list of available components to flush * yii cache - * + * * #flush particular components specified by their names * yii cache/flush first second third - * + * * #flush all cache components that can be found in the system * yii cache/flush-all * ~~~ - * + * * @author Alexander Makarov * @author Mark Jebri * @since 2.0 diff --git a/framework/console/controllers/FixtureController.php b/framework/console/controllers/FixtureController.php index 4919a11b95..133bb48131 100644 --- a/framework/console/controllers/FixtureController.php +++ b/framework/console/controllers/FixtureController.php @@ -32,13 +32,13 @@ use yii\test\FixtureTrait; * * #append fixtures to already loaded * yii fixture User --append - * + * * #load fixtures with different namespace. * yii fixture/load User --namespace=alias\my\custom\namespace\goes\here * ~~~ * * The `unload` sub-command can be used similarly to unload fixtures. - * + * * @author Mark Jebri * @since 2.0 */ diff --git a/framework/db/Connection.php b/framework/db/Connection.php index a756b109dc..d3df89dd7e 100644 --- a/framework/db/Connection.php +++ b/framework/db/Connection.php @@ -118,8 +118,6 @@ use yii\caching\Cache; * read-only. * @property QueryBuilder $queryBuilder The query builder for the current DB connection. This property is * read-only. - * @property array $queryCacheInfo The current query cache information, or null if query cache is not enabled. - * This property is read-only. * @property Schema $schema The schema information for the database opened by this connection. This property * is read-only. * @property Connection $slave The currently active slave connection. Null is returned if there is slave diff --git a/framework/i18n/Formatter.php b/framework/i18n/Formatter.php index a09e146663..7283a7c532 100644 --- a/framework/i18n/Formatter.php +++ b/framework/i18n/Formatter.php @@ -19,8 +19,8 @@ use yii\helpers\HtmlPurifier; use yii\helpers\Html; /** - * Formatter provides a set of commonly used data formatting methods. - * + * Formatter provides a set of commonly used data formatting methods. + * * The formatting methods provided by Formatter are all named in the form of `asXyz()`. * The behavior of some of them may be configured via the properties of Formatter. For example, * by configuring [[dateFormat]], one may control how [[asDate()]] formats the value into a date string. diff --git a/framework/test/ArrayFixture.php b/framework/test/ArrayFixture.php index 3cb8141fe6..6160571989 100644 --- a/framework/test/ArrayFixture.php +++ b/framework/test/ArrayFixture.php @@ -13,7 +13,7 @@ use yii\base\InvalidConfigException; /** * ArrayFixture represents arbitrary fixture that can be loaded from PHP files. - * + * * @author Mark Jebri * @since 2.0 */ diff --git a/framework/web/AssetManager.php b/framework/web/AssetManager.php index 5960e16e96..a4195b2bf9 100644 --- a/framework/web/AssetManager.php +++ b/framework/web/AssetManager.php @@ -31,6 +31,9 @@ use yii\helpers\Url; * ] * ``` * + * @property AssetConverterInterface $converter The asset converter. Note that the type of this property + * differs in getter and setter. See [[getConverter()]] and [[setConverter()]] for details. + * * @author Qiang Xue * @since 2.0 */ diff --git a/framework/web/Request.php b/framework/web/Request.php index f46a3c2d4d..391c086d17 100644 --- a/framework/web/Request.php +++ b/framework/web/Request.php @@ -65,7 +65,6 @@ use yii\helpers\StringHelper; * @property string $queryString Part of the request URL that is after the question mark. This property is * read-only. * @property string $rawBody The request body. This property is read-only. - * @property string $rawCsrfToken The random token for CSRF validation. This property is read-only. * @property string $referrer URL referrer, null if not present. This property is read-only. * @property string $scriptFile The entry script file path. * @property string $scriptUrl The relative URL of the entry script. diff --git a/framework/web/Response.php b/framework/web/Response.php index 4e6ae97652..7cbc831a7c 100644 --- a/framework/web/Response.php +++ b/framework/web/Response.php @@ -35,6 +35,7 @@ use yii\helpers\StringHelper; * ~~~ * * @property CookieCollection $cookies The cookie collection. This property is read-only. + * @property string $downloadHeaders The attachment file name. This property is write-only. * @property HeaderCollection $headers The header collection. This property is read-only. * @property boolean $isClientError Whether this response indicates a client error. This property is * read-only.