ublaboo / datagrid

src/DataSource/NextrasDataSource.php

Indentation +6 added lines, -6 removed lines

@@ -287,12 +287,12 @@
 		return $this;
 	}
         
-        /**
-         * Adjust column from DataGrid 'foreignKey.column' to Nextras 'this->foreignKey->column'
-         * @param string $column
-         * @return string
-         */
-        private function prepareColumn($column) {
+		/**
+		 * Adjust column from DataGrid 'foreignKey.column' to Nextras 'this->foreignKey->column'
+		 * @param string $column
+		 * @return string
+		 */
+		private function prepareColumn($column) {
 		if (Strings::contains($column, '.')) {
 			return 'this->' . str_replace('.', '->', $column);
 		}

Spacing +7 added lines, -7 removed lines

@@ -101,8 +101,8 @@ 
 			$date_end = clone $date;
 
 			$this->data_source = $this->data_source->findBy([
-				$this->prepareColumn($column) . '>=' => $date->setTime(0, 0, 0),
-				$this->prepareColumn($column) . '<=' => $date_end->setTime(23, 59, 59)
+				$this->prepareColumn($column).'>=' => $date->setTime(0, 0, 0),
+				$this->prepareColumn($column).'<=' => $date_end->setTime(23, 59, 59)
 			]);
 		}
 
@@ -125,12 +125,12 @@ 
 		$dataCondition = [];
 		if ($value_from) {
 			$date_from = \DateTime::createFromFormat($filter->getPhpFormat(), $value_from);
-			$dataCondition[$this->prepareColumn($filter->getColumn()) . '>='] = $date_from->setTime(0, 0, 0);
+			$dataCondition[$this->prepareColumn($filter->getColumn()).'>='] = $date_from->setTime(0, 0, 0);
 		}
 
 		if ($value_to) {
 			$date_to = \DateTime::createFromFormat($filter->getPhpFormat(), $value_to);
-			$dataCondition[$this->prepareColumn($filter->getColumn()) . '<='] = $date_to->setTime(23, 59, 59);
+			$dataCondition[$this->prepareColumn($filter->getColumn()).'<='] = $date_to->setTime(23, 59, 59);
 		}
 
 		if (!empty($dataCondition)) {
@@ -154,11 +154,11 @@ 
 		$dataCondition = [];
 
 		if ($value_from) {
-			$dataCondition[$this->prepareColumn($filter->getColumn()) . '>='] = $value_from;
+			$dataCondition[$this->prepareColumn($filter->getColumn()).'>='] = $value_from;
 		}
 
 		if ($value_to) {
-			$dataCondition[$this->prepareColumn($filter->getColumn()) . '<='] = $value_to;
+			$dataCondition[$this->prepareColumn($filter->getColumn()).'<='] = $value_to;
 		}
 
 		if (!empty($dataCondition)) {
@@ -294,7 +294,7 @@ 
          */
         private function prepareColumn($column) {
 		if (Strings::contains($column, '.')) {
-			return 'this->' . str_replace('.', '->', $column);
+			return 'this->'.str_replace('.', '->', $column);
 		}
 		return $column;
 	}