Merge remote-tracking branch 'yajra/9.0' into 9.0

Author: Arkhas

CHANGELOG.md

@@ -8,6 +8,11 @@
 
 ### [Unreleased]
 
+### [v9.3.0] - 2019-05-21
+
+- Prevent malformed UTF-8 characters in debug mode. [#2088], credits to [@drsdre].
+- Add the possibility to makeHidden() some attribute of a model. [#2085], credits to [@Arkhas].
+
 ### [v9.2.0] - 2019-05-09
 
 - Enable the dotted notation in the ->removeColumn() function. [#2082], credits to [@Arkhas].
@@ -319,7 +324,8 @@ return (new CollectionDataTable(User::all())->toJson();
 - Fix orderColumn api where related tables are not joined.
 - Fix nested with relation search and sort function.
 
-[Unreleased]: https://github.com/yajra/laravel-datatables/compare/v9.2.0...9.0
+[Unreleased]: https://github.com/yajra/laravel-datatables/compare/v9.3.0...9.0
+[v9.3.0]: https://github.com/yajra/laravel-datatables/compare/v9.2.0...v9.3.0
 [v9.2.0]: https://github.com/yajra/laravel-datatables/compare/v9.1.1...v9.2.0
 [v9.1.1]: https://github.com/yajra/laravel-datatables/compare/v9.1.0...v9.1.1
 [v9.1.0]: https://github.com/yajra/laravel-datatables/compare/v9.0.1...v9.1.0
@@ -427,6 +433,8 @@ return (new CollectionDataTable(User::all())->toJson();
 [#2082]: https://github.com/yajra/laravel-datatables/pull/2082
 [#2079]: https://github.com/yajra/laravel-datatables/pull/2079
 [#2083]: https://github.com/yajra/laravel-datatables/pull/2083
+[#2088]: https://github.com/yajra/laravel-datatables/pull/2088
+[#2085]: https://github.com/yajra/laravel-datatables/pull/2085
 
 [#2058]: https://github.com/yajra/laravel-datatables/issues/2058
 [#1626]: https://github.com/yajra/laravel-datatables/issues/1626
@@ -490,3 +498,4 @@ return (new CollectionDataTable(User::all())->toJson();
 [@Arkhas]: https://github.com/Arkhas
 [@apreiml]: https://github.com/apreiml
 [@Stokoe0990]: https://github.com/Stokoe0990
+[@drsdre]: https://github.com/drsdre

src/DataTableAbstract.php

@@ -49,12 +49,13 @@ abstract class DataTableAbstract implements DataTable, Arrayable, Jsonable
      * @var array
      */
     protected $columnDef = [
-        'index'  => false,
-        'append' => [],
-        'edit'   => [],
-        'filter' => [],
-        'order'  => [],
-        'only'   => null,
+        'index'       => false,
+        'append'      => [],
+        'edit'        => [],
+        'filter'      => [],
+        'order'       => [],
+        'only'        => null,
+        'hidden'      => [],
     ];
 
     /**
@@ -246,6 +247,19 @@ public function escapeColumns($columns = '*')
         return $this;
     }
 
+    /**
+     * Add a makeHidden() to the row object.
+     *
+     * @param array          $attributes
+     * @return $this
+     */
+    public function makeHidden(array $attributes = [])
+    {
+        $this->columnDef['hidden'] = array_merge_recursive(array_get($this->columnDef, 'hidden', []), $attributes);
+
+        return $this;
+    }
+
     /**
      * Set columns that should not be escaped.
      * Optionally merge the defaults from config.

src/Processors/DataProcessor.php

@@ -82,6 +82,7 @@ public function __construct($results, array $columnDef, array $templates, $start
         $this->escapeColumns = $columnDef['escape'];
         $this->includeIndex  = $columnDef['index'];
         $this->rawColumns    = $columnDef['raw'];
+        $this->makeHidden    = $columnDef['hidden'];
         $this->templates     = $templates;
         $this->start         = $start;
     }
@@ -98,7 +99,7 @@ public function process($object = false)
         $indexColumn  = config('datatables.index_column', 'DT_RowIndex');
 
         foreach ($this->results as $row) {
-            $data  = Helper::convertToArray($row);
+            $data  = Helper::convertToArray($row, ['hidden' => $this->makeHidden]);
             $value = $this->addColumns($data, $row);
             $value = $this->editColumns($value, $row);
             $value = $this->setupRowVariables($value, $row);

src/QueryDataTable.php

@@ -724,7 +724,12 @@ protected function globalSearch($keyword)
      */
     protected function showDebugger(array $output)
     {
-        $output['queries'] = $this->connection->getQueryLog();
+        $query_log = $this->connection->getQueryLog();
+        array_walk_recursive($query_log, function (&$item, $key) {
+            $item = utf8_encode($item);
+        });
+
+        $output['queries'] = $query_log;
         $output['input']   = $this->request->all();
 
         return $output;

src/Utilities/Helper.php

@@ -151,10 +151,12 @@ public static function getOrMethod($method)
      * Converts array object values to associative array.
      *
      * @param mixed $row
+     * @param array $filters
      * @return array
      */
-    public static function convertToArray($row)
+    public static function convertToArray($row, $filters = [])
     {
+        $row  = method_exists($row, 'makeHidden') ? $row->makeHidden(array_get($filters, 'hidden', [])) : $row;
         $data = $row instanceof Arrayable ? $row->toArray() : (array) $row;
 
         foreach ($data as &$value) {