diff --git a/composer.json b/composer.json index 4f743be..a2b7d0b 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "nyholm/nsa": "^1.1", "nyholm/symfony-bundle-test": "^3.0", "openspout/openspout": "^4.0", - "phpoffice/phpspreadsheet": "^1.29", + "phpoffice/phpspreadsheet": "^2.0", "phpunit/phpunit": "^10.5", "sigwin/infra": "~1.9.0", "symfony/console": "^6.4 || ^7.0", diff --git a/src/Bridge/PhpSpreadsheet/Test/RowIteratorTest.php b/src/Bridge/PhpSpreadsheet/Test/RowIteratorTest.php index cc3513d..6fcaa6a 100644 --- a/src/Bridge/PhpSpreadsheet/Test/RowIteratorTest.php +++ b/src/Bridge/PhpSpreadsheet/Test/RowIteratorTest.php @@ -43,7 +43,7 @@ public function testCanPerformCurrentCorrectly(): void { $iterator = new RowIterator($this->mockIterator([ 'valid' => ['count' => 0, 'params' => null, 'return' => false], - 'current' => ['count' => 1, 'params' => null, 'return' => new Row($this->getMockBuilder(Worksheet::class)->getMock())], + 'current' => ['count' => 1, 'params' => null, 'return' => new Row(new Worksheet())], 'prev' => ['count' => 0, 'params' => null], 'next' => ['count' => 0, 'params' => null], ])); diff --git a/src/Bridge/PhpSpreadsheet/composer.json b/src/Bridge/PhpSpreadsheet/composer.json index 8417166..e3a0e02 100644 --- a/src/Bridge/PhpSpreadsheet/composer.json +++ b/src/Bridge/PhpSpreadsheet/composer.json @@ -11,7 +11,7 @@ ], "require": { "php": "^8.2", - "phpoffice/phpspreadsheet": "^1.29", + "phpoffice/phpspreadsheet": "^2.0", "sigwin/xezilaires": "^1.0" }, "require-dev": { diff --git a/src/Bridge/Spout/composer.json b/src/Bridge/Spout/composer.json index 75322ba..859056b 100644 --- a/src/Bridge/Spout/composer.json +++ b/src/Bridge/Spout/composer.json @@ -21,9 +21,6 @@ "symfony/property-access": "^6.4 || ^7.0", "symfony/property-info": "^6.4 || ^7.0" }, - "conflict": { - "nikic/php-parser": "< 4.14" - }, "suggest": { "sigwin/xezilaires-symfony": "Symfony bundle integration, bin/xezilaires use" },