- Require PHP >= 5.5

- Require Yii ~2.0.14
- Remove DataColumn :: rowOptions
- Added DataColumn :: options

Author: microThread

README.md

@@ -34,8 +34,7 @@ Usage
 Example:
 ```php
 $arrayRows = [];
-foreach(range(1, 100) as $item)
-{
+foreach(range(1, 100) as $item) {
     $arrayRows[] = [
         'id' => $item,
         'name' => 'Product ' . $item,
@@ -76,6 +75,7 @@ return $grid->run();
 
 Response
 ------------
+
 ```json
 {
     "metadata": {
@@ -106,11 +106,11 @@ Response
     },
     "pager": {
         "results": {
-            "total": 100,
+            "total": 1212,
             "per_page": 5
         },
         "pages": {
-            "total": 20,
+            "total": 243,
             "current": 1
         }
     },
@@ -119,6 +119,7 @@ Response
             "label": "Id",
             "attribute": "id",
             "description": null,
+            "options": [],
             "sortable": true,
             "filterable": false,
             "header": {
@@ -130,9 +131,6 @@ Response
                 "items": [],
                 "options": []
             },
-            "row": {
-                "options": []
-            },
             "footer": {
                 "value": [],
                 "options": []
@@ -142,6 +140,7 @@ Response
             "label": "Name",
             "attribute": "name",
             "description": null,
+            "options": [],
             "sortable": true,
             "filterable": false,
             "header": {
@@ -153,9 +152,6 @@ Response
                 "items": [],
                 "options": []
             },
-            "row": {
-                "options": []
-            },
             "footer": {
                 "value": [],
                 "options": []
@@ -165,6 +161,7 @@ Response
             "label": "Price",
             "attribute": "price",
             "description": null,
+            "options": [],
             "sortable": true,
             "filterable": false,
             "header": {
@@ -176,9 +173,6 @@ Response
                 "items": [],
                 "options": []
             },
-            "row": {
-                "options": []
-            },
             "footer": {
                 "value": [],
                 "options": []
@@ -188,6 +182,7 @@ Response
             "label": "Created At",
             "attribute": "created_at",
             "description": null,
+            "options": [],
             "sortable": true,
             "filterable": false,
             "header": {
@@ -199,9 +194,6 @@ Response
                 "items": [],
                 "options": []
             },
-            "row": {
-                "options": []
-            },
             "footer": {
                 "value": [],
                 "options": []
@@ -213,31 +205,31 @@ Response
             "id": 1,
             "name": "Product 1",
             "price": 101,
-            "created_at": "2017-12-14 11:13:57"
+            "created_at": "2018-04-02 17:54:52"
         },
         {
             "id": 2,
             "name": "Product 2",
             "price": 102,
-            "created_at": "2017-12-14 11:13:57"
+            "created_at": "2018-04-02 17:54:52"
         },
         {
             "id": 3,
             "name": "Product 3",
             "price": 103,
-            "created_at": "2017-12-14 11:13:57"
+            "created_at": "2018-04-02 17:54:52"
         },
         {
             "id": 4,
             "name": "Product 4",
             "price": 104,
-            "created_at": "2017-12-14 11:13:57"
+            "created_at": "2018-04-02 17:54:52"
         },
         {
             "id": 5,
             "name": "Product 5",
             "price": 105,
-            "created_at": "2017-12-14 11:13:57"
+            "created_at": "2018-04-02 17:54:52"
         }
     ]
 }

composer.json

@@ -18,8 +18,8 @@
 		}
 	],
 	"require": {
-        "php": ">=5.4",
-		"yiisoft/yii2": "~2.0.13",
+        "php": ">=5.5",
+		"yiisoft/yii2": "~2.0.14",
         "vivre-tech/rest-renderer": "*"
 
 	},

src/DataColumn.php

@@ -1,9 +1,7 @@
 <?php
 
-
 namespace vivretech\rest\grid;
 
-
 use yii\base\BaseObject;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
@@ -12,7 +10,6 @@
 use yii\helpers\ArrayHelper;
 use yii\helpers\Inflector;
 
-
 class DataColumn extends BaseObject
 {
 
@@ -42,6 +39,11 @@ class DataColumn extends BaseObject
      */
     public $description;
 
+    /**
+     * @var array
+     */
+    public $options = [];
+
     /**
      * @var string|array|Closure an anonymous function or a string that is used to determine the value to display in the current column.
      *
@@ -80,11 +82,6 @@ class DataColumn extends BaseObject
      */
     public $visible = true;
 
-    /**
-     * @var array the attributes for the row group tag.
-     */
-    public $rowOptions = [];
-
     /**
      * @var array the attributes for the header cell tag.
      */
@@ -121,7 +118,6 @@ class DataColumn extends BaseObject
     public function renderLabel()
     {
         $label = $this->getHeaderCellLabel();
-
         return $label;
     }
 
@@ -170,10 +166,8 @@ public function renderFilterCell()
     {
         $selectedValue = null;
 
-        if (empty($this->grid->filterModel) === false)
-        {
-            if (in_array($this->attribute, $this->grid->filterModel->attributes()))
-            {
+        if (empty($this->grid->filterModel) === false) {
+            if (in_array($this->attribute, $this->grid->filterModel->attributes())) {
                 $selectedValue = $this->grid->filterModel->{$this->attribute};
             }
         }
@@ -209,8 +203,7 @@ protected function getHeaderCellLabel()
         $provider = $this->grid->dataProvider;
         $label = $this->label;
 
-        if ($this->label === null)
-        {
+        if ($this->label === null) {
 
             if ($provider instanceof ActiveDataProvider && $provider->query instanceof ActiveQueryInterface) {
                 /* @var $modelClass Model */
@@ -271,10 +264,8 @@ protected function renderDataCellContent($model, $key, $index)
      */
     public function getDataCellValue($model, $key, $index)
     {
-        if ($this->value !== null)
-        {
-            if (is_string($this->value))
-            {
+        if ($this->value !== null) {
+            if (is_string($this->value)) {
                 return ArrayHelper::getValue($model, $this->value);
             }