ublaboo / datagrid

src/DataSource/DibiFluentDataSource.php

Doc Comments +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 
 
 	/**
-	 * @param DibiFluent $data_source
+	 * @param Dibi\Fluent $data_source
 	 * @param string $primary_key
 	 */
 	public function __construct(\Dibi\Fluent $data_source, $primary_key)

Spacing +2 added lines, -2 removed lines

@@ -171,7 +171,7 @@ 
 				\dibi::IDENTIFIER
 			);
 
-			if ($filter->isExactSearch()){
+			if ($filter->isExactSearch()) {
 				$this->data_source->where("$column = %s", $value);
 				continue;
 			}
@@ -303,7 +303,7 @@ 
 
 	public function addAggregationColumn($aggregation_type, $column)
 	{
-		$this->aggregation_data_source = $this->aggregation_data_source->select($aggregation_type .'(%n)', $column)->as($column);
+		$this->aggregation_data_source = $this->aggregation_data_source->select($aggregation_type.'(%n)', $column)->as($column);
 	}
 
 	public function getAggregationData()

src/DataSource/DoctrineCollectionDataSource.php

Spacing +2 added lines, -2 removed lines

@@ -177,7 +177,7 @@ 
 		$exprs = [];
 
 		foreach ($filter->getCondition() as $column => $value) {
-			if($filter->isExactSearch()) {
+			if ($filter->isExactSearch()) {
 				$exprs[] = Criteria::expr()->eq($column, $value);
 				continue;
 			}
@@ -310,7 +310,7 @@ 
 
 		foreach ($this->aggregations as $column => $aggregation_type) {
 			if ($aggregation_type == ColumnAggregationFunction::$aggregation_type_avg) {
-				$result[$column] =  $result[$column] / $this->data_source->count();
+				$result[$column] = $result[$column] / $this->data_source->count();
 			}
 		}
 		return $result;

src/DataSource/NetteDatabaseTableDataSource.php

Spacing +9 added lines, -9 removed lines

@@ -23,7 +23,7 @@ 
 	/**
 	 * @var array
 	 */
-	protected  $aggregations =[];
+	protected  $aggregations = [];
 
 	/**
 	 * @var array
@@ -66,7 +66,7 @@ 
 		}
 
 		return $this->data_source->count(
-			$this->data_source->getName() . '.' . (is_array($primary) ? reset($primary) : $primary)
+			$this->data_source->getName().'.'.(is_array($primary) ? reset($primary) : $primary)
 		);
 	}
 
@@ -177,8 +177,8 @@ 
 			$like = '(';
 			$args = [];
 
-			if($filter->isExactSearch()){
-				$like .=  "$column = ? OR ";
+			if ($filter->isExactSearch()) {
+				$like .= "$column = ? OR ";
 				$args[] = "$value";
 			} else {
 				if ($filter->hasSplitWordsSearch() === FALSE) {
@@ -191,7 +191,7 @@ 
 					$args[] = "%$word%";
 				}
 			}
-			$like = substr($like, 0, strlen($like) - 4) . ')';
+			$like = substr($like, 0, strlen($like) - 4).')';
 
 			$or[] = $like;
 			$big_or .= "$like OR ";
@@ -229,9 +229,9 @@ 
 		
 			foreach ($values as $value) {
 				if ($i == $length) {
-					$or .= $filter->getColumn() . ' = ?)';
+					$or .= $filter->getColumn().' = ?)';
 				} else {
-					$or .= $filter->getColumn() . ' = ? OR ';
+					$or .= $filter->getColumn().' = ? OR ';
 				}
 
 				$i++;
@@ -241,7 +241,7 @@ 
 
 			call_user_func_array([$this->data_source, 'where'], $values);
 		} else {
-			$this->data_source->where($filter->getColumn() . ' = ?', reset($values));
+			$this->data_source->where($filter->getColumn().' = ?', reset($values));
 		}
 	}
 
@@ -327,7 +327,7 @@ 
 		$result = [];
 		//there should really be some better way to do this and get all results in one query, this could be big performance issue on bigger tables
 		foreach ($this->aggregations as $column => $aggregation_type) {
-			$result[$column] = $this->data_source->aggregation($aggregation_type . '(' . $column . ')');
+			$result[$column] = $this->data_source->aggregation($aggregation_type.'('.$column.')');
 		}
 
 		return $result;

src/DataSource/NextrasDataSource.php

Spacing +9 added lines, -9 removed lines

@@ -107,8 +107,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)
 			]);
 		}
 
@@ -131,12 +131,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)) {
@@ -160,11 +160,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)) {
@@ -308,7 +308,7 @@ 
 	private function prepareColumn($column)
 	{
 	if (Strings::contains($column, '.')) {
-		return 'this->' . str_replace('.', '->', $column);
+		return 'this->'.str_replace('.', '->', $column);
 	}
 	return $column;
 	}
@@ -334,10 +334,10 @@ 
 		}
 		$sql = 'SELECT ';
 		foreach ($this->aggregations as $column => $aggregation_type) {
-			$sql .= $aggregation_type . '(' . $column . ') as ' . $column . ',';
+			$sql .= $aggregation_type.'('.$column.') as '.$column.',';
 		}
 
-		$sql = rtrim($sql, ',') . ' FROM ( ' . $this->data_source->getQueryBuilder()->getQuerySql() . ' ) as data';
+		$sql = rtrim($sql, ',').' FROM ( '.$this->data_source->getQueryBuilder()->getQuerySql().' ) as data';
 
 		$params = $this->data_source->getQueryBuilder()->getQueryParameters();
 		array_unshift($params, $sql);

src/DataSource/ArrayDataSource.php

Spacing +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
 						[$this->data, $filter->getValue()]
 					);
 				} else {
-					$this->data = array_filter($this->data, function ($row) use ($filter) {
+					$this->data = array_filter($this->data, function($row) use ($filter) {
 						return $this->applyFilter($row, $filter);
 					});
 				}
@@ -421,7 +421,7 @@ 
 
 		foreach ($this->aggregations as $column => $aggregation_type) {
 			if ($aggregation_type == ColumnAggregationFunction::$aggregation_type_avg) {
-				$result[$column] =  $result[$column] / count($this->data);
+				$result[$column] = $result[$column] / count($this->data);
 			}
 		}
 		return $result;

src/DataModel.php

Doc Comments +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
 
 
 	/**
-	 * @param array $columns
+	 * @param Column\IColumn[] $columns
 	 * @return array|bool
 	 */
 	public function aggregationRow(array $columns)