Completed
Pull Request — master (#375)
by Dalibor
02:47
created
src/DataSource/DoctrineDataSource.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
 
53 53
 	/**
54 54
 	 * @return Doctrine\ORM\Query
55
-	*/
55
+	 */
56 56
 	public function getQuery()
57 57
 	{
58 58
 		return $this->data_source->getQuery();
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
 		foreach ($condition as $column => $value) {
236 236
 			$c = $this->checkAliases($column);
237 237
 
238
-			if($filter->isExactSearch()){
238
+			if ($filter->isExactSearch()) {
239 239
 				$exprs[] = $this->data_source->expr()->eq($c, $this->data_source->expr()->literal($value));
240 240
 				continue;
241 241
 			}
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
 		}
371 371
 		$this->data_source->resetDQLPart('select');
372 372
 		foreach ($this->aggregations as $column => $aggregation_type) {
373
-			$query = $this->data_source->select("$aggregation_type(" . $this->checkAliases($column) . ") AS $column");
373
+			$query = $this->data_source->select("$aggregation_type(".$this->checkAliases($column).") AS $column");
374 374
 		}
375 375
 		return $query->getQuery()->getSingleResult();
376 376
 	}
Please login to merge, or discard this patch.
src/Column/Action.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,6 @@
 block discarded – undo
10 10
 
11 11
 use Nette\Utils\Html;
12 12
 use Ublaboo\DataGrid\DataGrid;
13
-use Ublaboo\DataGrid\Exception\DataGridHasToBeAttachedToPresenterComponentException;
14 13
 use Ublaboo\DataGrid\Exception\DataGridException;
15 14
 use Ublaboo\DataGrid\Row;
16 15
 
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 	/**
186 186
 	 * Set icon
187 187
 	 * @param string|callable $icon
188
-	 * @return static|callable
188
+	 * @return Action
189 189
 	 * @throws DataGridException
190 190
 	 */
191 191
 	public function setIcon($icon)
@@ -270,7 +270,8 @@  discard block
 block discarded – undo
270 270
 
271 271
 	/**
272 272
 	 * Check whether given property is string or callable
273
-	 * @param  mixed $property
273
+	 * @param  callable $property
274
+	 * @param string $name
274 275
 	 * @return void
275 276
 	 * @throws DataGridException
276 277
 	 */
Please login to merge, or discard this patch.
src/Column/ColumnLink.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,6 @@
 block discarded – undo
10 10
 
11 11
 use Nette\Utils\Html;
12 12
 use Ublaboo\DataGrid\DataGrid;
13
-use Ublaboo\DataGrid\Exception\DataGridHasToBeAttachedToPresenterComponentException;
14 13
 use Ublaboo\DataGrid\Exception\DataGridException;
15 14
 use Ublaboo\DataGrid\Row;
16 15
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@
 block discarded – undo
108 108
 		$element = $a;
109 109
 
110 110
 		if ($this->icon) {
111
-			$a->addHtml(Html::el('span')->class(DataGrid::$icon_prefix . $this->icon));
111
+			$a->addHtml(Html::el('span')->class(DataGrid::$icon_prefix.$this->icon));
112 112
 
113 113
 			if (strlen($value)) {
114 114
 				$a->addHtml(' ');
Please login to merge, or discard this patch.
src/DataModel.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,6 @@
 block discarded – undo
8 8
 
9 9
 namespace Ublaboo\DataGrid;
10 10
 
11
-use Nette;
12 11
 use DibiFluent;
13 12
 use DibiOdbcDriver;
14 13
 use DibiMsSqlDriver;
Please login to merge, or discard this patch.
src/DataSource/FilterableDataSource.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -8,9 +8,7 @@
 block discarded – undo
8 8
 
9 9
 namespace Ublaboo\DataGrid\DataSource;
10 10
 
11
-use DibiFluent;
12 11
 use Nette\Utils\Callback;
13
-use Nette\Utils\Strings;
14 12
 use Ublaboo\DataGrid\Filter;
15 13
 
16 14
 abstract class FilterableDataSource
Please login to merge, or discard this patch.
src/Column/ColumnStatus.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
 
49 49
 		$this->key = $key;
50 50
 
51
-		$this->setTemplate(__DIR__ . '/../templates/column_status.latte');
51
+		$this->setTemplate(__DIR__.'/../templates/column_status.latte');
52 52
 	}
53 53
 
54 54
 
Please login to merge, or discard this patch.
src/DataSource/ArrayDataSource.php 3 patches
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -10,9 +10,7 @@
 block discarded – undo
10 10
 
11 11
 use Ublaboo\DataGrid\Filter\Filter;
12 12
 use Ublaboo\DataGrid\Filter\FilterDate;
13
-use Nette\Utils\Callback;
14 13
 use Nette\Utils\Strings;
15
-use Ublaboo\DataGrid\Exception\DataGridException;
16 14
 use Ublaboo\DataGrid\Exception\DataGridArrayDataSourceException;
17 15
 use Ublaboo\DataGrid\Utils\DateTimeHelper;
18 16
 use Ublaboo\DataGrid\Exception\DataGridDateTimeHelperException;
Please login to merge, or discard this patch.
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 	 * Filter by multi select value
170 170
 	 * @param  mixed  $row
171 171
 	 * @param  FilterMultiSelect $filter
172
-	 * @return void
172
+	 * @return boolean
173 173
 	 */
174 174
 	public function applyFilterMultiSelect($row, FilterMultiSelect $filter)
175 175
 	{
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 	/**
184 184
 	 * @param  mixed  $row
185 185
 	 * @param  FilterRange $filter
186
-	 * @return void
186
+	 * @return boolean
187 187
 	 */
188 188
 	public function applyFilterRange($row, FilterRange $filter)
189 189
 	{
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 	/**
210 210
 	 * @param  mixed  $row
211 211
 	 * @param  FilterDateRange $filter
212
-	 * @return void
212
+	 * @return boolean
213 213
 	 */
214 214
 	public function applyFilterDateRange($row, FilterDateRange $filter)
215 215
 	{
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 * Apply fitler date and tell whether row value matches or not
271 271
 	 * @param  mixed  $row
272 272
 	 * @param  Filter $filter
273
-	 * @return mixed
273
+	 * @return boolean|null
274 274
 	 */
275 275
 	protected function applyFilterDate($row, FilterDate $filter)
276 276
 	{
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 						[$this->data, $filter->getValue()]
94 94
 					);
95 95
 				} else {
96
-					$this->data = array_filter($this->data, function ($row) use ($filter) {
96
+					$this->data = array_filter($this->data, function($row) use ($filter) {
97 97
 						return $this->applyFilter($row, $filter);
98 98
 					});
99 99
 				}
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
 
422 422
 		foreach ($this->aggregations as $column => $aggregation_type) {
423 423
 			if ($aggregation_type == ColumnAggregationFunction::$aggregation_type_avg) {
424
-				$result[$column] =  $result[$column] / count($this->data);
424
+				$result[$column] = $result[$column] / count($this->data);
425 425
 			}
426 426
 		}
427 427
 		return $result;
Please login to merge, or discard this patch.
src/Row.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -219,7 +219,7 @@
 block discarded – undo
219 219
 	/**
220 220
 	 * @param  string        $key
221 221
 	 * @param  Column\Column $column
222
-	 * @return void
222
+	 * @return Column\Column
223 223
 	 */
224 224
 	public function applyColumnCallback($key, Column\Column $column)
225 225
 	{
Please login to merge, or discard this patch.
src/GroupAction/GroupSelectAction.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -8,8 +8,6 @@
 block discarded – undo
8 8
 
9 9
 namespace Ublaboo\DataGrid\GroupAction;
10 10
 
11
-use Nette;
12
-
13 11
 /**
14 12
  * @method void onSelect()
15 13
  */
Please login to merge, or discard this patch.