mathieupetrini / doctrinedatatable

src/DoctrineDatatable/Datatable.php

Spacing +4 added lines, -6 removed lines

@@ -92,7 +92,7 @@ 
         $temp = array(
             'columns' => array(),
         );
-        array_map(function (Column $column) use ($filters, &$temp) {
+        array_map(function(Column $column) use ($filters, &$temp) {
             $temp['columns'][] = array(
                 'search' => array(
                     'value' => $filters['search'][Column::GLOBAL_ALIAS],
@@ -126,8 +126,7 @@ 
             $column = isset($this->columns[$index]) ? $this->columns[$index] : null;
             if ($column instanceof Column && !empty($filter['search']['value'])) {
                 $temp .= $this->globalSearch ?
-                    (!empty($temp) ? ' OR ' : '').$expr->orX($column->where($query, $filter['search']['value'])) :
-                    (!empty($temp) ? ' AND ' : '').$expr->andX($column->where($query, $filter['search']['value']));
+                    (!empty($temp) ? ' OR ' : '').$expr->orX($column->where($query, $filter['search']['value'])) : (!empty($temp) ? ' AND ' : '').$expr->andX($column->where($query, $filter['search']['value']));
             }
         }
 
@@ -156,8 +155,7 @@ 
         $temp = $this->createWherePart($query, $filters);
 
         return !empty($temp) ?
-            $query->andWhere($temp) :
-            $query;
+            $query->andWhere($temp) : $query;
     }
 
     /**
@@ -278,7 +276,7 @@ 
      */
     private function columns(): array
     {
-        return array_map(static function (Column $column) {
+        return array_map(static function(Column $column) {
             return array(
                 'data' => $column->getAlias(),
             );