chore: bump Infra to 1.11 (#187)

* chore: bump Infra to 1.11

* chore: bump Infra to 1.11

* chore: bump Infra to 1.11

* chore: bump Infra to 1.11

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",

psalm.baseline.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
+  <file src="src/Bridge/Symfony/Console/Application.php">
+    <MissingClassConstType>
+      <code><![CDATA[APP_NAME = '
+ __   __        _ _       _
+ \ \ / /       (_) |     (_)
+  \ V / ___ _____| | __ _ _ _ __ ___  ___
+   > < / _ \_  / | |/ _` | | \'__/ _ \/ __|
+  / . \  __// /| | | (_| | | | |  __/\__ \
+ /_/ \_\___/___|_|_|\__,_|_|_|  \___||___/ ']]></code>
+    </MissingClassConstType>
+  </file>
+</files>

psalm.xml.dist

@@ -4,6 +4,7 @@
        checkForThrowsInGlobalScope="false"
        ensureArrayIntOffsetsExist="false"
        ensureArrayStringOffsetsExist="false"
+       errorBaseline="psalm.baseline.xml"
        errorLevel="1"
        findUnusedBaselineEntry="false"
        findUnusedCode="false"

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();
 

src/Bridge/PhpSpreadsheet/Test/Functional/SpreadsheetIteratorTest.php

@@ -20,19 +20,7 @@
 use Xezilaires\Test\Functional\FunctionalTestCase;
 
 /**
- * @covers \Xezilaires\Bridge\PhpSpreadsheet\RowIterator
- * @covers \Xezilaires\Bridge\PhpSpreadsheet\Spreadsheet
- * @covers \Xezilaires\SpreadsheetIterator
- *
- * @uses \Xezilaires\Metadata\ArrayReference
- * @uses \Xezilaires\Metadata\ColumnReference
- * @uses \Xezilaires\Metadata\HeaderReference
- * @uses \Xezilaires\Metadata\Mapping
- * @uses \Xezilaires\Serializer\ObjectSerializer
- *
  * @internal
- *
- * @small
  */
 #[\PHPUnit\Framework\Attributes\Small]
 #[\PHPUnit\Framework\Attributes\CoversClass(\Xezilaires\Bridge\PhpSpreadsheet\RowIterator::class)]

src/Bridge/PhpSpreadsheet/Test/RowIteratorTest.php

@@ -20,11 +20,7 @@
 use Xezilaires\Bridge\PhpSpreadsheet\RowIterator;
 
 /**
- * @covers \Xezilaires\Bridge\PhpSpreadsheet\RowIterator
- *
  * @internal
- *
- * @small
  */
 #[\PHPUnit\Framework\Attributes\Small]
 #[\PHPUnit\Framework\Attributes\CoversClass(RowIterator::class)]

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"

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)]

src/Bridge/Spout/Test/RowIteratorTest.php

@@ -18,11 +18,7 @@
 use Xezilaires\Bridge\Spout\RowIterator;
 
 /**
- * @covers \Xezilaires\Bridge\Spout\RowIterator
- *
  * @internal
- *
- * @small
  */
 #[\PHPUnit\Framework\Attributes\Small]
 #[\PHPUnit\Framework\Attributes\CoversClass(RowIterator::class)]

src/Bridge/Spout/Test/SpreadsheetTest.php

@@ -20,11 +20,7 @@
 use Xezilaires\Test\FixtureTrait;
 
 /**
- * @covers \Xezilaires\Bridge\Spout\Spreadsheet
- *
  * @internal
- *
- * @small
  */
 #[\PHPUnit\Framework\Attributes\Small]
 #[\PHPUnit\Framework\Attributes\CoversClass(Spreadsheet::class)]

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"

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
 {

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)]

src/Bridge/Symfony/Test/Functional/XezilairesBundleTest.php

@@ -31,10 +31,6 @@
 
 /**
  * @internal
- *
- * @coversNothing
- *
- * @small
  */
 #[\PHPUnit\Framework\Attributes\Medium]
 #[\PHPUnit\Framework\Attributes\CoversClass(XezilairesBundle::class)]
@@ -52,6 +48,20 @@ final class XezilairesBundleTest extends KernelTestCase
 {
     use FixtureTrait;
 
+    // TODO: remove when https://github.com/symfony/symfony/issues/53812 is fixed
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        while (true) {
+            $previousHandler = set_exception_handler(static fn () => null);
+            restore_exception_handler();
+            if ($previousHandler === null) {
+                break;
+            }
+            restore_exception_handler();
+        }
+    }
+
     /**
      * @throws \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
      */

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"

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];
     }

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:

src/Xezilaires/Test/FilterIteratorTest.php

@@ -17,11 +17,7 @@
 use Xezilaires\FilterIterator;
 
 /**
- * @covers \Xezilaires\FilterIterator
- *
  * @internal
- *
- * @small
  */
 #[\PHPUnit\Framework\Attributes\Small]
 #[\PHPUnit\Framework\Attributes\CoversClass(FilterIterator::class)]

src/Xezilaires/Test/Metadata/MappingTest.php

@@ -23,11 +23,7 @@
 use Xezilaires\Test\Model\Product;
 
 /**
- * @covers \Xezilaires\Metadata\Mapping
- *
  * @internal
- *
- * @small
  */
 #[\PHPUnit\Framework\Attributes\Small]
 #[\PHPUnit\Framework\Attributes\CoversClass(Mapping::class)]

src/Xezilaires/Test/SpreadsheetIteratorTest.php

@@ -27,16 +27,7 @@
 use Xezilaires\SpreadsheetIterator;
 
 /**
- * @covers \Xezilaires\Metadata\Mapping
- * @covers \Xezilaires\SpreadsheetIterator
- *
- * @uses \Xezilaires\Metadata\ArrayReference
- * @uses \Xezilaires\Metadata\ColumnReference
- * @uses \Xezilaires\Metadata\HeaderReference
- *
  * @internal
- *
- * @small
  */
 #[\PHPUnit\Framework\Attributes\Small]
 #[\PHPUnit\Framework\Attributes\CoversClass(Mapping::class)]

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",