@@ -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 |
@@ -20,11 +20,11 @@ |
||
20 | 20 | ->getMock(); |
21 | 21 | |
22 | 22 | $templateMock = $this->getMockBuilder(\Twig_TemplateInterface::class) |
23 | - ->disableOriginalConstructor() |
|
24 | - ->getMock(); |
|
23 | + ->disableOriginalConstructor() |
|
24 | + ->getMock(); |
|
25 | 25 | |
26 | 26 | $twig->expects($this->once())->method('loadTemplate') |
27 | - ->will($this->returnValue($templateMock)); |
|
27 | + ->will($this->returnValue($templateMock)); |
|
28 | 28 | |
29 | 29 | $renderer = new TwigRenderer($twig); |
30 | 30 | $renderer->render($mock); |
@@ -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')); |
@@ -20,12 +20,12 @@ discard block |
||
20 | 20 | protected function getTableMock($cols, $rows) |
21 | 21 | { |
22 | 22 | $formFactory = $this->getMockBuilder(FormFactory::class) |
23 | - ->disableOriginalConstructor() |
|
24 | - ->getMock(); |
|
23 | + ->disableOriginalConstructor() |
|
24 | + ->getMock(); |
|
25 | 25 | |
26 | 26 | $form = $this->getMockBuilder('Symfony\Component\Form\Form') |
27 | - ->disableOriginalConstructor() |
|
28 | - ->getMock(); |
|
27 | + ->disableOriginalConstructor() |
|
28 | + ->getMock(); |
|
29 | 29 | |
30 | 30 | $authChecker = $this->getMockBuilder(AuthorizationChecker::class) |
31 | 31 | ->disableOriginalConstructor() |
@@ -39,20 +39,20 @@ discard block |
||
39 | 39 | $layout = new Bootstrap(); |
40 | 40 | |
41 | 41 | $mock = $this->getMockBuilder(AbstractTable::class) |
42 | - ->setConstructorArgs([ |
|
43 | - $formFactory, $authChecker, |
|
44 | - $router, $formatter, $layout |
|
45 | - ]) |
|
46 | - ->setMethods(['getColumns', 'getFilterForm']) |
|
47 | - ->getMockForAbstractClass(); |
|
42 | + ->setConstructorArgs([ |
|
43 | + $formFactory, $authChecker, |
|
44 | + $router, $formatter, $layout |
|
45 | + ]) |
|
46 | + ->setMethods(['getColumns', 'getFilterForm']) |
|
47 | + ->getMockForAbstractClass(); |
|
48 | 48 | |
49 | 49 | $mock->expects($this->any()) |
50 | 50 | ->method('getDataIterator') |
51 | 51 | ->will($this->returnValue($rows)); |
52 | 52 | |
53 | 53 | $mock->expects($this->any()) |
54 | - ->method('getColumns') |
|
55 | - ->will($this->returnValue($cols)); |
|
54 | + ->method('getColumns') |
|
55 | + ->will($this->returnValue($cols)); |
|
56 | 56 | |
57 | 57 | $mock->expects($this->any()) |
58 | 58 | ->method('getFilterForm') |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | |
73 | 73 | $filterForm = $table->getFilterForm(); |
74 | 74 | $filterForm->expects($this->never()) |
75 | - ->method('createView'); |
|
75 | + ->method('createView'); |
|
76 | 76 | |
77 | 77 | $viewData = $table->buildView(); |
78 | 78 | $this->assertEquals($viewData['datatable'], $table); |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | |
86 | 86 | $filterForm = $table->getFilterForm(); |
87 | 87 | $filterForm->expects($this->once()) |
88 | - ->method('createView'); |
|
88 | + ->method('createView'); |
|
89 | 89 | $table->buildView(); |
90 | 90 | } |
91 | 91 | /** |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $table->setOptions(['has_filter_form' => false]); |
98 | 98 | $filterForm = $table->getFilterForm(); |
99 | 99 | $filterForm->expects($this->never()) |
100 | - ->method('createView'); |
|
100 | + ->method('createView'); |
|
101 | 101 | |
102 | 102 | $table->buildView(); |
103 | 103 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | |
107 | 107 | $filterForm = $table->getFilterForm(); |
108 | 108 | $filterForm->expects($this->once()) |
109 | - ->method('createView'); |
|
109 | + ->method('createView'); |
|
110 | 110 | $table->buildView(); |
111 | 111 | } |
112 | 112 | /** |
@@ -131,17 +131,17 @@ discard block |
||
131 | 131 | public function buildViewProvider() |
132 | 132 | { |
133 | 133 | return [ |
134 | - [ |
|
135 | - [ |
|
136 | - 'firstCol' => new Column('title 1st col'), |
|
137 | - 'secondCol' => new Column('title 2nd col') |
|
138 | - ], |
|
139 | - [ |
|
140 | - ['firstCol' => 'row1column1value', 'secondCol' => 'row2column2value'], |
|
141 | - ['firstCol' => 'row2column1value', 'secondCol' => 'row2column2value'] |
|
142 | - ], |
|
143 | - 2 |
|
144 | - ] |
|
134 | + [ |
|
135 | + [ |
|
136 | + 'firstCol' => new Column('title 1st col'), |
|
137 | + 'secondCol' => new Column('title 2nd col') |
|
138 | + ], |
|
139 | + [ |
|
140 | + ['firstCol' => 'row1column1value', 'secondCol' => 'row2column2value'], |
|
141 | + ['firstCol' => 'row2column1value', 'secondCol' => 'row2column2value'] |
|
142 | + ], |
|
143 | + 2 |
|
144 | + ] |
|
145 | 145 | ]; |
146 | 146 | } |
147 | 147 | } |
148 | 148 | \ No newline at end of file |
@@ -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); |