Work-Related/typo3-php-datasets
Work-Related/typo3-php-datasets
1
0
mirror of https://github.com/Codappix/typo3-php-datasets.git synced 2024-12-04 19:36:11 +01:00
Code Issues Activity

Support empty extra columns in CSV conversion (#12)

Browse source
This commit is contained in:
Daniel Siepmann 2023-11-09 13:15:56 +01:00 committed by GitHub
parent 8a83c508a2
commit 77a7d13c70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -1,5 +1,11 @@
# Changelog # Changelog
## v1.4.1 - 2023-11-09
### Added
- Support empty columns in CSV conversion.
## v1.4.0 - 2023-11-07 ## v1.4.0 - 2023-11-07
### Added ### Added

6
Classes/Converter/Csv.php
View file

@ -71,7 +71,7 @@ class Csv implements Converter
break; break;
} }
if (is_array($line) && count($line) === 1 && is_string($line[0])) { if (is_array($line) && count(array_filter($line)) === 1 && is_string($line[0])) {
// Line is a new table, introducing also new columns o next row // Line is a new table, introducing also new columns o next row
$tableName = $line[0]; $tableName = $line[0];
$columns = []; $columns = [];
@ -79,12 +79,12 @@ class Csv implements Converter
} }
if ($columns === [] && is_array($line)) { if ($columns === [] && is_array($line)) {
$columns = array_slice($line, 1); $columns = array_filter($line);
continue; continue;
} }
if (is_array($line)) { if (is_array($line)) {
$values = array_slice($line, 1); $values = array_slice($line, 1, count($columns));
$phpArray[$tableName][] = array_combine($columns, $values); $phpArray[$tableName][] = array_combine($columns, $values);
} }
} }

4
Tests/Functional/Converter/CsvTest.php
View file

@ -99,6 +99,10 @@ class CsvTest extends TestCase
'incomingCsvFile' => __DIR__ . '/Fixtures/Csv/RecordsInDifferentTablesIncoming.csv', 'incomingCsvFile' => __DIR__ . '/Fixtures/Csv/RecordsInDifferentTablesIncoming.csv',
'expectedResultFile' => __DIR__ . '/Fixtures/Csv/RecordsInDifferentTablesAssert.php', 'expectedResultFile' => __DIR__ . '/Fixtures/Csv/RecordsInDifferentTablesAssert.php',
], ],
'Extra columns' => [
'incomingCsvFile' => __DIR__ . '/Fixtures/Csv/ExtraColumnsIncoming.csv',
'expectedResultFile' => __DIR__ . '/Fixtures/Csv/ExtraColumnsAssert.php',
],
]; ];
} }
} }

14
Tests/Functional/Converter/Fixtures/Csv/ExtraColumnsAssert.php Normal file
View file

@ -0,0 +1,14 @@
<?php
return array (
'pages' =>
array (
0 =>
array (
'uid' => '1',
'pid' => '0',
'title' => 'Page with uid 1 below 0',
'deleted' => '0',
),
),
);

3
Tests/Functional/Converter/Fixtures/Csv/ExtraColumnsIncoming.csv Normal file
View file

@ -0,0 +1,3 @@
pages,,,,,,,,
,uid,pid,title,deleted,,,,
,1,0,Page with uid 1 below 0,0,,,,
1 pages
2 uid pid title deleted
3 1 0 Page with uid 1 below 0 0