From ffe38a920fd120af3b17b77782b5efa0a6e96fee Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 23 Mar 2019 00:26:26 +0300
Subject: [PATCH] release version 2.0.17

---
 framework/BaseYii.php       |  2 +-
 framework/CHANGELOG.md      | 16 ++++++++--------
 framework/log/Target.php    |  4 ++--
 framework/web/DbSession.php |  7 ++++---
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/framework/BaseYii.php b/framework/BaseYii.php
index 395afe6..d06b4f5 100644
--- a/framework/BaseYii.php
+++ b/framework/BaseYii.php
@@ -93,7 +93,7 @@ class BaseYii
      */
     public static function getVersion()
     {
-        return '2.0.17-dev';
+        return '2.0.17';
     }
 
     /**
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index cdee028..c23d9cb 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -1,21 +1,21 @@
 Yii Framework 2 Change Log
 ==========================
 
-2.0.17 under development
-------------------------
+2.0.17 March 22, 2019
+---------------------
 
+- Bug #9438, #13740, #15037: Handle DB session callback custom fields before session closed (lubosdz)
 - Bug #16158: Fix multiple select validation was trigged on other fields blur event (GHopperMSK)
 - Bug #16335: Fixed in `yii\filters\AccessRule::matchIP()` user IP validation with netmask in rule (omentes)
-- Bug #9438, #13740, #15037: Handle DB session callback custom fields before session closed (lubosdz)
 - Bug #16681: `ActiveField::inputOptions` were not used during some widgets rendering (GHopperMSK)
-- Bug #17133: Fixed aliases rendering during help generation for a console command (GHopperMSK)
-- Bug #17185: Fixed `AssetManager` timestamp appending when a file is published manually (GHopperMSK)
-- Bug #17156: Fixes PHP 7.2 warning when a data provider has no data as a parameter for a GridView (evilito)
+- Bug #17083: Fixed `yii\validators\EmailValidator::$checkDNS` tells that every domain is correct on alpine linux (mikk150)
+- Bug #17124: Fixed ErrorException when run `./yii fixture/unload` without arguments (ricpelo)
 - Bug #17127: `yii\db\ActiveRecord::findOne()` now accepts table aliases (albertborsos)
+- Bug #17133: Fixed aliases rendering during help generation for a console command (GHopperMSK)
 - Bug #17152: Fixed error page when using traceline option (asamats)
-- Bug #17083: Fixed `yii\validators\EmailValidator::$checkDNS` tells that every domain is correct on alpine linux (mikk150)
+- Bug #17156: Fixes PHP 7.2 warning when a data provider has no data as a parameter for a GridView (evilito)
 - Bug #17180: Do not populate `yii\web\Response::$response` when response code is 204 (mikk150)
-- Bug #17124: Fixed ErrorException when run `./yii fixture/unload` without arguments (ricpelo)
+- Bug #17185: Fixed `AssetManager` timestamp appending when a file is published manually (GHopperMSK)
 - Bug #17215: Improved security for servers running PHP 7.0.0+ (brandonkelly)
 
 
diff --git a/framework/log/Target.php b/framework/log/Target.php
index c14cf15..c15af17 100644
--- a/framework/log/Target.php
+++ b/framework/log/Target.php
@@ -29,8 +29,8 @@ use yii\web\Request;
  * @property bool $enabled Indicates whether this log target is enabled. Defaults to true. Note that the type
  * of this property differs in getter and setter. See [[getEnabled()]] and [[setEnabled()]] for details.
  * @property int $levels The message levels that this target is interested in. This is a bitmap of level
- * values. Defaults to 0, meaning all available levels. Note that the type of this property differs in getter
- * and setter. See [[getLevels()]] and [[setLevels()]] for details.
+ * values. Defaults to 0, meaning all available levels. Note that the type of this property differs in getter and
+ * setter. See [[getLevels()]] and [[setLevels()]] for details.
  *
  * For more details and usage information on Target, see the [guide article on logging & targets](guide:runtime-logging).
  *
diff --git a/framework/web/DbSession.php b/framework/web/DbSession.php
index b00df3b..dfb825f 100644
--- a/framework/web/DbSession.php
+++ b/framework/web/DbSession.php
@@ -77,11 +77,12 @@ class DbSession extends MultiFieldSession
     public $sessionTable = '{{%session}}';
 
     /**
-    * @var array Session fields to be written into session table columns
-    * @since 2.0.17
-    */
+     * @var array Session fields to be written into session table columns
+     * @since 2.0.17
+     */
     protected $fields = [];
 
+
     /**
      * Initializes the DbSession component.
      * This method will initialize the [[db]] property to make sure it refers to a valid DB connection.