CS

contao · Sep 15, 2022 · 7dd1052 · 7dd1052
1 parent 3348d0a
commit 7dd1052
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 27 deletions.
diff --git a/core-bundle/tests/Contao/DataContainerTest.php b/core-bundle/tests/Contao/DataContainerTest.php
@@ -23,8 +23,10 @@ class DataContainerTest extends TestCase
     public function testCombiner(array $source, array $expected): void
     {
         $class = new \ReflectionClass(DC_Table::class);
+
         $method = $class->getMethod('combiner');
         $method->setAccessible(true);
+
         $names = $method->invoke($class->newInstanceWithoutConstructor(), $source);
 
         $this->assertSame($expected, array_values($names));

diff --git a/core-bundle/tests/Contao/DC_TableTest.php → core-bundle/tests/Contao/DcTableTest.php b/core-bundle/tests/Contao/DC_TableTest.php → core-bundle/tests/Contao/DcTableTest.php
@@ -18,7 +18,7 @@
 use Contao\Database\Statement;
 use Contao\DC_Table;
 
-class DC_TableTest extends TestCase
+class DcTableTest extends TestCase
 {
     /**
      * @dataProvider getPalette
@@ -28,7 +28,6 @@ public function testGetPalette(array $dca, array $row, string $expected): void
         $result = new Result([$row], '');
 
         $statement = $this->createMock(Statement::class);
-
         $statement
             ->method('limit')
             ->willReturn($statement)
@@ -46,14 +45,13 @@ public function testGetPalette(array $dca, array $row, string $expected): void
         ;
 
         $reflection = new \ReflectionClass(DC_Table::class);
-        $dataContainer = $reflection->newInstanceWithoutConstructor();
 
-        $method = $reflection->getMethod('import');
-        $method->setAccessible(true);
-        $method->invoke($dataContainer, $database, 'Database');
+        $dataContainer = $reflection->newInstanceWithoutConstructor();
+        $dataContainer->Database = $database;
 
-        /** @phpstan-ignore-next-line */
-        $dataContainer->strTable = 'tl_test';
+        $table = $reflection->getProperty('strTable');
+        $table->setAccessible(true);
+        $table->setValue($dataContainer, 'tl_test');
 
         $GLOBALS['TL_DCA']['tl_test'] = $dca;
 
@@ -62,28 +60,26 @@ public function testGetPalette(array $dca, array $row, string $expected): void
 
     public function getPalette(): array
     {
-        return [
+        return [[
             [
-                [
-                    'palettes' => [
-                        '__selector__' => ['fieldA', 'fieldB', 'fieldC'],
-                        'default' => 'paletteDefault',
-                        'valueA' => 'paletteA',
-                        'valueAvalueC' => 'paletteAC',
-                    ],
-                    'fields' => [
-                        'fieldA' => ['inputType' => 'text'],
-                        'fieldB' => ['inputType' => 'text'],
-                        'fieldC' => ['inputType' => 'text'],
-                    ],
+                'palettes' => [
+                    '__selector__' => ['fieldA', 'fieldB', 'fieldC'],
+                    'default' => 'paletteDefault',
+                    'valueA' => 'paletteA',
+                    'valueAvalueC' => 'paletteAC',
                 ],
-                [
-                    'fieldA' => 'valueA',
-                    'fieldB' => null,
-                    'fieldC' => 'valueC',
+                'fields' => [
+                    'fieldA' => ['inputType' => 'text'],
+                    'fieldB' => ['inputType' => 'text'],
+                    'fieldC' => ['inputType' => 'text'],
                 ],
-                'paletteAC',
             ],
-        ];
+            [
+                'fieldA' => 'valueA',
+                'fieldB' => null,
+                'fieldC' => 'valueC',
+            ],
+            'paletteAC',
+        ]];
     }
 }