Skip to content

Commit f0e1a08

Browse files
AllanJardAllanJard
committed
Dev: Forgot to reformat the code
1 parent e25bd84 commit f0e1a08

File tree

2 files changed

+46
-50
lines changed

2 files changed

+46
-50
lines changed

‎Editor/ColumnControl.php‎

Lines changed: 45 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@
33
namespace DataTables\Editor;
44

55
/**
6-
* Column search methods for server-side processing
6+
* Column search methods for server-side processing.
77
*/
88
class ColumnControl
99
{
1010
/**
11-
* Apply conditions to a query for a ColumnControl search
11+
* Apply conditions to a query for a ColumnControl search.
1212
*
13-
* @param \DataTables\Editor $editor Host Editor instance
14-
* @param \DataTables\Database\Query $query Query to add conditions to
15-
* @param mixed $http Request object
16-
* @return void
13+
* @param \DataTables\Editor $editor Host Editor instance
14+
* @param \DataTables\Database\Query $query Query to add conditions to
15+
* @param mixed $http Request object
1716
*/
1817
public static function ssp(&$editor, &$query, $http)
1918
{
20-
for ($i = 0; $i < count($http['columns']); $i++) {
19+
for ($i = 0; $i < count($http['columns']); ++$i) {
2120
$column = $http['columns'][$i];
2221

2322
if (isset($column['columnControl'])) {
@@ -33,7 +32,7 @@ public static function ssp(&$editor, &$query, $http)
3332

3433
if ($type === 'num') {
3534
self::_sspNumber($query, $field, $value, $logic);
36-
} else if ($type === 'date') {
35+
} elseif ($type === 'date') {
3736
self::_sspDate($query, $field, $value, $logic);
3837
} else {
3938
self::_sspText($query, $field, $value, $logic);
@@ -51,108 +50,105 @@ public static function ssp(&$editor, &$query, $http)
5150
}
5251

5352
/**
54-
* Add conditions to a query for a ColumnControl date search
53+
* Add conditions to a query for a ColumnControl date search.
5554
*
5655
* @param \DataTables\Database\Query $query Query to add the conditions to
57-
* @param \DataTables\Editor\Field $field Field for the column in question
58-
* @param string $value Search term
59-
* @param string $logic Search logic
60-
* @return void
56+
* @param \DataTables\Editor\Field $field Field for the column in question
57+
* @param string $value Search term
58+
* @param string $logic Search logic
6159
*/
6260
private static function _sspDate(&$query, $field, $value, $logic)
6361
{
6462
if ($logic === 'empty') {
6563
$query->where($field->dbField(), null);
66-
} else if ($logic === 'notEmpty') {
64+
} elseif ($logic === 'notEmpty') {
6765
$query->where($field->dbField(), null, '!=');
68-
} else if ($value === '') {
66+
} elseif ($value === '') {
6967
// Empty search value means no search for the other logic operators
7068
return;
71-
} else if ($logic === 'equal') {
69+
} elseif ($logic === 'equal') {
7270
$query->where($field->dbField(), $value);
73-
} else if ($logic === 'notEqual') {
71+
} elseif ($logic === 'notEqual') {
7472
$query->where($field->dbField(), $value, '!=');
75-
} else if ($logic === 'greater') {
73+
} elseif ($logic === 'greater') {
7674
$query->where($field->dbField(), $value, '>');
77-
} else if ($logic === 'less') {
75+
} elseif ($logic === 'less') {
7876
$query->where($field->dbField(), $value, '<');
7977
}
8078
}
8179

8280
/**
83-
* Add conditions to a query for a ColumnControl number search
81+
* Add conditions to a query for a ColumnControl number search.
8482
*
8583
* @param \DataTables\Database\Query $query Query to add the conditions to
86-
* @param \DataTables\Editor\Field $field Field for the column in question
87-
* @param string $value Search term
88-
* @param string $logic Search logic
89-
* @return void
84+
* @param \DataTables\Editor\Field $field Field for the column in question
85+
* @param string $value Search term
86+
* @param string $logic Search logic
9087
*/
9188
private static function _sspNumber(&$query, $field, $value, $logic)
9289
{
9390
if ($logic === 'empty') {
94-
$query->where(function ($q) use ($field) {
91+
$query->where(static function ($q) use ($field) {
9592
$q->where($field->dbField(), null);
9693
$q->or_where($field->dbField(), '');
9794
});
98-
} else if ($logic === 'notEmpty') {
99-
$query->where(function ($q) use ($field) {
95+
} elseif ($logic === 'notEmpty') {
96+
$query->where(static function ($q) use ($field) {
10097
$q->where($field->dbField(), null, '!=');
10198
$q->where($field->dbField(), '', '!=');
10299
});
103-
} else if ($value === '') {
100+
} elseif ($value === '') {
104101
// Empty search value means no search for the other logic operators
105102
return;
106-
} else if ($logic === 'equal') {
103+
} elseif ($logic === 'equal') {
107104
$query->where($field->dbField(), $value);
108-
} else if ($logic === 'notEqual') {
105+
} elseif ($logic === 'notEqual') {
109106
$query->where($field->dbField(), $value, '!=');
110-
} else if ($logic === 'greater') {
107+
} elseif ($logic === 'greater') {
111108
$query->where($field->dbField(), $value, '>');
112-
} else if ($logic === 'greaterOrEqual') {
109+
} elseif ($logic === 'greaterOrEqual') {
113110
$query->where($field->dbField(), $value, '>=');
114-
} else if ($logic === 'less') {
111+
} elseif ($logic === 'less') {
115112
$query->where($field->dbField(), $value, '<');
116-
} else if ($logic === 'lessOrEqual') {
113+
} elseif ($logic === 'lessOrEqual') {
117114
$query->where($field->dbField(), $value, '<=');
118115
}
119116
}
120117

121118
/**
122-
* Add conditions to a query for a ColumnControl text search
119+
* Add conditions to a query for a ColumnControl text search.
123120
*
124121
* @param \DataTables\Database\Query $query Query to add the conditions to
125-
* @param \DataTables\Editor\Field $field Field for the column in question
126-
* @param string $value Search term
127-
* @param string $logic Search logic
128-
* @return void
122+
* @param \DataTables\Editor\Field $field Field for the column in question
123+
* @param string $value Search term
124+
* @param string $logic Search logic
129125
*/
130126
private static function _sspText(&$query, $field, $value, $logic)
131127
{
132128
if ($logic === 'empty') {
133-
$query->where(function ($q) use ($field) {
129+
$query->where(static function ($q) use ($field) {
134130
$q->where($field->dbField(), null);
135131
$q->or_where($field->dbField(), '');
136132
});
137-
} else if ($logic === 'notEmpty') {
138-
$query->where(function ($q) use ($field) {
133+
} elseif ($logic === 'notEmpty') {
134+
$query->where(static function ($q) use ($field) {
139135
$q->where($field->dbField(), null, '!=');
140136
$q->where($field->dbField(), '', '!=');
141137
});
142-
} else if ($value === '') {
138+
} elseif ($value === '') {
143139
// Empty search value means no search for the other logic operators
144140
return;
145-
} else if ($logic === 'equal') {
141+
} elseif ($logic === 'equal') {
146142
$query->where($field->dbField(), $value);
147-
} else if ($logic === 'notEqual') {
143+
} elseif ($logic === 'notEqual') {
148144
$query->where($field->dbField(), $value, '!=');
149-
} else if ($logic === 'contains') {
145+
} elseif ($logic === 'contains') {
150146
$query->where($field->dbField(), '%' . $value . '%', 'like');
151-
} else if ($logic === 'notContains') {
147+
} elseif ($logic === 'notContains') {
152148
$query->where($field->dbField(), '%' . $value . '%', 'not like');
153-
} else if ($logic === 'starts') {
149+
} elseif ($logic === 'starts') {
154150
$query->where($field->dbField(), $value . '%', 'like');
155-
} else if ($logic === 'ends') {
151+
} elseif ($logic === 'ends') {
156152
$query->where($field->dbField(), '%' . $value, 'like');
157153
}
158154
}

‎Editor/Field.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public function dbField($_ = null)
206206
}
207207

208208
/**
209-
* Options for ColumnControl's searchList content type
209+
* Options for ColumnControl's searchList content type.
210210
*
211211
* @param Options $_ Options
212212
*

0 commit comments

Comments
 (0)