Skip to content

Commit 062701c

Browse files
stloydnorberttech
authored andcommitted
Allow usage of newer "openspout/openspout"
1 parent 384d080 commit 062701c

File tree

4 files changed

+17
-18
lines changed

4 files changed

+17
-18
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"halaxa/json-machine": "^1.1",
3333
"meilisearch/meilisearch-php": "^1.11",
3434
"monolog/monolog": "^2.0||^3.0",
35-
"openspout/openspout": "^4.0",
35+
"openspout/openspout": "^4.0 || ^5.0",
3636
"packaged/thrift": "^0.15.0",
3737
"php-http/discovery": "^1.0",
3838
"psr/clock": "^1.0",

composer.lock

Lines changed: 14 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/adapter/etl-adapter-excel/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"require": {
1515
"php": "~8.3.0 || ~8.4.0 || ~8.5.0",
1616
"flow-php/etl": "self.version",
17-
"openspout/openspout": "^4.0"
17+
"openspout/openspout": "^4.0 || ^5.0"
1818
},
1919
"config": {
2020
"optimize-autoloader": true,

src/adapter/etl-adapter-excel/src/Flow/ETL/Adapter/Excel/ExcelExtractor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ private function createRowsFromCells(Row $row, int $previousRowDataCount = 0) :
137137
$rowData = \array_map(
138138
// Convert empty values to nullables if allowed
139139
fn (Cell $cell) => $this->convertEmptyToNull && '' === $cell->getValue() ? null : $cell->getValue(),
140-
$row->getCells()
140+
method_exists($row, 'getCells') ? $row->getCells() : $row->cells
141141
);
142142

143143
// Expand columns to the size of the previous row

0 commit comments

Comments
 (0)