chore: bump Infra to 1.11

sigwinhq · Jun 24, 2024 · 78dafcb · 78dafcb
1 parent a641342
commit 78dafcb
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -195,7 +195,7 @@ private function readArrayReference(array $row, ArrayReference $reference): arra
     /**
      * @param array<string, null|float|int|string> $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
@@ -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
@@ -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
@@ -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
@@ -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",
-Original file line number
+Diff line change
@@ Expand Up / @@ -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();
@@ Expand Down @@