@@ -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 | { |
@@ -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())); |
@@ -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); |
@@ -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 | |