refactor: Tidy applyOrder method

liquidlight · Sep 1, 2024 · 805236b · 805236b
1 parent ce96919
commit 805236b
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/Classes/Controller/DatatableController.php b/Classes/Controller/DatatableController.php
@@ -357,8 +357,16 @@ public function applyOrder(QueryBuilder $query, array $params)
 		$columnCount = count($this->headers);
 
 		foreach ($orders as $order) {
+
+			// Prepare the directions
+			$dir = strtoupper($order['dir'] ?? 'ASC');
+
+			if (!in_array($dir, ['ASC', 'DESC'], true)) {
+				continue;
+			}
+
+			// Prepare the column index
 			$column = $order['column'] ?? false;
-			$dir = $order['dir'] ?? 'ASC';
 
 			if (!is_numeric($column)) {
 				continue;
@@ -368,17 +376,11 @@ public function applyOrder(QueryBuilder $query, array $params)
 
 			if (!is_int($column)) {
 				continue;
-			}
-
-			if (0 > $column || $column >= $columnCount) {
-				continue;
-			}
-
-			if (!in_array(strtoupper($dir), ['ASC', 'DESC'], true)) {
+			} elseif (0 > $column || $column >= $columnCount) {
 				continue;
 			}
 
-			// SQL order by columns are 1-base
+			// Note: SQL order by column index is 1-base
 			$query->getConcreteQueryBuilder()->addOrderBy($column + 1, $dir);
 		}