Skip to content

Commit f8a13ef

Browse files
authored
Merge pull request #940 from APY/test-improvement-grid
Added GridTest
2 parents facff3c + f9c549e commit f8a13ef

6 files changed

Lines changed: 6197 additions & 73 deletions

File tree

Grid/Columns.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
namespace APY\DataGridBundle\Grid;
1414

15+
use APY\DataGridBundle\Grid\Column\ActionsColumn;
1516
use APY\DataGridBundle\Grid\Column\Column;
1617
use APY\DataGridBundle\Grid\Helper\ColumnsIterator;
1718
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
@@ -21,6 +22,8 @@ class Columns implements \IteratorAggregate, \Countable
2122
protected $columns = [];
2223
protected $extensions = [];
2324

25+
const MISSING_COLUMN_EX_MSG = 'Column with id "%s" doesn\'t exists';
26+
2427
/**
2528
* @var AuthorizationCheckerInterface
2629
*/
@@ -83,7 +86,7 @@ public function addColumn(Column $column, $position = 0)
8386
public function getColumnById($columnId)
8487
{
8588
if (($column = $this->hasColumnById($columnId, true)) === false) {
86-
throw new \InvalidArgumentException(sprintf('Column with id "%s" doesn\'t exists', $columnId));
89+
throw new \InvalidArgumentException(sprintf(self::MISSING_COLUMN_EX_MSG, $columnId));
8790
}
8891

8992
return $column;
@@ -93,7 +96,7 @@ public function getColumnById($columnId)
9396
* @param $columnId
9497
* @param bool $returnColumn
9598
*
96-
* @return bool|Column
99+
* @return bool|Column|ActionsColumn
97100
*/
98101
public function hasColumnById($columnId, $returnColumn = false)
99102
{

0 commit comments

Comments
 (0)