@@ -67,7 +67,7 @@ |
||
67 | 67 | return $this; |
68 | 68 | } |
69 | 69 | /** |
70 | - * @return mixed |
|
70 | + * @return string |
|
71 | 71 | */ |
72 | 72 | public function getOptions() |
73 | 73 | { |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | * @var array |
15 | 15 | */ |
16 | 16 | public static $clientSideColumnOptions = [ |
17 | - 'cellType','className','contentPadding', 'createdCell', 'data', 'defaultContent', 'name', 'orderable', |
|
17 | + 'cellType', 'className', 'contentPadding', 'createdCell', 'data', 'defaultContent', 'name', 'orderable', |
|
18 | 18 | 'orderData', 'orderDataType', 'render', 'searchable', 'title', 'type', 'visible', 'width' |
19 | 19 | ]; |
20 | 20 | |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | */ |
34 | 34 | protected $formatValueCallback; |
35 | 35 | |
36 | - public function __construct($title='', $options=[]) |
|
36 | + public function __construct($title = '', $options = []) |
|
37 | 37 | { |
38 | 38 | $this->optionsResolver = new OptionsResolver(); |
39 | 39 | $this->configureOptions($this->optionsResolver); |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | { |
95 | 95 | if (is_callable($this->formatValueCallback)) { |
96 | 96 | return call_user_func_array($this->formatValueCallback, [$value, $rowData, $context]); |
97 | - } else{ |
|
97 | + } else { |
|
98 | 98 | return $value; |
99 | 99 | } |
100 | 100 | } |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | /** |
110 | 110 | * @param \Closure $callback |
111 | 111 | */ |
112 | - public function setFormatValueCallback(\Closure $callback=null) |
|
112 | + public function setFormatValueCallback(\Closure $callback = null) |
|
113 | 113 | { |
114 | 114 | $this->formatValueCallback = $callback; |
115 | 115 | return $this; |
@@ -5,9 +5,7 @@ |
||
5 | 5 | use CrossKnowledge\DataTableBundle\DataTable\Table\AbstractTable; |
6 | 6 | use CrossKnowledge\DataTableBundle\DependencyInjection\Compiler\DatatablePass; |
7 | 7 | use CrossKnowledge\DataTableBundle\DependencyInjection\CrossKnowledgeDataTableExtension; |
8 | -use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
|
9 | 8 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
10 | -use Symfony\Component\DependencyInjection\Definition; |
|
11 | 9 | |
12 | 10 | trait UsesContainerTrait |
13 | 11 | { |
@@ -11,7 +11,7 @@ |
||
11 | 11 | |
12 | 12 | trait UsesContainerTrait |
13 | 13 | { |
14 | - protected function compileContainer(ContainerBuilder $container, $loadExt=true) |
|
14 | + protected function compileContainer(ContainerBuilder $container, $loadExt = true) |
|
15 | 15 | { |
16 | 16 | if ($loadExt) { |
17 | 17 | $extension = new CrossKnowledgeDataTableExtension(); |
@@ -11,10 +11,10 @@ |
||
11 | 11 | { |
12 | 12 | parent::configureOptions($resolver); |
13 | 13 | $resolver->setRequired('LinkTextField'); |
14 | - $resolver->setDefault('AltTextField', function (Options $options) { |
|
14 | + $resolver->setDefault('AltTextField', function(Options $options) { |
|
15 | 15 | return $options['LinkTextField']; |
16 | 16 | }); |
17 | - $resolver->setDefault('UrlField', function (Options $options) { |
|
17 | + $resolver->setDefault('UrlField', function(Options $options) { |
|
18 | 18 | return $options['LinkTextField']; |
19 | 19 | }); |
20 | 20 | $resolver->setDefault('UrlCallback', function($value, $row) { |
@@ -10,7 +10,7 @@ |
||
10 | 10 | { |
11 | 11 | $builder = new ColumnBuilder(); |
12 | 12 | |
13 | - for ($i=0;$i<3;$i++) { |
|
13 | + for ($i = 0; $i<3; $i++) { |
|
14 | 14 | $builder->add("testcolumn".$i, new Column("test column ".$i)); |
15 | 15 | } |
16 | 16 |
@@ -28,10 +28,10 @@ |
||
28 | 28 | public function testBasicGetterSetter() |
29 | 29 | { |
30 | 30 | $column = (new Column("test", ['auto_escape' => false])) |
31 | - ->setFormatValueCallback(function() { |
|
31 | + ->setFormatValueCallback(function() { |
|
32 | 32 | return 'test ok'; |
33 | 33 | }) |
34 | - ->setIdentifier('test'); |
|
34 | + ->setIdentifier('test'); |
|
35 | 35 | |
36 | 36 | $this->assertEquals("test", $column->getOptions()['title']); |
37 | 37 | $this->assertEquals("test ok", call_user_func($column->getFormatValueCallback())); |
@@ -15,7 +15,7 @@ |
||
15 | 15 | public function testFormatCellUsesCallback() |
16 | 16 | { |
17 | 17 | $column = new Column("test"); |
18 | - $column->setFormatValueCallback(function($val, $row){ |
|
18 | + $column->setFormatValueCallback(function($val, $row) { |
|
19 | 19 | return $val.'ok'; |
20 | 20 | }); |
21 | 21 |
@@ -12,8 +12,8 @@ |
||
12 | 12 | public function testRetrieveTableById() |
13 | 13 | { |
14 | 14 | $table = $this->getMockBuilder(AbstractTable::class) |
15 | - ->disableOriginalConstructor() |
|
16 | - ->getMock(); |
|
15 | + ->disableOriginalConstructor() |
|
16 | + ->getMock(); |
|
17 | 17 | |
18 | 18 | $registry = new DataTableRegistry(['test' => $table]); |
19 | 19 | $this->assertEquals($table, $registry->retrieveByTableId('test')); |
@@ -13,9 +13,9 @@ |
||
13 | 13 | { |
14 | 14 | $tableMock = $this->getTableMock(); |
15 | 15 | $request = new Request([], [ |
16 | - 'order' => [['column' => '1', 'dir' => 'desc']], |
|
17 | - 'start' => 242, |
|
18 | - 'length' => 342 |
|
16 | + 'order' => [['column' => '1', 'dir' => 'desc']], |
|
17 | + 'start' => 242, |
|
18 | + 'length' => 342 |
|
19 | 19 | ]); |
20 | 20 | |
21 | 21 | $paginateRequest = PaginateRequest::fromHttpRequest($request, $tableMock); |
@@ -24,8 +24,8 @@ |
||
24 | 24 | $formatter = new DefaultFormatter(); |
25 | 25 | |
26 | 26 | $row = [ |
27 | - 'escapedcolumn' => '<testval', |
|
28 | - 'unescapedcolumn' => '<testval', |
|
27 | + 'escapedcolumn' => '<testval', |
|
28 | + 'unescapedcolumn' => '<testval', |
|
29 | 29 | ]; |
30 | 30 | |
31 | 31 | $expected = [ |
@@ -19,19 +19,19 @@ |
||
19 | 19 | { |
20 | 20 | $tableMock = $this->getDataTableMock(); |
21 | 21 | $registryMock = $this->getMockBuilder('CrossKnowledge\DataTableBundle\DataTable\DataTableRegistry') |
22 | - ->disableOriginalConstructor() |
|
23 | - ->getMock(); |
|
22 | + ->disableOriginalConstructor() |
|
23 | + ->getMock(); |
|
24 | 24 | |
25 | 25 | $registryMock->expects($this->once()) |
26 | - ->method('retrieveByTableId') |
|
27 | - ->will($this->returnValue($tableMock)); |
|
26 | + ->method('retrieveByTableId') |
|
27 | + ->will($this->returnValue($tableMock)); |
|
28 | 28 | |
29 | 29 | $rendererMock = $this->getMockBuilder('CrossKnowledge\DataTableBundle\DataTable\Renderer\JsonRenderer') |
30 | - ->getMock(); |
|
30 | + ->getMock(); |
|
31 | 31 | |
32 | 32 | $rendererMock->expects($this->once()) |
33 | - ->method('renderJsonResponse') |
|
34 | - ->with($tableMock); |
|
33 | + ->method('renderJsonResponse') |
|
34 | + ->with($tableMock); |
|
35 | 35 | |
36 | 36 | $request = new Request([], [], ['tableid' => 'testtable_id']); |
37 | 37 |