diff --git a/composer.json b/composer.json index df0fe9f..53b348c 100644 --- a/composer.json +++ b/composer.json @@ -18,10 +18,10 @@ "require-dev": { "matthiasnoback/symfony-dependency-injection-test": "^4.0", "nyholm/nsa": "^1.1", - "nyholm/symfony-bundle-test": "dev-master", + "nyholm/symfony-bundle-test": "^2.0", "openspout/openspout": "^4.0", "phpoffice/phpspreadsheet": "^1.29", - "phpunit/phpunit": "^9.6", + "phpunit/phpunit": "^10.5", "sigwin/infra": "~1.9.0", "symfony/console": "^6.4 || ^7.0", "symfony/framework-bundle": "^6.4 || ^7.0", @@ -69,7 +69,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "1.0-dev" } } } diff --git a/phpunit.xml.dist b/phpunit.xml.dist index cde5279..ab4b82d 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -2,36 +2,34 @@ - + requireCoverageMetadata="true"> + + - ./src/Xezilaires - ./src/Bridge + ./src/Xezilaires + ./src/Bridge - ./src/Xezilaires/Exception - ./src/Xezilaires/Test - ./src/Xezilaires/vendor - ./src/Xezilaires/var - ./src/Bridge/*/Test - ./src/Bridge/*/vendor - ./src/Bridge/*/var + ./src/Xezilaires/Exception + ./src/Xezilaires/Test + ./src/Xezilaires/vendor + ./src/Xezilaires/var + ./src/Bridge/*/Test + ./src/Bridge/*/vendor + ./src/Bridge/*/var - + ./src/Xezilaires/Test @@ -41,7 +39,4 @@ - - - diff --git a/src/Bridge/PhpSpreadsheet/composer.json b/src/Bridge/PhpSpreadsheet/composer.json index b212f0b..581bc23 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": "^9.6", + "phpunit/phpunit": "^10.5", "symfony/phpunit-bridge": "^6.4 || ^7.0", "symfony/property-access": "^6.4 || ^7.0", "symfony/property-info": "^6.4 || ^7.0" @@ -47,7 +47,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "1.0-dev" } } } diff --git a/src/Bridge/PhpSpreadsheet/phpunit.xml.dist b/src/Bridge/PhpSpreadsheet/phpunit.xml.dist index 8cb9cf3..d07a51f 100644 --- a/src/Bridge/PhpSpreadsheet/phpunit.xml.dist +++ b/src/Bridge/PhpSpreadsheet/phpunit.xml.dist @@ -2,32 +2,29 @@ - + failOnWarning="true"> + + - ./ + ./ - ./Exception - ./Test - ./var - ./vendor + ./Exception + ./Test + ./var + ./vendor - + ./Test @@ -36,7 +33,4 @@ - - - diff --git a/src/Bridge/Spout/Test/RowIteratorTest.php b/src/Bridge/Spout/Test/RowIteratorTest.php index f9bfafc..21ce701 100644 --- a/src/Bridge/Spout/Test/RowIteratorTest.php +++ b/src/Bridge/Spout/Test/RowIteratorTest.php @@ -29,7 +29,7 @@ final class RowIteratorTest extends TestCase /** * @return list */ - public function provideCanSeekProperlyCases(): iterable + public static function provideCanSeekProperlyCases(): iterable { return [ [2, 2, 2, ['rewind' => 1, 'next' => 0, 'valid' => 0]], @@ -41,7 +41,7 @@ public function provideCanSeekProperlyCases(): iterable /** * @return list}}> */ - public function provideCanDetermineHighestRowProperlyCases(): iterable + public static function provideCanDetermineHighestRowProperlyCases(): iterable { return [ [1, 1, 2, ['rewind' => 2, 'next' => 2], ['valid' => [true, true, false]]], diff --git a/src/Bridge/Spout/composer.json b/src/Bridge/Spout/composer.json index fc74df4..75322ba 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": "^9.6", + "phpunit/phpunit": "^10.5", "symfony/phpunit-bridge": "^6.4 || ^7.0", "symfony/property-access": "^6.4 || ^7.0", "symfony/property-info": "^6.4 || ^7.0" @@ -45,7 +45,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "1.0-dev" } } } diff --git a/src/Bridge/Spout/phpunit.xml.dist b/src/Bridge/Spout/phpunit.xml.dist index bd50df9..4aae280 100644 --- a/src/Bridge/Spout/phpunit.xml.dist +++ b/src/Bridge/Spout/phpunit.xml.dist @@ -2,32 +2,29 @@ - + failOnWarning="true"> + + - ./ + ./ - ./Exception - ./Test - ./var - ./vendor + ./Exception + ./Test + ./var + ./vendor - + ./Test @@ -36,7 +33,4 @@ - - - diff --git a/src/Bridge/Symfony/composer.json b/src/Bridge/Symfony/composer.json index 6caf109..cd2f6b6 100644 --- a/src/Bridge/Symfony/composer.json +++ b/src/Bridge/Symfony/composer.json @@ -20,8 +20,8 @@ }, "require-dev": { "matthiasnoback/symfony-dependency-injection-test": "^4.0", - "nyholm/symfony-bundle-test": "dev-master", - "phpunit/phpunit": "^9.6", + "nyholm/symfony-bundle-test": "^2.0", + "phpunit/phpunit": "^10.5", "sigwin/xezilaires-phpspreadsheet": "^1.0", "sigwin/xezilaires-spout": "^1.0", "symfony/phpunit-bridge": "^6.4 || ^7.0" diff --git a/src/Xezilaires/Test/Metadata/MappingTest.php b/src/Xezilaires/Test/Metadata/MappingTest.php index 2532b7e..6689ca4 100644 --- a/src/Xezilaires/Test/Metadata/MappingTest.php +++ b/src/Xezilaires/Test/Metadata/MappingTest.php @@ -89,7 +89,7 @@ public function testCannotCreateInvalidMapping( /** * @return iterable */ - public function provideCanCreateValidMappingCases(): iterable + public static function provideCanCreateValidMappingCases(): iterable { yield [ Product::class, @@ -107,7 +107,7 @@ public function provideCanCreateValidMappingCases(): iterable /** * @return iterable, 3?: array}> */ - public function provideCannotCreateInvalidMappingCases(): iterable + public static function provideCannotCreateInvalidMappingCases(): iterable { yield ['Invalid class "foo"', 'foo', ['name' => new ColumnReference('A')]]; yield ['Invalid mapping, no references specified', Product::class, []]; diff --git a/src/Xezilaires/composer.json b/src/Xezilaires/composer.json index 81be64d..f1278c0 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": "^9.6", + "phpunit/phpunit": "^10.5", "symfony/console": "^6.4 || ^7.0", "symfony/phpunit-bridge": "^6.4 || ^7.0", "symfony/property-access": "^6.4 || ^7.0", @@ -47,7 +47,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "1.0-dev" } } } diff --git a/src/Xezilaires/phpunit.xml.dist b/src/Xezilaires/phpunit.xml.dist index 0fe98bc..b111a87 100644 --- a/src/Xezilaires/phpunit.xml.dist +++ b/src/Xezilaires/phpunit.xml.dist @@ -2,32 +2,29 @@ - + failOnWarning="true"> + + - ./ + ./ - ./Exception - ./Test - ./var - ./vendor + ./Exception + ./Test + ./var + ./vendor - + ./Test @@ -36,7 +33,4 @@ - - -