From 60a39654dd2d425a24c64d6c1d641a0754b015bc Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 2 May 2020 14:11:31 +0300
Subject: [PATCH] release version 2.0.35

---
 framework/BaseYii.php           |  2 +-
 framework/CHANGELOG.md          | 22 +++++++++++-----------
 framework/base/DynamicModel.php |  1 -
 framework/db/Query.php          |  1 -
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/framework/BaseYii.php b/framework/BaseYii.php
index f943f3a4b8a..1bf1a45005c 100644
--- a/framework/BaseYii.php
+++ b/framework/BaseYii.php
@@ -93,7 +93,7 @@ class BaseYii
      */
     public static function getVersion()
     {
-        return '2.0.35-dev';
+        return '2.0.35';
     }
 
     /**
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index bf925b55101..1ce2bbc781f 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -1,26 +1,26 @@
 Yii Framework 2 Change Log
 ==========================
 
-2.0.35 under development
-------------------------
+2.0.35 May 02, 2020
+-------------------
 
-- Bug #17975: Fix deleting unused messages with console command if message tables were created manually (auerswald, cebe)
-- Bug #17961: Fix pagination `pageSizeLimit` ignored if set as array with more then 2 elements (tsvetiligo)
-- Bug #18011: Add attribute labels support for `DynamicModel`, fixed `EachValidator` to pass the attribute label to the underlying `DynamicModel` (storch)
-- Enh #18019: Allow jQuery 3.5.0 to be installed (wouter90)
+- Bug #16481: Fix RBAC MSSQL trigger (achretien)
 - Bug #17653: Fix `TypeError: pair[1] is undefined` when query param doesn't have `=` sign (baso10)
-- Bug #17948: Ignore errors caused by `set_time_limit(0)` (brandonkelly)
 - Bug #17810: Fix `EachValidator` crashing with uninitialized typed properties (ricardomm85)
 - Bug #17942: Fix for `DbCache` loop in MySQL `QueryBuilder` (alex-code)
+- Bug #17948: Ignore errors caused by `set_time_limit(0)` (brandonkelly)
 - Bug #17960: Fix unsigned primary key type mapping for SQLite (bizley)
-- Bug #16481: Fix RBAC MSSQL trigger (achretien)
-- Enh #17758: `Query::withQuery()` can now be used for CTE (sartor)
+- Bug #17961: Fix pagination `pageSizeLimit` ignored if set as array with more then 2 elements (tsvetiligo)
 - Bug #17974: Fix `ActiveRelationTrait` compatibility with PHP 7.4 (Ximich)
+- Bug #17975: Fix deleting unused messages with console command if message tables were created manually (auerswald, cebe)
 - Bug #17991: Improve `yii\db\Connection` master and slave failover, no connection attempt was made when all servers are marked as unavailable  (cebe)
-- Enh #17993: Add `yii\i18n\Formatter::$currencyDecimalSeparator` to allow setting custom symbols for currency decimal in `IntlNumberFormatter` (XPOHOC269)
 - Bug #18000: PK value of Oracle ActiveRecord is missing after save (mankwok)
-- Enh #18006: Allow `SameSite` cookie pre PHP 7.3 (scottix)
 - Bug #18010: Allow upper or lower case operators in `InCondition` and `LikeCondition` (alex-code)
+- Bug #18011: Add attribute labels support for `DynamicModel`, fixed `EachValidator` to pass the attribute label to the underlying `DynamicModel` (storch)
+- Enh #17758: `Query::withQuery()` can now be used for CTE (sartor)
+- Enh #17993: Add `yii\i18n\Formatter::$currencyDecimalSeparator` to allow setting custom symbols for currency decimal in `IntlNumberFormatter` (XPOHOC269)
+- Enh #18006: Allow `SameSite` cookie pre PHP 7.3 (scottix)
+- Enh #18019: Allow jQuery 3.5.0 to be installed (wouter90)
 
 
 2.0.34 March 26, 2020
diff --git a/framework/base/DynamicModel.php b/framework/base/DynamicModel.php
index bbf8cb55439..610e03d8335 100644
--- a/framework/base/DynamicModel.php
+++ b/framework/base/DynamicModel.php
@@ -56,7 +56,6 @@
 class DynamicModel extends Model
 {
     private $_attributes = [];
-
     /**
      * Array of the dynamic attribute labels.
      * Used to as form field labels and in validation errors.
diff --git a/framework/db/Query.php b/framework/db/Query.php
index e384bb22dce..6ce769b5aae 100644
--- a/framework/db/Query.php
+++ b/framework/db/Query.php
@@ -110,7 +110,6 @@ class Query extends Component implements QueryInterface, ExpressionInterface
      * - `all`: boolean, whether it should be `UNION ALL` or `UNION`
      */
     public $union;
-
     /**
      * @var array this is used to construct the WITH section in a SQL query.
      * Each array element is an array of the following structure: