diff --git a/composer.json b/composer.json index 60c16cb8a..f0a40566d 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "halaxa/json-machine": "^1.1", "meilisearch/meilisearch-php": "^1.11", "monolog/monolog": "^2.0||^3.0", - "openspout/openspout": "^4.0", + "openspout/openspout": "^4.0 || ^5.0", "packaged/thrift": "^0.15.0", "php-http/discovery": "^1.0", "psr/clock": "^1.0", diff --git a/composer.lock b/composer.lock index 658e69a3f..f2650a228 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cdf88bcac0dc3c9c2ee777951beab6e8", + "content-hash": "6413ffbf91bb0a05bb101057645c6b96", "packages": [ { "name": "async-aws/core", @@ -1513,21 +1513,20 @@ }, { "name": "openspout/openspout", - "version": "v4.32.0", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/openspout/openspout.git", - "reference": "41f045c1f632e1474e15d4c7bc3abcb4a153563d" + "reference": "712cfe507f4c90767f4cda21947f6bca4539b7e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/openspout/openspout/zipball/41f045c1f632e1474e15d4c7bc3abcb4a153563d", - "reference": "41f045c1f632e1474e15d4c7bc3abcb4a153563d", + "url": "https://api.github.com/repos/openspout/openspout/zipball/712cfe507f4c90767f4cda21947f6bca4539b7e3", + "reference": "712cfe507f4c90767f4cda21947f6bca4539b7e3", "shasum": "" }, "require": { "ext-dom": "*", - "ext-fileinfo": "*", "ext-filter": "*", "ext-libxml": "*", "ext-xmlreader": "*", @@ -1536,13 +1535,13 @@ }, "require-dev": { "ext-zlib": "*", - "friendsofphp/php-cs-fixer": "^3.86.0", - "infection/infection": "^0.31.2", - "phpbench/phpbench": "^1.4.1", - "phpstan/phpstan": "^2.1.22", - "phpstan/phpstan-phpunit": "^2.0.7", - "phpstan/phpstan-strict-rules": "^2.0.6", - "phpunit/phpunit": "^12.3.7" + "friendsofphp/php-cs-fixer": "^3.91.3", + "infection/infection": "^0.31.9", + "phpbench/phpbench": "^1.4.3", + "phpstan/phpstan": "^2.1.33", + "phpstan/phpstan-phpunit": "^2.0.10", + "phpstan/phpstan-strict-rules": "^2.0.7", + "phpunit/phpunit": "^12.5.3" }, "suggest": { "ext-iconv": "To handle non UTF-8 CSV files (if \"php-mbstring\" is not already installed or is too limited)", @@ -1590,7 +1589,7 @@ ], "support": { "issues": "https://github.com/openspout/openspout/issues", - "source": "https://github.com/openspout/openspout/tree/v4.32.0" + "source": "https://github.com/openspout/openspout/tree/v5.1.0" }, "funding": [ { @@ -1602,7 +1601,7 @@ "type": "github" } ], - "time": "2025-09-03T16:03:54+00:00" + "time": "2025-12-11T09:45:03+00:00" }, { "name": "packaged/thrift", diff --git a/src/adapter/etl-adapter-excel/composer.json b/src/adapter/etl-adapter-excel/composer.json index 76c5a85f6..3c0e3aa09 100644 --- a/src/adapter/etl-adapter-excel/composer.json +++ b/src/adapter/etl-adapter-excel/composer.json @@ -14,7 +14,7 @@ "require": { "php": "~8.3.0 || ~8.4.0 || ~8.5.0", "flow-php/etl": "self.version", - "openspout/openspout": "^4.0" + "openspout/openspout": "^4.0 || ^5.0" }, "config": { "optimize-autoloader": true, diff --git a/src/adapter/etl-adapter-excel/src/Flow/ETL/Adapter/Excel/ExcelExtractor.php b/src/adapter/etl-adapter-excel/src/Flow/ETL/Adapter/Excel/ExcelExtractor.php index 0ffa88adf..2650710cd 100644 --- a/src/adapter/etl-adapter-excel/src/Flow/ETL/Adapter/Excel/ExcelExtractor.php +++ b/src/adapter/etl-adapter-excel/src/Flow/ETL/Adapter/Excel/ExcelExtractor.php @@ -137,7 +137,8 @@ private function createRowsFromCells(Row $row, int $previousRowDataCount = 0) : $rowData = \array_map( // Convert empty values to nullables if allowed fn (Cell $cell) => $this->convertEmptyToNull && '' === $cell->getValue() ? null : $cell->getValue(), - $row->getCells() + /** @phpstan-ignore-next-line method remove in 5.0 in favor of public property */ + method_exists($row, 'getCells') ? $row->getCells() : $row->cells ); // Expand columns to the size of the previous row