Refactored CSV header handling and column mapping logic

This commit includes implementing integer conversion for index mapping in CsvFile.php, which improves the header mapping logic. Furthermore, the header specification 'csv: header: false' has been removed from various test yaml files, implying a shift towards handling CSV files with headers. The changes collectively lead to a considerably streamlined CSV data processing workflow.
JBZoo · Mar 30, 2024 · de579ee · de579ee
1 parent 2027c76
commit de579ee
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 30 deletions.
diff --git a/src/Csv/CsvFile.php b/src/Csv/CsvFile.php
@@ -108,6 +108,7 @@ public function getColumnsMappedByHeader(): array
 
         $realHeader = $this->getHeader();
         foreach ($realHeader as $realIndex => $realColumn) {
+            $realIndex = (int)$realIndex;
             $schemaColumn = $this->schema->getColumn($realColumn);
 
             if ($schemaColumn !== null) {

diff --git a/tests/Benchmarks/bench_0_quickest.yml b/tests/Benchmarks/bench_0_quickest.yml
@@ -12,9 +12,6 @@
 
 filename_pattern: /.csv$/i
 
-csv:
-  header: false
-
 columns:
   - rules:
       not_empty: true
diff --git a/tests/Benchmarks/bench_0_quickest_agg.yml b/tests/Benchmarks/bench_0_quickest_agg.yml
@@ -12,9 +12,6 @@
 
 filename_pattern: /.csv$/i
 
-csv:
-  header: false
-
 columns:
   - aggregate_rules:
       count: 0
diff --git a/tests/Benchmarks/bench_0_quickest_combo.yml b/tests/Benchmarks/bench_0_quickest_combo.yml
@@ -12,9 +12,6 @@
 
 filename_pattern: /.csv$/i
 
-csv:
-  header: false
-
 columns:
   - rules:
       not_empty: true

diff --git a/tests/Benchmarks/bench_1_mini.yml b/tests/Benchmarks/bench_1_mini.yml
@@ -12,9 +12,6 @@
 
 filename_pattern: /.csv$/i
 
-csv:
-  header: false
-
 columns:
   - rules:
       not_empty: true

diff --git a/tests/Benchmarks/bench_1_mini_agg.yml b/tests/Benchmarks/bench_1_mini_agg.yml
@@ -12,9 +12,6 @@
 
 filename_pattern: /.csv$/i
 
-csv:
-  header: false
-
 columns:
   - aggregate_rules:
       average: 0

diff --git a/tests/Benchmarks/bench_1_mini_combo.yml b/tests/Benchmarks/bench_1_mini_combo.yml
@@ -12,9 +12,6 @@
 
 filename_pattern: /.csv$/i
 
-csv:
-  header: false
-
 columns:
   - rules:
       not_empty: true

diff --git a/tests/Benchmarks/bench_2_realistic.yml b/tests/Benchmarks/bench_2_realistic.yml
@@ -12,9 +12,6 @@
 
 filename_pattern: /.csv$/i
 
-csv:
-  header: false
-
 columns:
   - rules:
       not_empty: true

diff --git a/tests/Benchmarks/bench_2_realistic_agg.yml b/tests/Benchmarks/bench_2_realistic_agg.yml
@@ -12,9 +12,6 @@
 
 filename_pattern: /.csv$/i
 
-csv:
-  header: false
-
 columns:
   - aggregate_rules:
       is_unique: true

diff --git a/tests/Benchmarks/bench_2_realistic_combo.yml b/tests/Benchmarks/bench_2_realistic_combo.yml
@@ -12,9 +12,6 @@
 
 filename_pattern: /.csv$/i
 
-csv:
-  header: false
-
 columns:
   - rules:
       not_empty: true

diff --git a/tests/Benchmarks/bench_3_all_agg.yml b/tests/Benchmarks/bench_3_all_agg.yml
@@ -12,9 +12,6 @@
 
 filename_pattern: /.csv$/i
 
-csv:
-  header: false
-
 columns:
   - rules:
       not_empty: true