Updates to release v3.3.5 fix #929 fix #932 fix #934 fix #938

kartik-v · Dec 4, 2019 · ccc256f · ccc256f
1 parent 0c8cf65
commit ccc256f
Show file tree

Hide file tree

Showing 47 changed files with 288 additions and 250 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -1,6 +1,14 @@
 Change Log: `yii2-grid`
 =======================
 
+## Version 3.3.5
+
+**Date:** _under development_
+
+- (enh #934, #938): Correct ternary operator for PHP 7.4 support.
+- (enh #932): Correct Expand Row container parsing for nested expand row columns.
+- (enh #929): Enhance Expand Row Column plugin and correct expand one only.
+
 ## Version 3.3.4
 
 **Date:** 26-Aug-2019

diff --git a/src/ActionColumn.php b/src/ActionColumn.php
@@ -3,7 +3,7 @@
 /**
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-grid
- * @version 3.3.4
+ * @version 3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/ActionColumnAsset.php b/src/ActionColumnAsset.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/BooleanColumn.php b/src/BooleanColumn.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/CheckboxColumn.php b/src/CheckboxColumn.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/CheckboxColumnAsset.php b/src/CheckboxColumnAsset.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/ColumnTrait.php b/src/ColumnTrait.php
@@ -4,17 +4,19 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;
 
 use Closure;
 use kartik\base\Config;
+use yii\base\InvalidConfigException;
 use yii\base\Model;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 use yii\helpers\Json;
+use yii\web\View;
 
 /**
  * ColumnTrait maintains generic methods used by all column widgets in [[GridView]].
@@ -161,7 +163,7 @@ trait ColumnTrait
     protected $_rows = [];
 
     /**
-     * @var \yii\web\View the view instance
+     * @var View the view instance
      */
     protected $_view;
 
@@ -348,7 +350,7 @@ protected function renderPageSummaryCellContent()
      */
     protected function getPageSummaryCellContent()
     {
-        if ($this->pageSummary === true || $this->pageSummary instanceof \Closure) {
+        if ($this->pageSummary === true || $this->pageSummary instanceof Closure) {
             $summary = $this->calculateSummary();
             return ($this->pageSummary === true) ? $summary : call_user_func(
                 $this->pageSummary,
@@ -396,7 +398,7 @@ protected function calculateSummary()
 
     /**
      * Checks if the filter input types are valid
-     * @throws \yii\base\InvalidConfigException
+     * @throws InvalidConfigException
      */
     protected function checkValidFilters()
     {
@@ -510,7 +512,7 @@ protected function isValidAlignment($type = 'hAlign')
      */
     protected function fetchContentOptions($model, $key, $index)
     {
-        if ($this->contentOptions instanceof \Closure) {
+        if ($this->contentOptions instanceof Closure) {
             $options = call_user_func($this->contentOptions, $model, $key, $index, $this);
         } else {
             $options = $this->contentOptions;

diff --git a/src/DataColumn.php b/src/DataColumn.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/Demo.php b/src/Demo.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/EditableColumn.php b/src/EditableColumn.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/EditableColumnAction.php b/src/EditableColumnAction.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/EditableColumnAsset.php b/src/EditableColumnAsset.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/EnumColumn.php b/src/EnumColumn.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/ExpandRowColumn.php b/src/ExpandRowColumn.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;
@@ -244,7 +244,7 @@ public function init()
             'mergeHeader' => true,
             'hAlign' => GridView::ALIGN_CENTER,
             'vAlign' => GridView::ALIGN_MIDDLE,
-            'width' => '50px'
+            'width' => '50px',
         ]);
         parent::init();
         if (empty($this->detail) && empty($this->detailUrl)) {

diff --git a/src/ExpandRowColumnAsset.php b/src/ExpandRowColumnAsset.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/FormulaColumn.php b/src/FormulaColumn.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/GridExportAsset.php b/src/GridExportAsset.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/GridFloatHeadAsset.php b/src/GridFloatHeadAsset.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/GridGroupAsset.php b/src/GridGroupAsset.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/GridPerfectScrollbarAsset.php b/src/GridPerfectScrollbarAsset.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/GridResizeColumnsAsset.php b/src/GridResizeColumnsAsset.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/GridResizeStoreAsset.php b/src/GridResizeStoreAsset.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/GridToggleDataAsset.php b/src/GridToggleDataAsset.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/GridView.php b/src/GridView.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/GridViewAsset.php b/src/GridViewAsset.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/Module.php b/src/Module.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/RadioColumn.php b/src/RadioColumn.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/RadioColumnAsset.php b/src/RadioColumnAsset.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/SerialColumn.php b/src/SerialColumn.php
@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  */
 
 namespace kartik\grid;

diff --git a/src/assets/css/kv-grid-expand.css b/src/assets/css/kv-grid-expand.css
@@ -2,7 +2,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  *
  * Gridview ExpandRowColumn styling and enhancements
  *

diff --git a/src/assets/css/kv-grid-expand.min.css b/src/assets/css/kv-grid-expand.min.css
diff --git a/src/assets/css/kv-grid.css b/src/assets/css/kv-grid.css
@@ -2,7 +2,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  *
  * Yii2 Gridview widget styling and enhancements for Bootstrap.
  *

diff --git a/src/assets/css/kv-grid.min.css b/src/assets/css/kv-grid.min.css
diff --git a/src/assets/js/kv-grid-checkbox.js b/src/assets/js/kv-grid-checkbox.js
@@ -2,7 +2,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  *
  * Client actions for kartik\grid\CheckboxColumn
  * 

diff --git a/src/assets/js/kv-grid-checkbox.min.js b/src/assets/js/kv-grid-checkbox.min.js
diff --git a/src/assets/js/kv-grid-editable.js b/src/assets/js/kv-grid-editable.js
@@ -2,7 +2,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  *
  * Client actions for yii2-grid EditableColumn
  * 

diff --git a/src/assets/js/kv-grid-editable.min.js b/src/assets/js/kv-grid-editable.min.js
@@ -2,7 +2,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <kartikv2@gmail.com>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version   3.3.4
+ * @version   3.3.5
  *
  * Client actions for yii2-grid EditableColumn
  *