Skip to content

Commit 4f98915

Browse files
yajrayajra
committed
convert cs to psr2
1 parent 5cffdb7 commit 4f98915

File tree

4 files changed

+106
-109
lines changed

4 files changed

+106
-109
lines changed

‎src/config/config.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
return array(
3+
return [
44

5-
'search' => array(
6-
'case_insensitive' => true,
7-
'use_wildcards' => false,
8-
)
5+
'search' => [
6+
'case_insensitive' => true,
7+
'use_wildcards' => false,
8+
]
99

10-
);
10+
];

‎src/yajra/Datatables/Datatables.php

Lines changed: 57 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @package Laravel
88
* @category Package
99
* @author Arjay Angeles <aqangeles@gmail.com>
10-
* @version 3.6.4
10+
* @version 3.6.5
1111
*/
1212

1313
use Closure;
@@ -24,7 +24,6 @@
2424

2525
class Datatables
2626
{
27-
2827
/**
2928
* Database connection used
3029
*
@@ -201,38 +200,38 @@ public function processData($input = [])
201200
$formatted_input = [];
202201
if (isset($input['draw'])) {
203202
// DT version 1.10+
204-
$input['version'] = '1.10';
205-
$formatted_input = $input;
203+
$input['version'] = '1.10';
204+
$formatted_input = $input;
206205
$this->new_version = true;
207206
} else {
208207
// DT version < 1.10
209208
$formatted_input['version'] = '1.9';
210-
$formatted_input['draw'] = Arr::get($input, 'sEcho', '');
211-
$formatted_input['start'] = Arr::get($input, 'iDisplayStart', 0);
212-
$formatted_input['length'] = Arr::get($input, 'iDisplayLength', 10);
213-
$formatted_input['search'] = [
209+
$formatted_input['draw'] = Arr::get($input, 'sEcho', '');
210+
$formatted_input['start'] = Arr::get($input, 'iDisplayStart', 0);
211+
$formatted_input['length'] = Arr::get($input, 'iDisplayLength', 10);
212+
$formatted_input['search'] = [
214213
'value' => Arr::get($input, 'sSearch', ''),
215214
'regex' => Arr::get($input, 'bRegex', ''),
216215
];
217-
$formatted_input['_'] = Arr::get($input, '_', '');
218-
$columns = explode(',', Arr::get($input, 'sColumns', ''));
216+
$formatted_input['_'] = Arr::get($input, '_', '');
217+
$columns = explode(',', Arr::get($input, 'sColumns', ''));
219218
$formatted_input['columns'] = [];
220219
for ($i = 0; $i < Arr::get($input, 'iColumns', 0); $i++) {
221-
$arr = [];
222-
$arr['name'] = isset($columns[$i]) ? $columns[$i] : '';
223-
$arr['data'] = Arr::get($input, 'mDataProp_' . $i, '');
224-
$arr['searchable'] = Arr::get($input, 'bSearchable_' . $i, '');
225-
$arr['search'] = [];
226-
$arr['search']['value'] = Arr::get($input, 'sSearch_' . $i, '');
227-
$arr['search']['regex'] = Arr::get($input, 'bRegex_' . $i, '');
228-
$arr['orderable'] = Arr::get($input, 'bSortable_' . $i, '');
220+
$arr = [];
221+
$arr['name'] = isset($columns[$i]) ? $columns[$i] : '';
222+
$arr['data'] = Arr::get($input, 'mDataProp_' . $i, '');
223+
$arr['searchable'] = Arr::get($input, 'bSearchable_' . $i, '');
224+
$arr['search'] = [];
225+
$arr['search']['value'] = Arr::get($input, 'sSearch_' . $i, '');
226+
$arr['search']['regex'] = Arr::get($input, 'bRegex_' . $i, '');
227+
$arr['orderable'] = Arr::get($input, 'bSortable_' . $i, '');
229228
$formatted_input['columns'][] = $arr;
230229
}
231230
$formatted_input['order'] = [];
232231
for ($i = 0; $i < Arr::get($input, 'iSortingCols', 0); $i++) {
233-
$arr = [];
234-
$arr['column'] = Arr::get($input, 'iSortCol_' . $i, '');
235-
$arr['dir'] = Arr::get($input, 'sSortDir_' . $i, '');
232+
$arr = [];
233+
$arr['column'] = Arr::get($input, 'iSortCol_' . $i, '');
234+
$arr['dir'] = Arr::get($input, 'sSortDir_' . $i, '');
236235
$formatted_input['order'][] = $arr;
237236
}
238237
}
@@ -273,13 +272,13 @@ public static function of($builder)
273272

274273
if ($builder instanceof QueryBuilder) {
275274
$ins->query_type = 'builder';
276-
$ins->query = $builder;
277-
$ins->columns = $ins->query->columns;
275+
$ins->query = $builder;
276+
$ins->columns = $ins->query->columns;
278277
$ins->connection = $ins->query->getConnection();
279278
} else {
280279
$ins->query_type = 'eloquent';
281-
$ins->query = $builder instanceof EloquentBuilder ? $builder : $builder->getQuery();
282-
$ins->columns = $ins->query->getQuery()->columns;
280+
$ins->query = $builder instanceof EloquentBuilder ? $builder : $builder->getQuery();
281+
$ins->columns = $ins->query->getQuery()->columns;
283282
$ins->connection = $ins->query->getQuery()->getConnection();
284283
}
285284

@@ -298,7 +297,7 @@ private function getColumnName($str)
298297
{
299298
preg_match('#^(\S*?)\s+as\s+(\S*?)$#si', $str, $matches);
300299

301-
if ( ! empty($matches)) {
300+
if (! empty($matches)) {
302301
return $matches[2];
303302
} elseif (strpos($str, '.')) {
304303
$array = explode('.', $str);
@@ -330,7 +329,7 @@ private function count()
330329

331330
// if its a normal query ( no union ) replace the select with static text to improve performance
332331
$myQuery = clone $query;
333-
if ( ! preg_match('/UNION/i', strtoupper($myQuery->toSql()))) {
332+
if (! preg_match('/UNION/i', strtoupper($myQuery->toSql()))) {
334333
$myQuery->select($this->connection->raw("'1' as row_count"));
335334
}
336335

@@ -372,29 +371,29 @@ public function make($mDataSupport = false)
372371
*/
373372
private function doFiltering()
374373
{
375-
$input = $this->input;
374+
$input = $this->input;
376375
$columns = $input['columns'];
377376

378377
// if older version, set the column name to query's fields
379378
// or if new version but does not use mData support
380-
if ( ! $this->new_version or ( ! $this->mDataSupport and $this->new_version)) {
379+
if (! $this->new_version or (! $this->mDataSupport and $this->new_version)) {
381380
for ($i = 0; $i < count($columns); $i++) {
382-
if ( ! isset($this->columns[$i])) {
381+
if (! isset($this->columns[$i])) {
383382
continue;
384383
}
385384

386385
$columns[$i]['name'] = $this->columns[$i];
387386
if (stripos($columns[$i]['name'], ' AS ') !== false or
388387
$columns[$i]['name'] instanceof Expression
389388
) {
390-
$columns[$i]['name'] = '';
389+
$columns[$i]['name'] = '';
391390
$columns[$i]['searchable'] = false;
392-
$columns[$i]['orderable'] = false;
391+
$columns[$i]['orderable'] = false;
393392
}
394393
}
395394
}
396395

397-
if ( ! empty($this->input['search']['value'])) {
396+
if (! empty($this->input['search']['value'])) {
398397
$this->query->where(function ($query) use ($columns, $input) {
399398
for ($i = 0, $c = count($columns); $i < $c; $i++) {
400399
if ($columns[$i]['searchable'] == "true" and ! empty($columns[$i]['name'])) {
@@ -448,7 +447,7 @@ public function doColumnSearch(array $columns)
448447
{
449448
for ($i = 0, $c = count($columns); $i < $c; $i++) {
450449
if ($columns[$i]['searchable'] == "true" and ! empty($columns[$i]['search']['value']) and ! empty($columns[$i]['name'])) {
451-
$column = $columns[$i]['name'];
450+
$column = $columns[$i]['name'];
452451
$keyword = $this->setupKeyword($columns[$i]['search']['value']);
453452

454453
// wrap column possibly allow reserved words to be used as column
@@ -527,7 +526,7 @@ private function cleanColumns($cols, $use_alias = true)
527526
*/
528527
public function useDataColumns()
529528
{
530-
if ( ! count($this->result_array_r)) {
529+
if (! count($this->result_array_r)) {
531530
return [];
532531
}
533532

@@ -550,7 +549,7 @@ public function useDataColumns()
550549
*/
551550
public function wildcardLikeString($str, $lowercase = true)
552551
{
553-
$wild = '%';
552+
$wild = '%';
554553
$length = strlen($str);
555554
if ($length) {
556555
for ($i = 0; $i < $length; $i++) {
@@ -590,13 +589,13 @@ protected function prefixColumn($column)
590589
*/
591590
protected function tableNames()
592591
{
593-
$names = [];
594-
$query = ($this->query_type == 'builder') ? $this->query : $this->query->getQuery();
595-
$names[] = $query->from;
596-
$joins = $query->joins ?: [];
592+
$names = [];
593+
$query = ($this->query_type == 'builder') ? $this->query : $this->query->getQuery();
594+
$names[] = $query->from;
595+
$joins = $query->joins ?: [];
597596
$databasePrefix = $this->databasePrefix();
598597
foreach ($joins as $join) {
599-
$table = preg_split("/ as /i", $join->table);
598+
$table = preg_split("/ as /i", $join->table);
600599
$names[] = $table[0];
601600
if (isset($table[1]) && ! empty($databasePrefix) && strpos($table[1], $databasePrefix) == 0) {
602601
$names[] = preg_replace('/^' . $databasePrefix . '/', '', $table[1]);
@@ -639,7 +638,7 @@ private function getFilteredRecords()
639638
*/
640639
private function doPaging()
641640
{
642-
if ( ! is_null($this->input['start']) && ! is_null($this->input['length']) && $this->input['length'] != -1) {
641+
if (! is_null($this->input['start']) && ! is_null($this->input['length']) && $this->input['length'] != -1) {
643642
$this->query->skip($this->input['start'])
644643
->take((int) $this->input['length'] > 0 ? $this->input['length'] : 10);
645644
}
@@ -717,22 +716,22 @@ private function initColumns()
717716

718717
// Process add columns
719718
foreach ($this->extra_columns as $key => $value) {
720-
if (is_string($value['content'])):
719+
if (is_string($value['content'])) {
721720
$value['content'] = $this->blader($value['content'], $data);
722-
elseif (is_callable($value['content'])):
721+
} elseif (is_callable($value['content'])) {
723722
$value['content'] = $value['content']($this->result_object[$rkey]);
724-
endif;
723+
}
725724

726725
$rvalue = $this->includeInArray($value, $rvalue);
727726
}
728727

729728
// Process edit columns
730729
foreach ($this->edit_columns as $key => $value) {
731-
if (is_string($value['content'])):
730+
if (is_string($value['content'])) {
732731
$value['content'] = $this->blader($value['content'], $data);
733-
elseif (is_callable($value['content'])):
732+
} elseif (is_callable($value['content'])) {
734733
$value['content'] = $value['content']($this->result_object[$rkey]);
735-
endif;
734+
}
736735

737736
$rvalue[$value['name']] = $value['content'];
738737
}
@@ -747,8 +746,8 @@ private function initColumns()
747746
private function blader($str, $data = [])
748747
{
749748
$empty_filesystem_instance = new Filesystem;
750-
$blade = new BladeCompiler($empty_filesystem_instance, 'datatables');
751-
$parsed_string = $blade->compileString($str);
749+
$blade = new BladeCompiler($empty_filesystem_instance, 'datatables');
750+
$parsed_string = $blade->compileString($str);
752751

753752
ob_start() and extract($data, EXTR_SKIP);
754753

@@ -776,7 +775,7 @@ private function includeInArray($item, $array)
776775
return array_merge($array, [$item['name'] => $item['content']]);
777776
} else {
778777
$count = 0;
779-
$last = $array;
778+
$last = $array;
780779
$first = [];
781780
foreach ($array as $key => $value) {
782781
if ($count == $item['order']) {
@@ -820,16 +819,16 @@ private function regulateArray()
820819
*/
821820
protected function setupDTRowVariables($key, array &$data)
822821
{
823-
if ( ! empty($this->row_id_tmpl)) {
824-
if ( ! is_callable($this->row_id_tmpl) and Arr::get($data, $this->row_id_tmpl)) {
822+
if (! empty($this->row_id_tmpl)) {
823+
if (! is_callable($this->row_id_tmpl) and Arr::get($data, $this->row_id_tmpl)) {
825824
$data['DT_RowId'] = Arr::get($data, $this->row_id_tmpl);
826825
} else {
827826
$data['DT_RowId'] = $this->getContent($this->row_id_tmpl, $data, $this->result_object[$key]);
828827
}
829828
}
830829

831-
if ( ! empty($this->row_class_tmpl)) {
832-
if ( ! is_callable($this->row_class_tmpl) and Arr::get($data, $this->row_class_tmpl)) {
830+
if (! empty($this->row_class_tmpl)) {
831+
if (! is_callable($this->row_class_tmpl) and Arr::get($data, $this->row_class_tmpl)) {
833832
$data['DT_RowClass'] = Arr::get($data, $this->row_class_tmpl);
834833
} else {
835834
$data['DT_RowClass'] = $this->getContent($this->row_class_tmpl, $data, $this->result_object[$key]);
@@ -849,7 +848,6 @@ protected function setupDTRowVariables($key, array &$data)
849848
$data['DT_RowAttr'][$tkey] = $this->getContent($tvalue, $data, $this->result_object[$key]);
850849
}
851850
}
852-
853851
}
854852

855853
/**
@@ -883,7 +881,7 @@ private function output()
883881
];
884882
} else {
885883
$sColumns = $this->getOutputColumns();
886-
$output = [
884+
$output = [
887885
"sEcho" => (int) $this->input['draw'],
888886
"iTotalRecords" => $this->totalRecords,
889887
"iTotalDisplayRecords" => $this->filteredRecords,
@@ -950,7 +948,7 @@ public function editColumn($name, $content)
950948
*/
951949
public function removeColumn()
952950
{
953-
$names = func_get_args();
951+
$names = func_get_args();
954952
$this->excess_columns = array_merge($this->excess_columns, $names);
955953

956954
return $this;
@@ -991,7 +989,7 @@ protected function databaseDriver()
991989
*/
992990
protected function wrapColumn($value)
993991
{
994-
$parts = explode('.', $value);
992+
$parts = explode('.', $value);
995993
$column = '';
996994
foreach ($parts as $key) {
997995
switch ($this->databaseDriver()) {
@@ -1128,5 +1126,4 @@ protected function addRowAttr($key, $value)
11281126

11291127
return $this;
11301128
}
1131-
11321129
}

0 commit comments

Comments
 (0)