Fix Exporter for Doctrine 2.8+

MisatoTremor · Jan 12, 2022 · 392257b · 392257b
1 parent ae98d51
commit 392257b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Export/Exporter.php b/Export/Exporter.php
@@ -32,8 +32,7 @@ public function getContent()
 
         $content = null;
         foreach ($iterableResults as $row) {
-            $row = reset($row);
-            if (null == $content) {
+            if (null === $content) {
                 $content = $this->arrayToCsv(array_keys($row));
             }
             $content .= $this->arrayToCsv(array_values($row));

diff --git a/Tests/Export/Doctrine/ORM/ExporterTest.php b/Tests/Export/Doctrine/ORM/ExporterTest.php
@@ -26,7 +26,7 @@ public function setUp(): void
         $query = $this->getMockForAbstractClass(AbstractQuery::class, [], '', false, true, true, ['toIterable', 'HYDRATE_ARRAY', 'getSQL', '_doExecute']);
         $query
             ->method('toIterable')
-            ->willReturn([0 => [0 => ['row 1' => 'val\'1', 'row 2' => 'val,2', 'row 3' => 'val"3']]]);
+            ->willReturn([0 => ['row 1' => 'val\'1', 'row 2' => 'val,2', 'row 3' => 'val"3']]);
         $queryBuilder = $this->getMockBuilder(QueryBuilder::class)
             ->disableOriginalConstructor()
             ->setMethods(['select', 'from', 'getQuery'])