diff --git a/composer.json b/composer.json index a2b7d0b..11532ae 100644 --- a/composer.json +++ b/composer.json @@ -21,8 +21,8 @@ "nyholm/symfony-bundle-test": "^3.0", "openspout/openspout": "^4.0", "phpoffice/phpspreadsheet": "^2.0", - "phpunit/phpunit": "^10.5", - "sigwin/infra": "~1.9.0", + "phpunit/phpunit": "^11.2", + "sigwin/infra": "~1.11.0", "symfony/console": "^6.4 || ^7.0", "symfony/framework-bundle": "^6.4 || ^7.0", "symfony/phpunit-bridge": "^6.4 || ^7.0", diff --git a/src/Bridge/PhpSpreadsheet/Spreadsheet.php b/src/Bridge/PhpSpreadsheet/Spreadsheet.php index 461b8ef..92dde9d 100644 --- a/src/Bridge/PhpSpreadsheet/Spreadsheet.php +++ b/src/Bridge/PhpSpreadsheet/Spreadsheet.php @@ -122,7 +122,7 @@ private function getActiveWorksheet(): Worksheet } } - private function fetchCell(string $columnName, int $rowIndex): null|float|int|string + private function fetchCell(string $columnName, int $rowIndex): float|int|string|null { $worksheet = $this->getActiveWorksheet(); diff --git a/src/Bridge/PhpSpreadsheet/Test/Functional/SpreadsheetIteratorTest.php b/src/Bridge/PhpSpreadsheet/Test/Functional/SpreadsheetIteratorTest.php index ad9496a..bbf92a7 100644 --- a/src/Bridge/PhpSpreadsheet/Test/Functional/SpreadsheetIteratorTest.php +++ b/src/Bridge/PhpSpreadsheet/Test/Functional/SpreadsheetIteratorTest.php @@ -31,8 +31,6 @@ * @uses \Xezilaires\Serializer\ObjectSerializer * * @internal - * - * @small */ #[\PHPUnit\Framework\Attributes\Small] #[\PHPUnit\Framework\Attributes\CoversClass(\Xezilaires\Bridge\PhpSpreadsheet\RowIterator::class)] diff --git a/src/Bridge/PhpSpreadsheet/Test/RowIteratorTest.php b/src/Bridge/PhpSpreadsheet/Test/RowIteratorTest.php index 3438599..3dec77c 100644 --- a/src/Bridge/PhpSpreadsheet/Test/RowIteratorTest.php +++ b/src/Bridge/PhpSpreadsheet/Test/RowIteratorTest.php @@ -23,8 +23,6 @@ * @covers \Xezilaires\Bridge\PhpSpreadsheet\RowIterator * * @internal - * - * @small */ #[\PHPUnit\Framework\Attributes\Small] #[\PHPUnit\Framework\Attributes\CoversClass(RowIterator::class)] diff --git a/src/Bridge/PhpSpreadsheet/composer.json b/src/Bridge/PhpSpreadsheet/composer.json index e3a0e02..13b04b9 100644 --- a/src/Bridge/PhpSpreadsheet/composer.json +++ b/src/Bridge/PhpSpreadsheet/composer.json @@ -15,7 +15,7 @@ "sigwin/xezilaires": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^10.5", + "phpunit/phpunit": "^11.2", "symfony/phpunit-bridge": "^6.4 || ^7.0", "symfony/property-access": "^6.4 || ^7.0", "symfony/property-info": "^6.4 || ^7.0" diff --git a/src/Bridge/Spout/Test/Functional/SpreadsheetIteratorTest.php b/src/Bridge/Spout/Test/Functional/SpreadsheetIteratorTest.php index 8ab772a..7f5fd34 100644 --- a/src/Bridge/Spout/Test/Functional/SpreadsheetIteratorTest.php +++ b/src/Bridge/Spout/Test/Functional/SpreadsheetIteratorTest.php @@ -21,10 +21,6 @@ /** * @internal - * - * @coversNothing - * - * @small */ #[\PHPUnit\Framework\Attributes\Small] #[\PHPUnit\Framework\Attributes\CoversClass(\Xezilaires\Bridge\Spout\RowIterator::class)] diff --git a/src/Bridge/Spout/Test/RowIteratorTest.php b/src/Bridge/Spout/Test/RowIteratorTest.php index c5df406..1819fd6 100644 --- a/src/Bridge/Spout/Test/RowIteratorTest.php +++ b/src/Bridge/Spout/Test/RowIteratorTest.php @@ -21,8 +21,6 @@ * @covers \Xezilaires\Bridge\Spout\RowIterator * * @internal - * - * @small */ #[\PHPUnit\Framework\Attributes\Small] #[\PHPUnit\Framework\Attributes\CoversClass(RowIterator::class)] diff --git a/src/Bridge/Spout/Test/SpreadsheetTest.php b/src/Bridge/Spout/Test/SpreadsheetTest.php index 257a958..2f2392b 100644 --- a/src/Bridge/Spout/Test/SpreadsheetTest.php +++ b/src/Bridge/Spout/Test/SpreadsheetTest.php @@ -23,8 +23,6 @@ * @covers \Xezilaires\Bridge\Spout\Spreadsheet * * @internal - * - * @small */ #[\PHPUnit\Framework\Attributes\Small] #[\PHPUnit\Framework\Attributes\CoversClass(Spreadsheet::class)] diff --git a/src/Bridge/Spout/composer.json b/src/Bridge/Spout/composer.json index 859056b..f73033d 100644 --- a/src/Bridge/Spout/composer.json +++ b/src/Bridge/Spout/composer.json @@ -16,7 +16,7 @@ }, "require-dev": { "nyholm/nsa": "^1.1", - "phpunit/phpunit": "^10.5", + "phpunit/phpunit": "^11.2", "symfony/phpunit-bridge": "^6.4 || ^7.0", "symfony/property-access": "^6.4 || ^7.0", "symfony/property-info": "^6.4 || ^7.0" diff --git a/src/Bridge/Symfony/DependencyInjection/XezilairesExtension.php b/src/Bridge/Symfony/DependencyInjection/XezilairesExtension.php index 689e49e..23b1545 100644 --- a/src/Bridge/Symfony/DependencyInjection/XezilairesExtension.php +++ b/src/Bridge/Symfony/DependencyInjection/XezilairesExtension.php @@ -15,8 +15,8 @@ use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Extension\Extension; use Symfony\Component\DependencyInjection\Loader; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; final class XezilairesExtension extends Extension { diff --git a/src/Bridge/Symfony/Test/Functional/DependencyInjection/XezilairesExtensionTest.php b/src/Bridge/Symfony/Test/Functional/DependencyInjection/XezilairesExtensionTest.php index e4b8b00..88774de 100644 --- a/src/Bridge/Symfony/Test/Functional/DependencyInjection/XezilairesExtensionTest.php +++ b/src/Bridge/Symfony/Test/Functional/DependencyInjection/XezilairesExtensionTest.php @@ -26,10 +26,6 @@ /** * @internal - * - * @coversNothing - * - * @small */ #[\PHPUnit\Framework\Attributes\Medium] #[\PHPUnit\Framework\Attributes\CoversClass(XezilairesExtension::class)] diff --git a/src/Bridge/Symfony/Test/Functional/XezilairesBundleTest.php b/src/Bridge/Symfony/Test/Functional/XezilairesBundleTest.php index 0e8ac1e..102ba56 100644 --- a/src/Bridge/Symfony/Test/Functional/XezilairesBundleTest.php +++ b/src/Bridge/Symfony/Test/Functional/XezilairesBundleTest.php @@ -31,10 +31,6 @@ /** * @internal - * - * @coversNothing - * - * @small */ #[\PHPUnit\Framework\Attributes\Medium] #[\PHPUnit\Framework\Attributes\CoversClass(XezilairesBundle::class)] diff --git a/src/Bridge/Symfony/composer.json b/src/Bridge/Symfony/composer.json index cca4cbb..61c2d96 100644 --- a/src/Bridge/Symfony/composer.json +++ b/src/Bridge/Symfony/composer.json @@ -21,7 +21,7 @@ "require-dev": { "matthiasnoback/symfony-dependency-injection-test": "^5.0", "nyholm/symfony-bundle-test": "^3.0", - "phpunit/phpunit": "^10.5", + "phpunit/phpunit": "^11.2", "sigwin/xezilaires-phpspreadsheet": "^1.0", "sigwin/xezilaires-spout": "^1.0", "symfony/phpunit-bridge": "^6.4 || ^7.0" diff --git a/src/Xezilaires/Metadata/Mapping.php b/src/Xezilaires/Metadata/Mapping.php index 15767b0..8102f9d 100644 --- a/src/Xezilaires/Metadata/Mapping.php +++ b/src/Xezilaires/Metadata/Mapping.php @@ -72,7 +72,7 @@ public function getReferences(): array return $this->references; } - public function getOption(string $option): null|bool|int|string + public function getOption(string $option): bool|int|string|null { return $this->options[$option]; } diff --git a/src/Xezilaires/SpreadsheetIterator.php b/src/Xezilaires/SpreadsheetIterator.php index 983e268..4164b3b 100644 --- a/src/Xezilaires/SpreadsheetIterator.php +++ b/src/Xezilaires/SpreadsheetIterator.php @@ -195,7 +195,7 @@ private function readArrayReference(array $row, ArrayReference $reference): arra /** * @param array $row */ - private function readReference(array $row, Reference $reference): null|float|int|string + private function readReference(array $row, Reference $reference): float|int|string|null { switch (true) { case $reference instanceof ColumnReference: diff --git a/src/Xezilaires/Test/FilterIteratorTest.php b/src/Xezilaires/Test/FilterIteratorTest.php index 3708474..0ece73c 100644 --- a/src/Xezilaires/Test/FilterIteratorTest.php +++ b/src/Xezilaires/Test/FilterIteratorTest.php @@ -20,8 +20,6 @@ * @covers \Xezilaires\FilterIterator * * @internal - * - * @small */ #[\PHPUnit\Framework\Attributes\Small] #[\PHPUnit\Framework\Attributes\CoversClass(FilterIterator::class)] diff --git a/src/Xezilaires/Test/Metadata/MappingTest.php b/src/Xezilaires/Test/Metadata/MappingTest.php index e2809c8..3049335 100644 --- a/src/Xezilaires/Test/Metadata/MappingTest.php +++ b/src/Xezilaires/Test/Metadata/MappingTest.php @@ -26,8 +26,6 @@ * @covers \Xezilaires\Metadata\Mapping * * @internal - * - * @small */ #[\PHPUnit\Framework\Attributes\Small] #[\PHPUnit\Framework\Attributes\CoversClass(Mapping::class)] diff --git a/src/Xezilaires/Test/SpreadsheetIteratorTest.php b/src/Xezilaires/Test/SpreadsheetIteratorTest.php index 54382ff..54fea05 100644 --- a/src/Xezilaires/Test/SpreadsheetIteratorTest.php +++ b/src/Xezilaires/Test/SpreadsheetIteratorTest.php @@ -35,8 +35,6 @@ * @uses \Xezilaires\Metadata\HeaderReference * * @internal - * - * @small */ #[\PHPUnit\Framework\Attributes\Small] #[\PHPUnit\Framework\Attributes\CoversClass(Mapping::class)] diff --git a/src/Xezilaires/composer.json b/src/Xezilaires/composer.json index 2e78eea..b03bde1 100644 --- a/src/Xezilaires/composer.json +++ b/src/Xezilaires/composer.json @@ -17,7 +17,7 @@ "require-dev": { "nyholm/nsa": "^1.1", "openspout/openspout": "^4.0", - "phpunit/phpunit": "^10.5", + "phpunit/phpunit": "^11.2", "symfony/console": "^6.4 || ^7.0", "symfony/phpunit-bridge": "^6.4 || ^7.0", "symfony/property-access": "^6.4 || ^7.0",